Receiving PX4 parameters supported

ClientLib/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 ext {
     VERSION_MAJOR = 2
     VERSION_MINOR = 8
-    VERSION_PATCH = 0
+    VERSION_PATCH = 1
     VERSION_SUFFIX = "release"
 
     PUBLISH_ARTIFACT_ID = 'dronekit-android'
@@ -59,7 +59,7 @@ dependencies {
     compile "com.google.android.gms:play-services-base:${play_services_version}"
 
     compile project(':Mavlink')
-    releaseCompile files('libs/Mavlink.jar')
+    compile files('libs/Mavlink.jar')
 }
 
 assemble.dependsOn ':Mavlink:jar'

ClientLib/src/main/java/com/o3dr/android/client/Drone.java

@@ -16,6 +16,7 @@
 import com.o3dr.android.client.apis.MissionApi;
 import com.o3dr.android.client.apis.VehicleApi;
 import com.o3dr.android.client.interfaces.DroneListener;
+import com.o3dr.android.client.interfaces.LinkListener;
 import com.o3dr.android.client.utils.TxPowerComplianceCountries;
 import com.o3dr.services.android.lib.coordinate.LatLong;
 import com.o3dr.services.android.lib.drone.attribute.AttributeEvent;
@@ -26,6 +27,7 @@
 import com.o3dr.services.android.lib.drone.companion.solo.SoloEvents;
 import com.o3dr.services.android.lib.drone.connection.ConnectionParameter;
 import com.o3dr.services.android.lib.drone.connection.ConnectionResult;
+import com.o3dr.services.android.lib.gcs.link.LinkConnectionStatus;
 import com.o3dr.services.android.lib.drone.mission.Mission;
 import com.o3dr.services.android.lib.drone.mission.item.MissionItem;
 import com.o3dr.services.android.lib.drone.property.Altitude;
@@ -44,6 +46,8 @@
 import com.o3dr.services.android.lib.gcs.follow.FollowState;
 import com.o3dr.services.android.lib.gcs.follow.FollowType;
 import com.o3dr.services.android.lib.gcs.returnToMe.ReturnToMeState;
+import com.o3dr.services.android.lib.gcs.link.LinkEvent;
+import com.o3dr.services.android.lib.gcs.link.LinkEventExtra;
 import com.o3dr.services.android.lib.mavlink.MavlinkMessageWrapper;
 import com.o3dr.services.android.lib.model.AbstractCommandListener;
 import com.o3dr.services.android.lib.model.IDroneApi;
@@ -60,7 +64,6 @@
  * Created by fhuya on 11/4/14.
  */
 public class Drone {
-
     private static final String CLAZZ_NAME = Drone.class.getName();
     private static final String TAG = Drone.class.getSimpleName();
 
@@ -108,6 +111,7 @@ public void binderDied() {
 
     private final AtomicReference<IDroneApi> droneApiRef = new AtomicReference<>(null);
     private ConnectionParameter connectionParameter;
+    private LinkListener linkListener;
     private ExecutorService asyncScheduler;
 
     // flightTimer
@@ -391,14 +395,35 @@ private <T extends Parcelable> T getAttributeDefaultValue(String attributeType)
         }
     }
 
+    /**
+     * Connect to a vehicle using a specified {@link ConnectionParameter}.
+     *
+     * @param connParams Specified parameters to determine how to connect the vehicle.
+     */
     public void connect(final ConnectionParameter connParams) {
+        connect(connParams, null);
+    }
+
+    /**
+     * Connect to a vehicle using a specified {@link ConnectionParameter} and a {@link LinkListener}
+     * callback.
+     *
+     * @param connParams Specified parameters to determine how to connect the vehicle.
+     * @param linkListener A callback that will update the caller on the state of the link connection.
+     */
+    public void connect(ConnectionParameter connParams, LinkListener linkListener) {
         VehicleApi.getApi(this).connect(connParams);
         this.connectionParameter = connParams;
+        this.linkListener = linkListener;
     }
 
+    /**
+     * Disconnect from the vehicle.
+     */
     public void disconnect() {
         VehicleApi.getApi(this).disconnect();
         this.connectionParameter = null;
+        this.linkListener = null;
     }
 
     private static AbstractCommandListener wrapListener(final Handler handler, final AbstractCommandListener listener) {
@@ -761,14 +786,18 @@ public void onRetrievalFailed() {
                 final Bundle eventInfo = new Bundle(1);
                 boolean isEUCompliant = !TxPowerComplianceCountries.getDefaultCountry().name().equals(compliantCountry);
                 eventInfo.putBoolean(SoloEventExtras.EXTRA_SOLO_EU_TX_POWER_COMPLIANT, isEUCompliant);
-                sendEventToListeners(SoloEvents.SOLO_EU_TX_POWER_COMPLIANCE_UPDATED, eventInfo);
+                sendDroneEventToListeners(SoloEvents.SOLO_EU_TX_POWER_COMPLIANCE_UPDATED, eventInfo);
                 break;
+
+            case LinkEvent.LINK_STATE_UPDATED:
+                sendLinkEventToListener(extras);
+                return;
         }
 
-        sendEventToListeners(attributeEvent, extras);
+        sendDroneEventToListeners(attributeEvent, extras);
     }
 
-    private void sendEventToListeners(final String attributeEvent, final Bundle extras) {
+    private void sendDroneEventToListeners(final String attributeEvent, final Bundle extras) {
         if (droneListeners.isEmpty()) {
             return;
         }
@@ -787,6 +816,24 @@ public void run() {
         });
     }
 
+    private void sendLinkEventToListener(Bundle extras) {
+        if (linkListener == null) {
+            return;
+        }
+
+        if (extras != null) {
+            final LinkConnectionStatus status = extras.getParcelable(LinkEventExtra.EXTRA_CONNECTION_STATUS);
+            if (status != null) {
+                handler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        linkListener.onLinkStateUpdated(status);
+                    }
+                });
+            }
+        }
+    }
+
     void notifyDroneServiceInterrupted(final String errorMsg) {
         if (droneListeners.isEmpty()) {
             return;

ClientLib/src/main/java/com/o3dr/android/client/DroneObserver.java

@@ -3,7 +3,6 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 
-import com.o3dr.services.android.lib.drone.connection.ConnectionResult;
 import com.o3dr.services.android.lib.model.IObserver;
 
 /**

ClientLib/src/main/java/com/o3dr/android/client/apis/CameraApi.java

@@ -27,7 +27,6 @@
  * @since 2.6.8
  */
 public class CameraApi extends Api {
-
     private static final ConcurrentHashMap<Drone, CameraApi> apiCache = new ConcurrentHashMap<>();
     private static final Builder<CameraApi> apiBuilder = new Builder<CameraApi>() {
         @Override
@@ -73,13 +72,14 @@ private CameraApi(Drone drone) {
      * Attempt to grab ownership and start the video stream from the connected drone. Can fail if
      * the video stream is already owned by another client.
      *
-     * @param surface  Surface object onto which the video is decoded.
-     * @param tag      Video tag.
-     * @param videoProps Non-null video properties. @see VIDEO_PROPS_UDP_PORT
-     * @param listener Register a callback to receive update of the command execution status.
+     * @param surface       Surface object onto which the video is decoded.
+     * @param tag           Video tag.
+     * @param videoProps    Non-null video properties. @see VIDEO_PROPS_UDP_PORT
+     * @param listener      Register a callback to receive update of the command execution status.
      * @since 2.6.8
      */
-    public void startVideoStream(@NonNull final Surface surface, final String tag, @NonNull Bundle videoProps, final AbstractCommandListener listener) {
+    public void startVideoStream(@NonNull final Surface surface, final String tag,
+                                 @NonNull Bundle videoProps, final AbstractCommandListener listener) {
         if (surface == null || videoProps == null) {
             postErrorEvent(CommandExecutionError.COMMAND_FAILED, listener);
             return;