bug fixes

JobGetabu · Nov 8, 2020 · caa71c0 · caa71c0
1 parent 13a5efd
commit caa71c0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/droidLocationLibrary/src/main/java/ax/synt/droidlocation/DroidLocationAppCompatActivity.java b/droidLocationLibrary/src/main/java/ax/synt/droidlocation/DroidLocationAppCompatActivity.java
@@ -7,6 +7,7 @@
 import android.location.Geocoder;
 import android.location.Location;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -27,15 +28,17 @@ protected Location getLastKnownLocation() {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        droidLocationDelegate = new DroidLocationDelegate(this,this);
+        droidLocationDelegate = new DroidLocationDelegate(this, this);
         droidLocationDelegate.onCreate();
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         //droidLocationDelegate.showLocationSettingDialog(requestCode);
-        droidLocationDelegate.doWeStartLocationService(resultCode);
+        if (droidLocationDelegate != null) {
+            droidLocationDelegate.doWeStartLocationService(resultCode);
+        }
     }
 
     @Override
@@ -59,7 +62,7 @@ protected void requestSingleLocationFix(DroidLocationRequest droidLocationReques
         droidLocationDelegate.requestSingleLocationFix(droidLocationRequest, ENABLE_LOCATION_SERVICES_REQUEST);
     }
 
-    protected void requestAddressServices(Location location){
+    protected void requestAddressServices(Location location) {
         droidLocationDelegate.startIntentService(location);
     }
 

diff --git a/droidLocationLibrary/src/main/java/ax/synt/droidlocation/DroidLocationDelegate.java b/droidLocationLibrary/src/main/java/ax/synt/droidlocation/DroidLocationDelegate.java
@@ -17,6 +17,7 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
+
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -134,6 +135,8 @@ private String hasLocationPermission() {
     }
 
     private void showPermissionRequireDialog(final int requestCode) {
+        if(droidLocationRequest == null) return;
+
         String title = TextUtils.isEmpty(droidLocationRequest.locationPermissionDialogTitle) ? activity.getString(R.string.location_permission_dialog_title) : droidLocationRequest.locationPermissionDialogTitle;
         String message = TextUtils.isEmpty(droidLocationRequest.locationPermissionDialogMessage) ? activity.getString(R.string.location_permission_dialog_message) : droidLocationRequest.locationPermissionDialogMessage;
         String negativeButtonTitle = TextUtils.isEmpty(droidLocationRequest.locationPermissionDialogNegativeButtonText) ? activity.getString(android.R.string.cancel) : droidLocationRequest.locationPermissionDialogNegativeButtonText;
@@ -159,6 +162,8 @@ public void onClick(DialogInterface dialogInterface, int i) {
     @Deprecated
     // warning: Use @showLocationSettingDialog(int requestcode)
     private void showLocationServicesRequireDialog() {
+        if(droidLocationRequest == null) return;
+
         String title = TextUtils.isEmpty(droidLocationRequest.locationSettingsDialogTitle) ? activity.getString(R.string.location_services_off) : droidLocationRequest.locationSettingsDialogTitle;
         String message = TextUtils.isEmpty(droidLocationRequest.locationSettingsDialogMessage) ? activity.getString(R.string.open_location_settings) : droidLocationRequest.locationSettingsDialogMessage;
         String negativeButtonText = TextUtils.isEmpty(droidLocationRequest.locationSettingsDialogNegativeButtonText) ? activity.getString(android.R.string.cancel) : droidLocationRequest.locationSettingsDialogNegativeButtonText;
@@ -184,10 +189,15 @@ public void onClick(DialogInterface dialogInterface, int i) {
 
     void doWeStartLocationService(int resultCode) {
         Log.d("DroidLocation", "doWeStartLocationService: " + resultCode);
+        if(droidLocationRequest == null) return;
+
         switch (resultCode) {
             case Activity.RESULT_OK:
-                startLocationBGService(mLocationRequest, droidLocationRequest.fallBackToLastLocationTime);
-                droidLocationListener.onLocationProviderEnabled();
+
+                if(droidLocationRequest != null){
+                    startLocationBGService(mLocationRequest, droidLocationRequest.fallBackToLastLocationTime);
+                    droidLocationListener.onLocationProviderEnabled();
+                }
                 break;
             case Activity.RESULT_CANCELED:
                 droidLocationListener.onLocationProviderDisabled();
@@ -201,6 +211,8 @@ void doWeStartLocationService(int resultCode) {
      * */
     void showLocationSettingDialog(final int requestcode) {
 
+        if(droidLocationRequest == null) return;
+
         //requestcode = (requestcode == -1) ? ENABLE_LOCATION_SERVICES_REQUEST : requestcode;
 
         GoogleApiClient mGoogleApiClient = new GoogleApiClient.Builder(activity)