From 099c6b2a731d3e9c025799dd3dbaf5db6e225c9c Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 23 Apr 2020 03:50:35 +0800
Subject: [PATCH] Fix OEM bugs on Android 6

---
 .../vpnhotspot/net/monitor/DefaultNetworkMonitor.kt    |  2 +-
 .../be/mygod/vpnhotspot/net/monitor/UpstreamMonitor.kt | 10 ++++++++++
 .../java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt
index ace67d6e..23afe83e 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt
@@ -17,7 +17,7 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
      * Unfortunately registerDefaultNetworkCallback is going to return VPN interface since Android P DP1:
      * https://android.googlesource.com/platform/frameworks/base/+/dda156ab0c5d66ad82bdcf76cda07cbc0a9c8a2e
      */
-    private val networkRequest = NetworkRequest.Builder()
+    private val networkRequest = networkRequestBuilder()
             .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
             .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
             .build()
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/UpstreamMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/UpstreamMonitor.kt
index 1ccc74ac..c588e07e 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/UpstreamMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/UpstreamMonitor.kt
@@ -2,6 +2,9 @@ package be.mygod.vpnhotspot.net.monitor
 
 import android.content.SharedPreferences
 import android.net.LinkProperties
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.os.Build
 import be.mygod.vpnhotspot.App.Companion.app
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -22,6 +25,13 @@ abstract class UpstreamMonitor {
         }
         private var monitor = generateMonitor()
 
+        fun networkRequestBuilder() = NetworkRequest.Builder().apply {
+            if (Build.VERSION.SDK_INT == 23) {  // workarounds for OEM bugs
+                removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL)
+            }
+        }
+
         fun registerCallback(callback: Callback) = synchronized(this) { monitor.registerCallback(callback) }
         fun unregisterCallback(callback: Callback) = synchronized(this) { monitor.unregisterCallback(callback) }
 
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt
index f1aee4eb..d7e86ce2 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt
@@ -7,7 +7,7 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 
 object VpnMonitor : UpstreamMonitor() {
-    private val request = NetworkRequest.Builder()
+    private val request = networkRequestBuilder()
             .addTransportType(NetworkCapabilities.TRANSPORT_VPN)
             .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
             .build()