added check for the google play services version. Should help with issues like #631

Author: m4gr3d

DroidPlanner/src/org/droidplanner/activities/FlightActivity.java

@@ -1,16 +1,30 @@
 package org.droidplanner.activities;
 
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.view.View;
+import android.widget.Toast;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GooglePlayServicesUtil;
+import com.google.android.gms.maps.model.LatLng;
+
+import org.droidplanner.R;
 import org.droidplanner.activities.helpers.SuperUI;
 import org.droidplanner.drone.Drone;
 import org.droidplanner.drone.DroneInterfaces.DroneEventsType;
 import org.droidplanner.drone.DroneInterfaces.OnDroneListener;
 import org.droidplanner.drone.variables.mission.MissionItem;
 import org.droidplanner.drone.variables.mission.waypoints.SpatialCoordItem;
 import org.droidplanner.fragments.FlightActionsFragment;
+import org.droidplanner.fragments.FlightActionsFragment.OnMissionControlInteraction;
 import org.droidplanner.fragments.FlightMapFragment;
 import org.droidplanner.fragments.RCFragment;
 import org.droidplanner.fragments.TelemetryFragment;
-import org.droidplanner.fragments.FlightActionsFragment.OnMissionControlInteraction;
 import org.droidplanner.fragments.helpers.DroneMap;
 import org.droidplanner.fragments.helpers.OnMapInteractionListener;
 import org.droidplanner.fragments.mode.ModeAcroFragment;
@@ -27,18 +41,11 @@
 import org.droidplanner.fragments.mode.ModeStabilizeFragment;
 import org.droidplanner.polygon.PolygonPoint;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.view.View;
-
-import org.droidplanner.R;
-import com.google.android.gms.maps.model.LatLng;
-
 public class FlightActivity extends SuperUI implements
 		OnMapInteractionListener, OnMissionControlInteraction, OnDroneListener{
 
+    private static final int GOOGLE_PLAY_SERVICES_REQUEST_CODE = 101;
+
     private FragmentManager fragmentManager;
 	private RCFragment rcFragment;
 	private View failsafeTextView;
@@ -61,12 +68,6 @@ public void onCreate(Bundle savedInstanceState) {
             fragmentManager.beginTransaction().add(R.id.modeInfoPanel, modeRtl).commit();
         }
 
-        mapFragment = fragmentManager.findFragmentById(R.id.mapFragment);
-        if(mapFragment == null){
-            mapFragment = new FlightMapFragment();
-            fragmentManager.beginTransaction().add(R.id.mapFragment, mapFragment).commit();
-        }
-
         Fragment telemetryFragment = fragmentManager.findFragmentById(R.id.telemetryFragment);
         if(telemetryFragment == null){
             telemetryFragment = new TelemetryFragment();
@@ -79,14 +80,61 @@ public void onCreate(Bundle savedInstanceState) {
             editorTools = new FlightActionsFragment();
             fragmentManager.beginTransaction().add(R.id.editorToolsFragment, editorTools).commit();
         }
-	}
+
+    }
+
+    /**
+     * Ensures that the device has the correct version of the Google Play Services.
+     * @return true if the Google Play Services binary is valid
+     */
+    private boolean isGooglePlayServicesValid(boolean showErrorDialog){
+        //Check for the google play services is available
+        final int playStatus = GooglePlayServicesUtil.isGooglePlayServicesAvailable
+                (getApplicationContext());
+        final boolean isValid = playStatus == ConnectionResult.SUCCESS;
+
+        if (!isValid && showErrorDialog) {
+            final Dialog errorDialog = GooglePlayServicesUtil.getErrorDialog(playStatus, this,
+                    GOOGLE_PLAY_SERVICES_REQUEST_CODE, new DialogInterface.OnCancelListener() {
+                @Override
+                public void onCancel(DialogInterface dialog) {
+                    finish();
+                }
+            });
+
+            if (errorDialog != null)
+                errorDialog.show();
+        }
+
+        return isValid;
+    }
+
+    /**
+     * Used to setup the flight screen map fragment. Before attempting to initialize the map
+     * fragment, this checks if the Google Play Services binary is installed and up to date.
+     */
+    private void setupMapFragment(){
+        if(mapFragment == null && isGooglePlayServicesValid(true)) {
+            mapFragment = fragmentManager.findFragmentById(R.id.mapFragment);
+            if (mapFragment == null) {
+                mapFragment = new FlightMapFragment();
+                fragmentManager.beginTransaction().add(R.id.mapFragment, mapFragment).commit();
+            }
+        }
+    }
 
 	@Override
 	protected void onStart() {
 		super.onStart();
 		onModeChanged(drone);	// Update the mode detail panel;
 	}
 
+    @Override
+    public void onResume(){
+        super.onResume();
+        setupMapFragment();
+    }
+
 	@Override
 	public void onAddPoint(LatLng point) {
 		// TODO Auto-generated method stub
@@ -130,8 +178,11 @@ public void onJoystickSelected() {
 
 	@Override
 	public void onPlanningSelected() {
-		((DroneMap) mapFragment ).saveCameraPosition();
-		Intent navigationIntent;
+        if (mapFragment != null) {
+            ((DroneMap) mapFragment ).saveCameraPosition();
+        }
+
+        Intent navigationIntent;
 		navigationIntent = new Intent(this, EditorActivity.class);
 		startActivity(navigationIntent);
 	}