From 6c541f545a57ea462430544905dffaf434806d94 Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 30 Dec 2025 15:49:32 +0530 Subject: [PATCH 1/2] Fix NPE when reading SSID from WifiInfo --- .../org/microg/gms/location/network/wifi/extensions.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/extensions.kt b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/extensions.kt index f991762bf..1dfc59a39 100644 --- a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/extensions.kt +++ b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/extensions.kt @@ -24,9 +24,9 @@ internal fun ScanResult.toWifiDetails(): WifiDetails = WifiDetails( @RequiresApi(31) internal fun WifiInfo.toWifiDetails(): WifiDetails = WifiDetails( - macAddress = bssid, - ssid = ssid.takeIf { it != WifiManager.UNKNOWN_SSID && it.startsWith("\"") && it.endsWith("\"") } - ?.let { it.substring(1, it.length - 1) }, + macAddress = bssid ?: "02:00:00:00:00:00", + ssid = ssid?.removeSurrounding("\"") + ?.takeIf { it.isNotEmpty() && it != WifiManager.UNKNOWN_SSID }, timestamp = System.currentTimeMillis(), frequency = frequency, signalStrength = rssi, -- GitLab From da3fdb29b891f2319b9484cdb8dfd53da54bd5ce Mon Sep 17 00:00:00 2001 From: althafvly Date: Tue, 30 Dec 2025 19:30:34 +0530 Subject: [PATCH 2/2] location: allow IP fallback for Wi-Fi geolocation --- .../microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt index 1cb10da76..0e9056f9c 100644 --- a/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt +++ b/play-services-location/core/provider/src/main/kotlin/org/microg/gms/location/network/ichnaea/IchnaeaServiceClient.kt @@ -87,7 +87,6 @@ class IchnaeaServiceClient(private val context: Context) { suspend fun retrieveMultiWifiLocation(wifis: List, rawHandler: ((WifiDetails, Location) -> Unit)? = null): Location? = geoLocate( GeolocateRequest( - considerIp = false, wifiAccessPoints = wifis.filter { isRequestable(it) }.map(WifiDetails::toWifiAccessPoint), fallbacks = Fallback(lacf = true, ipf = true) ), -- GitLab