bug fixes, and code cleanup in preparation of release.

Author: m4gr3d

Android/build.gradle

@@ -11,7 +11,7 @@ dependencies {
     compile 'com.android.support:cardview-v7:21.0.2'
     compile 'com.android.support:recyclerview-v7:21.0.2'
 
-    compile 'com.o3dr:3dr-services-lib:2.1.55'
+    compile 'com.o3dr:3dr-services-lib:2.2.2'
 
     compile files('libs/droneapi-java-0.3-SNAPSHOT.jar')
     compile files('libs/j2xx.jar')

Android/res/layout/fragment_telemetry.xml

@@ -78,8 +78,7 @@
             android:id="@+id/flight_time_layout"
             android:orientation="horizontal"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="36dp"
+            android:layout_height="48dp"
             android:layout_below="@+id/rollValueText"
             android:background="@drawable/round_rect_bg"
             android:layout_marginBottom="2dp"
@@ -94,15 +93,16 @@
                 android:id="@+id/reset_flight_timer_button"
                 android:src="@drawable/ic_restore_white_24dp"
                 style="?android:attr/borderlessButtonStyle"
-                android:layout_width="36dp"
-                android:layout_height="wrap_content"/>
+                android:layout_width="48dp"
+                android:layout_height="48dp"/>
 
             <TextView
                 android:id="@+id/flight_timer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingLeft="5dp"
                 style="@style/largeTelemetryText"
-                android:gravity="center"
+                android:gravity="start|center_vertical"
                 android:text="00:00"
                 tools:text="99:99"/>
 

Android/src/org/droidplanner/android/DroidPlannerApp.java

@@ -12,10 +12,10 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.o3dr.android.client.ControlTower;
 import com.o3dr.android.client.Drone;
-import com.o3dr.android.client.ServiceManager;
 import com.o3dr.android.client.interfaces.DroneListener;
-import com.o3dr.android.client.interfaces.ServiceListener;
+import com.o3dr.android.client.interfaces.TowerListener;
 import com.o3dr.services.android.lib.drone.attribute.AttributeEvent;
 import com.o3dr.services.android.lib.drone.connection.ConnectionParameter;
 import com.o3dr.services.android.lib.drone.connection.ConnectionResult;
@@ -33,7 +33,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class DroidPlannerApp extends Application implements DroneListener, ServiceListener {
+public class DroidPlannerApp extends Application implements DroneListener, TowerListener {
 
     private static final long DELAY_TO_DISCONNECTION = 30000l; // ms
 
@@ -73,24 +73,27 @@ public void onReceive(Context context, Intent intent) {
     };
 
     @Override
-    public void onServiceConnected() {
+    public void onTowerConnected() {
         if (notificationHandler == null) {
             notificationHandler = new NotificationHandler(getApplicationContext(), drone);
         }
 
-        if (!drone.isStarted()) {
-            this.drone.start();
-            this.drone.registerDroneListener(this);
-        }
+        drone.unregisterDroneListener(this);
+        controlTower.registerDrone(drone, handler);
+        drone.registerDroneListener(this);
 
         notifyApiConnected();
     }
 
     @Override
-    public void onServiceInterrupted() {
+    public void onTowerDisconnected() {
         notifyApiDisconnected();
     }
 
+    public DroidPlannerPrefs getAppPreferences() {
+        return dpPrefs;
+    }
+
     public interface ApiListener {
         void onApiConnected();
 
@@ -100,8 +103,8 @@ public interface ApiListener {
     private final Runnable disconnectionTask = new Runnable() {
         @Override
         public void run() {
-            drone.destroy();
-            serviceMgr.disconnect();
+            controlTower.unregisterDrone(drone);
+            controlTower.disconnect();
 
             if (notificationHandler != null) {
                 notificationHandler.terminate();
@@ -125,7 +128,7 @@ public void uncaughtException(Thread thread, Throwable ex) {
 
     private Thread.UncaughtExceptionHandler exceptionHandler;
 
-    private ServiceManager serviceMgr;
+    private ControlTower controlTower;
     private Drone drone;
 
     private MissionProxy missionProxy;
@@ -141,8 +144,8 @@ public void onCreate() {
         dpPrefs = new DroidPlannerPrefs(context);
         lbm = LocalBroadcastManager.getInstance(context);
 
-        serviceMgr = new ServiceManager(context);
-        drone = new Drone(serviceMgr, handler);
+        controlTower = new ControlTower(context);
+        drone = new Drone();
         missionProxy = new MissionProxy(context, this.drone);
 
         exceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
@@ -162,13 +165,13 @@ public void addApiListener(ApiListener listener) {
             return;
 
         handler.removeCallbacks(disconnectionTask);
-        boolean isServiceConnected = serviceMgr.isServiceConnected();
-        if (isServiceConnected)
+        boolean isTowerConnected = controlTower.isTowerConnected();
+        if (isTowerConnected)
             listener.onApiConnected();
 
-        if (!isServiceConnected) {
+        if (!isTowerConnected) {
             try {
-                serviceMgr.connect(this);
+                controlTower.connect(this);
             } catch (IllegalStateException e) {
                 //Ignore
             }
@@ -330,7 +333,7 @@ public void onDroneEvent(String event, Bundle extras) {
 
     @Override
     public void onDroneServiceInterrupted(String errorMsg) {
-        drone.destroy();
+        controlTower.unregisterDrone(drone);
         if (notificationHandler != null) {
             notificationHandler.terminate();
             notificationHandler = null;

Android/src/org/droidplanner/android/activities/FlightActivity.java

@@ -21,6 +21,7 @@
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.o3dr.android.client.Drone;
+import com.o3dr.services.android.lib.coordinate.LatLong;
 import com.o3dr.services.android.lib.drone.attribute.AttributeEvent;
 import com.o3dr.services.android.lib.drone.attribute.AttributeEventExtra;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
@@ -410,6 +411,10 @@ private void setupMapFragment() {
         }
     }
 
+    public void setGuidedClickListener(FlightMapFragment.OnGuidedClickListener listener){
+        mapFragment.setGuidedClickListener(listener);
+    }
+
     @Override
     public void onStart() {
         super.onStart();

Android/src/org/droidplanner/android/activities/helpers/SuperUI.java

@@ -167,7 +167,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
         final MenuItem toggleConnectionItem = menu.findItem(R.id.menu_connect);
 
         Drone dpApi = dpApp.getDrone();
-        if (dpApi.isConnected()) {
+        if (dpApi != null && dpApi.isConnected()) {
             menu.setGroupEnabled(R.id.menu_group_connected, true);
             menu.setGroupVisible(R.id.menu_group_connected, true);
 
@@ -262,7 +262,7 @@ public void onNo() {
 
     public void toggleDroneConnection() {
         final Drone drone = dpApp.getDrone();
-        if (drone.isConnected())
+        if (drone != null && drone.isConnected())
             dpApp.disconnectFromDrone();
         else
             dpApp.connectToDrone();