Colota - Android GPS Location tracker
fix: crash on Android 11 from API 31+ NetworkCallback constructor and API 33+ RECEIVER_NOT_EXPORTED Closes #288
Max Dietrichf9a507aab482
diff --git a/apps/mobile/android/app/src/main/java/com/colota/service/ConditionMonitor.kt b/apps/mobile/android/app/src/main/java/com/colota/service/ConditionMonitor.ktindex 66fb1a62..b61e2c22 100644--- a/apps/mobile/android/app/src/main/java/com/colota/service/ConditionMonitor.kt+++ b/apps/mobile/android/app/src/main/java/com/colota/service/ConditionMonitor.kt@@ -5,6 +5,7 @@package com.Colota.service+import android.os.Buildimport android.content.BroadcastReceiverimport android.content.Contextimport android.content.Intent@@ -92,7 +93,11 @@ class ConditionMonitor(addAction(Intent.ACTION_POWER_CONNECTED)addAction(Intent.ACTION_POWER_DISCONNECTED)}- context.registerReceiver(chargingReceiver, filter, Context.RECEIVER_NOT_EXPORTED)+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {+ context.registerReceiver(chargingReceiver, filter, Context.RECEIVER_NOT_EXPORTED)+ } else {+ context.registerReceiver(chargingReceiver, filter)+ }}private fun startCarConnectionMonitor() {diff --git a/apps/mobile/android/app/src/main/java/com/colota/sync/NetworkManager.kt b/apps/mobile/android/app/src/main/java/com/colota/sync/NetworkManager.ktindex 0a9cdac3..b2109ce0 100644--- a/apps/mobile/android/app/src/main/java/com/colota/sync/NetworkManager.kt+++ b/apps/mobile/android/app/src/main/java/com/colota/sync/NetworkManager.kt@@ -2,9 +2,11 @@ package com.Colota.syncimport android.content.Contextimport android.net.wifi.WifiInfo+import android.net.wifi.WifiManagerimport com.Colota.BuildConfigimport com.Colota.util.AppLoggerimport com.Colota.util.TimedCache+import android.os.Buildimport android.net.ConnectivityManagerimport android.net.Networkimport android.net.NetworkCapabilities@@ -36,17 +38,35 @@ class NetworkManager(private val context: Context) {@Volatile private var currentSsid: String = ""@Volatile private var isVpn: Boolean = false+ private val wifiManager = context.getSystemService(Context.WIFI_SERVICE) as? WifiManager- private val networkCallback = object : ConnectivityManager.NetworkCallback(FLAG_INCLUDE_LOCATION_INFO) {- override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) {- val wifiInfo = caps.transportInfo as? WifiInfo- currentSsid = wifiInfo?.ssid?.removeSurrounding("\"") ?: ""- isVpn = caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)- }+ private val networkCallback = createNetworkCallback()- override fun onLost(network: Network) {- currentSsid = ""- isVpn = false+ private fun createNetworkCallback(): ConnectivityManager.NetworkCallback {+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {+ object : ConnectivityManager.NetworkCallback(FLAG_INCLUDE_LOCATION_INFO) {+ override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) {+ val wifiInfo = caps.transportInfo as? WifiInfo+ currentSsid = wifiInfo?.ssid?.removeSurrounding("\"") ?: ""+ isVpn = caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)+ }+ override fun onLost(network: Network) {+ currentSsid = ""+ isVpn = false+ }+ }+ } else {+ object : ConnectivityManager.NetworkCallback() {+ @Suppress("DEPRECATION")+ override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) {+ currentSsid = wifiManager?.connectionInfo?.ssid?.removeSurrounding("\"") ?: ""+ isVpn = caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)+ }+ override fun onLost(network: Network) {+ currentSsid = ""+ isVpn = false+ }+ }}}