gps problem dialog issue resolved

nawinkhatiwada · Dec 30, 2019 · fa7104b · fa7104b
1 parent d819068
commit fa7104b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/app/src/main/java/com/androidbolts/locationmanager/fragment/LocationFragment.kt b/app/src/main/java/com/androidbolts/locationmanager/fragment/LocationFragment.kt
@@ -48,7 +48,7 @@ class LocationFragment private constructor() : BaseFragment() {
                 isObserverAdded = true
             }
             locationManager?.getLocation()
-        }
+       }
     }
 
     override fun onLocationChanged(location: Location?) {

diff --git a/library/src/main/java/com/androidbolts/library/LocationManager.kt b/library/src/main/java/com/androidbolts/library/LocationManager.kt
@@ -88,7 +88,7 @@ class LocationManager private constructor(
 
     private fun permissionGranted(alreadyHadPermission: Boolean) {
         locationListener?.onPermissionGranted(alreadyHadPermission)
-        gpsProvider.get()
+//        gpsProvider.get()
     }
 
     private fun onPermissionGrantedFailed() {

diff --git a/library/src/main/java/com/androidbolts/library/gps/GpsManager.kt b/library/src/main/java/com/androidbolts/library/gps/GpsManager.kt
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.IntentSender
 import android.location.Location
-import android.os.Handler
+import android.os.CountDownTimer
 import android.os.Looper
 import android.util.Log
 import android.view.View
@@ -38,6 +38,7 @@ internal class GpsManager private constructor() : GpsProvider() {
     private var mLocationSettingsRequest: LocationSettingsRequest? = null
     private var dialog: AlertDialog? = null
     private var mRequestingLocationUpdates: Boolean = false
+    private var timer: CountDownTimer ?= null
 
     companion object {
         private var gpsManager: GpsManager? = null
@@ -117,6 +118,7 @@ internal class GpsManager private constructor() : GpsProvider() {
                     getPrefs()?.setLocationModel(locationModel)
                 }
                 if (isLocationAvailable()) {
+                    timer?.cancel()
                     dismissDialog()
                 }
 
@@ -208,12 +210,22 @@ internal class GpsManager private constructor() : GpsProvider() {
                     val negButton = dialog?.getButton(Dialog.BUTTON_NEGATIVE)
                     posButton?.visibility = View.GONE
                     negButton?.visibility = View.GONE
-                    if (getTimeOut() != TIME_OUT_NONE) {
-                        Handler().postDelayed({
-                            posButton?.visibility = View.VISIBLE
-                            negButton?.visibility = View.VISIBLE
-                            updateDialog()
-                        }, getTimeOut())
+                    if (getTimeOut() != TIME_OUT_NONE && mCurrentLocation == null) {
+                       timer = object :CountDownTimer(getTimeOut(), 1000){
+                           override fun onFinish() {
+                               if(mCurrentLocation == null) {
+                                   posButton?.visibility = View.VISIBLE
+                                   negButton?.visibility = View.VISIBLE
+                                   updateDialog()
+                               }else {
+                                   dismissDialog()
+                               }
+                           }
+
+                           override fun onTick(running: Long) {
+                           }
+                       }
+                        timer?.start()
                     }
                 }
                 dialog?.let { loadingDialog ->
@@ -228,9 +240,8 @@ internal class GpsManager private constructor() : GpsProvider() {
     }
 
     private fun updateDialog() {
-        dialog?.findViewById<TextView>(R.id.title)?.text = "Gps problem"
-        dialog?.findViewById<TextView>(R.id.message)?.text =
-            "We couldn't fetch your current location."
+        dialog?.findViewById<TextView>(R.id.title)?.text = getContext()?.getString(R.string.gps_problem)
+        dialog?.findViewById<TextView>(R.id.message)?.text =getContext()?.getString(R.string.gps_problem_desc)
         dialog?.findViewById<ProgressBar>(R.id.progress_circular)?.visibility = View.GONE
     }
 

diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">library</string>
+    <string name="gps_problem" >Gps problem</string>
+    <string name="gps_problem_desc" >We couldn\'t fetch your current location.</string>
 </resources>
-Original file line number
+Diff line change
@@ Expand Up @@
                     isObserverAdded = true
                 }
                 locationManager?.getLocation()
-            }
+           }
         }
         override fun onLocationChanged(location: Location?) {
@@ Expand Down @@