Prevent start mobile activity from starting when location not yet initialized

Author: Radosław Wieczorek

src/main/java/pl/llp/aircasting/screens/common/ToggleAircastingManager.java

@@ -24,7 +24,7 @@
 /**
  * Created by radek on 21/06/17.
  */
-public class ToggleAircastingManager implements LocationHelper.LocationRequestListener {
+public class ToggleAircastingManager {
     public AppCompatDelegate delegate;
     private Context context;
     private Activity activity;
@@ -89,18 +89,12 @@ private void stopMobileAirCasting(Session session) {
 
     public void startMobileAirCasting() {
         locationHelper.initLocation();
-        locationHelper.registerListener(this);
         locationHelper.checkLocationSettings(activity);
-    }
 
-    @Override
-    public void onLocationRequestSuccess() {
         if (locationHelper.locationUpdatesStarted()) {
             dashboardChartManager.start();
 
             activity.startActivity(new Intent(activity, StartMobileSessionActivity.class));
-        } else {
-            toggleAirCasting();
         }
     }
 }

src/main/java/pl/llp/aircasting/screens/common/helpers/LocationHelper.java

@@ -53,7 +53,6 @@ public class LocationHelper {
 
     private FusedLocationProviderClient mFusedLocationProviderClient;
     private Location mLastLocation;
-    private LocationRequestListener mLocationRequestListener;
     private LocationRequest mLocationRequest;
     private Boolean mLocationUpdatesStarted = false;
 
@@ -69,10 +68,6 @@ public void onLocationResult(LocationResult locationResult) {
         }
     };
 
-    public interface LocationRequestListener {
-        void onLocationRequestSuccess();
-    }
-
     public void checkLocationSettings(Activity activity) {
         checkLocationSettingsSatisfied(activity);
     }
@@ -86,7 +81,7 @@ public void initLocation() {
                     @Override
                     public void onSuccess(Location location) {
                         if (location != null) {
-                            mLastLocation = location;
+                            updateLocation(location);
                         }
                     }
                 });
@@ -115,8 +110,8 @@ private boolean checkLocationSettingsSatisfied(final Activity activity) {
         task.addOnSuccessListener(new OnSuccessListener<LocationSettingsResponse>() {
             @Override
             public void onSuccess(LocationSettingsResponse locationSettingsResponse) {
+                initLocation();
                 startLocationUpdates();
-                mLocationRequestListener.onLocationRequestSuccess();
             }
         });
 
@@ -148,10 +143,6 @@ protected LocationRequest createLocationRequest() {
         return locationRequest;
     }
 
-    public void registerListener(LocationRequestListener listener) {
-        mLocationRequestListener = listener;
-    }
-
     public Location getLastLocation() {
         return mLastLocation;
     }

src/main/java/pl/llp/aircasting/screens/dashboard/DashboardBaseActivity.java

@@ -124,17 +124,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        switch (requestCode) {
-            case PERMISSIONS_REQUEST_FINE_LOCATION:
-                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    toggleAircastingManager.toggleAirCasting();
-                }
-                break;
-        }
-    }
-
     private void checkForUnfinishedSessions() {
         if (shouldCheckForUnfinishedSessions()) {
             new AsyncTask<Void, Void, Void>() {

src/main/java/pl/llp/aircasting/screens/stream/base/AirCastingBaseActivity.java

@@ -142,17 +142,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        switch (requestCode) {
-            case PERMISSIONS_REQUEST_FINE_LOCATION:
-                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    toggleAircastingManager.toggleAirCasting();
-                }
-                break;
-        }
-    }
-
     private void checkForUnfinishedSessions() {
         if (shouldCheckForUnfinishedSessions()) {
             new AsyncTask<Void, Void, Void>() {