treat metered wi-fis as mobile data (fixes #1699)

streetcomplete · Jan 26, 2020 · b12c754 · b12c754
1 parent 0286d5e
commit b12c754
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/QuestAutoSyncer.kt b/app/src/main/java/de/westnordost/streetcomplete/data/QuestAutoSyncer.kt
@@ -168,10 +168,12 @@ class QuestAutoSyncer @Inject constructor(
 
     private fun updateConnectionState(): Boolean {
         val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val info = connectivityManager.activeNetworkInfo
+        val info = connectivityManager.activeNetworkInfo ?: return false
 
-        val newIsConnected = info?.isConnected == true
-        val newIsWifi = newIsConnected && info?.type == ConnectivityManager.TYPE_WIFI
+        val newIsConnected = info.isConnected
+        // metered (usually ad-hoc hotspots) do not count as proper wifis
+        val isMetered = connectivityManager.isActiveNetworkMetered
+        val newIsWifi = newIsConnected && info.type == ConnectivityManager.TYPE_WIFI && !isMetered
 
         val result = newIsConnected != isConnected || newIsWifi != isWifi