Merge pull request #13 from rogerhu/fbu

Make onSuccess and onFailure() listeners more explicit

Author: nesquena

app/src/main/java/com/example/mapdemo/MapDemoActivity.java

@@ -25,8 +25,8 @@
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 
 import permissions.dispatcher.NeedsPermission;
 import permissions.dispatcher.RuntimePermissions;
@@ -100,18 +100,26 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
 
     @NeedsPermission({Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION})
     void getMyLocation() {
+        //noinspection MissingPermission
+        map.setMyLocationEnabled(true);
+
         FusedLocationProviderClient locationClient = getFusedLocationProviderClient(this);
         //noinspection MissingPermission
         locationClient.getLastLocation()
-                .addOnCompleteListener(this, new OnCompleteListener<Location>() {
+                .addOnSuccessListener(new OnSuccessListener<Location>() {
                     @Override
-                    public void onComplete(@NonNull Task<Location> task) {
-                        if (task.isSuccessful() && task.getResult() != null) {
-                            onLocationChanged(task.getResult());
-                        } else {
-                            Log.d("MapDemoActivity", "Error");
+                    public void onSuccess(Location location) {
+                        if (location != null) {
+                            onLocationChanged(location);
                         }
                     }
+                })
+                .addOnFailureListener(new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        Log.d("MapDemoActivity", "Error trying to get last GPS location");
+                        e.printStackTrace();
+                    }
                 });
     }
 
@@ -197,15 +205,18 @@ public void onLocationResult(LocationResult locationResult) {
     }
 
     public void onLocationChanged(Location location) {
+        // GPS may be turned off
+        if (location == null) {
+            return;
+        }
+
         // Report to the UI that the location was updated
+
         mCurrentLocation = location;
         String msg = "Updated Location: " +
                 Double.toString(location.getLatitude()) + "," +
                 Double.toString(location.getLongitude());
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
-
-        //noinspection MissingPermission
-        map.setMyLocationEnabled(true);
     }
 
     public void onSaveInstanceState(Bundle savedInstanceState) {