Build 154

  - Added Last Location provider indicator instead of removing last location entirely
  - Fixed few crashes related to maps panel and marker

Author: Hamza417

.idea/misc.xml

@@ -50,8 +50,8 @@ android {
 
     compileSdkVersion 31
 
-    def appVersionCode = 153
-    def appVersionName = "//${appVersionCode}_final"
+    def appVersionCode = 154
+    def appVersionName = "build${appVersionCode}_final"
 
     defaultConfig {
         applicationId "app.simple.positional"
@@ -128,10 +128,10 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.fragment:fragment-ktx:1.3.6'
+    implementation 'androidx.fragment:fragment-ktx:1.4.0'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
     implementation 'androidx.webkit:webkit:1.4.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
@@ -154,9 +154,9 @@ dependencies {
     implementation 'com.github.vipulasri:timelineview:1.1.5'
 
     // Room components
-    implementation "androidx.room:room-ktx:2.4.0-beta01"
-    kapt "androidx.room:room-compiler:2.4.0-beta01"
-    androidTestImplementation "androidx.room:room-testing:2.4.0-beta01"
+    implementation "androidx.room:room-ktx:2.4.0-beta02"
+    kapt "androidx.room:room-compiler:2.4.0-beta02"
+    androidTestImplementation "androidx.room:room-testing:2.4.0-beta02"
 
     // Leak Canary -- debugImplementation because LeakCanary should only run in debug builds.
     // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'

app/build.gradle

@@ -42,9 +42,11 @@ class FusedLocationService : Service() {
 
         fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(applicationContext)
         locationRequest = LocationRequest.create()
-                .setInterval(delay)
-                .setFastestInterval(delay)
-                .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
+            .setInterval(delay)
+            .setFastestInterval(delay)
+            .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
+
+        requestLastLocation()
 
         locationCallback = object : LocationCallback() {
             override fun onLocationResult(result: LocationResult) {
@@ -60,8 +62,6 @@ class FusedLocationService : Service() {
             }
         }
 
-        requestCurrentLocation()
-
         broadcastReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
                 Intent().also {
@@ -76,9 +76,9 @@ class FusedLocationService : Service() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        requestLastLocation()
         if (!handlerThread.isAlive) {
             handlerThread.start()
-            requestCurrentLocation()
         }
         return START_REDELIVER_INTENT
     }
@@ -87,6 +87,7 @@ class FusedLocationService : Service() {
         if (PermissionUtils.checkPermission(applicationContext)) {
             fusedLocationProviderClient.lastLocation.addOnCompleteListener {
                 if (it.isSuccessful && it.result.isNotNull()) {
+                    it.result.provider = "Last Location"
                     broadcastLocation(it.result)
                 }
 

app/src/main/java/app/simple/positional/services/FusedLocationService.kt

@@ -2,7 +2,6 @@ package app.simple.positional.services
 
 import android.app.Service
 import android.content.Intent
-import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
 import android.location.LocationManager
@@ -30,7 +29,7 @@ class LocationService : Service(), LocationListener {
     }
 
     override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        postLocationRunnable()
+        requestLastKnownLocation()
         return START_REDELIVER_INTENT
     }
 
@@ -58,7 +57,7 @@ class LocationService : Service(), LocationListener {
     }
 
     override fun onProviderEnabled(provider: String) {
-        postLocationRunnable()
+        requestLastKnownLocation()
         Intent().also { intent ->
             intent.action = "provider"
             intent.putExtra("location_provider", provider)
@@ -82,6 +81,32 @@ class LocationService : Service(), LocationListener {
         }
     }
 
+    private fun requestLastKnownLocation() {
+        if (PermissionUtils.checkPermission(applicationContext)) {
+            var location: Location? = null
+
+            when {
+                locationManager!!.isProviderEnabled(LocationManager.GPS_PROVIDER) -> {
+                    location = locationManager?.getLastKnownLocation(LocationManager.GPS_PROVIDER)
+                }
+                locationManager!!.isProviderEnabled(LocationManager.NETWORK_PROVIDER) -> {
+                    location = locationManager?.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
+                }
+                locationManager!!.isProviderEnabled(LocationManager.PASSIVE_PROVIDER) -> {
+                    location = locationManager?.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER)
+                }
+            }
+
+            if (location.isNull()) {
+                handler.post(locationUpdater)
+            } else {
+                location?.provider = "Last Location"
+                onLocationChanged(location!!)
+                handler.post(locationUpdater)
+            }
+        }
+    }
+
     private fun requestLocation() {
         if (PermissionUtils.checkPermission(applicationContext)) {
             when {
@@ -97,9 +122,4 @@ class LocationService : Service(), LocationListener {
             }
         }
     }
-
-    private fun postLocationRunnable() {
-        handler.removeCallbacks(locationUpdater)
-        handler.post(locationUpdater)
-    }
 }