bug fixes.

Author: m4gr3d

ClientLib/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 ext {
     PUBLISH_ARTIFACT_ID = 'dronekit-android'
-    PUBLISH_VERSION = '2.3.08'
+    PUBLISH_VERSION = '2.3.09'
     PROJECT_DESCRIPTION = "DroneKit-Android Client Library"
     PROJECT_LABELS = ['3DR', '3DR Services', 'DroneAPI', 'Android', 'DroneKit']
     PROJECT_LICENSES = ['Apache-2.0']
@@ -17,7 +17,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 20308
+        versionCode 20309
         versionName PUBLISH_VERSION
     }
 

ClientLib/src/main/java/com/o3dr/services/android/lib/drone/attribute/AttributeEvent.java

@@ -14,7 +14,7 @@ public class AttributeEvent {
 
     /**
      * Signals an autopilot error.
-     * @see {@link com.o3dr.services.android.lib.drone.attribute.AttributeEventExtra#EXTRA_AUTOPILOT_ERROR_TYPE}
+     * @see {@link com.o3dr.services.android.lib.drone.attribute.AttributeEventExtra#EXTRA_AUTOPILOT_ERROR_ID}
      */
     public static final String AUTOPILOT_ERROR = PACKAGE_NAME + ".AUTOPILOT_ERROR";
 

ClientLib/src/main/java/com/o3dr/services/android/lib/drone/attribute/AttributeEventExtra.java

@@ -12,7 +12,7 @@ public class AttributeEventExtra {
      * @see {@link com.o3dr.services.android.lib.drone.attribute.error.ErrorType}
      * @see {@link com.o3dr.services.android.lib.drone.attribute.AttributeEvent#AUTOPILOT_ERROR}
      */
-    public static final String EXTRA_AUTOPILOT_ERROR_TYPE = PACKAGE_NAME + ".AUTOPILOT_ERROR_TYPE";
+    public static final String EXTRA_AUTOPILOT_ERROR_ID = PACKAGE_NAME + ".AUTOPILOT_ERROR_ID";
 
     /**
      * Used to access autopilot messages.

ClientLib/src/main/java/com/o3dr/services/android/lib/drone/attribute/error/ErrorType.java

@@ -4,6 +4,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.StringRes;
+import android.text.TextUtils;
 
 import com.o3dr.android.client.R;
 
@@ -69,6 +70,13 @@ public CharSequence getLabel(Context context){
         return context.getText(this.labelResId);
     }
 
+    public static ErrorType getErrorById(String errorId){
+        if(TextUtils.isEmpty(errorId))
+            return null;
+
+        return ErrorType.valueOf(errorId);
+    }
+
     @Override
     public int describeContents(){
         return 0;

ClientLib/src/main/java/com/o3dr/services/android/lib/drone/property/State.java

@@ -16,20 +16,20 @@ public class State implements Parcelable {
     private boolean isFlying;
     private String calibrationStatus;
     private VehicleMode vehicleMode = VehicleMode.UNKNOWN;
-    private String autopilotError;
+    private String autopilotErrorId;
     private int mavlinkVersion = INVALID_MAVLINK_VERSION;
     private long flightStartTime;
 
     public State(){}
 
-    public State(boolean isConnected, VehicleMode mode, boolean armed, boolean flying, String autopilotError,
+    public State(boolean isConnected, VehicleMode mode, boolean armed, boolean flying, String autopilotErrorId,
                  int mavlinkVersion, String calibrationStatus, long flightStartTime){
         this.isConnected = isConnected;
         this.vehicleMode = mode;
         this.armed = armed;
         this.isFlying = flying;
         this.flightStartTime = flightStartTime;
-        this.autopilotError = autopilotError;
+        this.autopilotErrorId = autopilotErrorId;
         this.mavlinkVersion = mavlinkVersion;
         this.calibrationStatus = calibrationStatus;
     }
@@ -74,16 +74,16 @@ public VehicleMode getVehicleMode() {
         return vehicleMode;
     }
 
-    public String getAutopilotError() {
-        return autopilotError;
+    public String getAutopilotErrorId() {
+        return autopilotErrorId;
     }
 
-    public void setAutopilotError(String autopilotError) {
-        this.autopilotError = autopilotError;
+    public void setAutopilotErrorId(String autopilotErrorId) {
+        this.autopilotErrorId = autopilotErrorId;
     }
 
     public boolean isWarning(){
-        return TextUtils.isEmpty(autopilotError);
+        return TextUtils.isEmpty(autopilotErrorId);
     }
 
     public boolean isCalibrating(){
@@ -122,7 +122,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeByte(isFlying ? (byte) 1 : (byte) 0);
         dest.writeString(this.calibrationStatus);
         dest.writeParcelable(this.vehicleMode, 0);
-        dest.writeString(this.autopilotError);
+        dest.writeString(this.autopilotErrorId);
         dest.writeInt(this.mavlinkVersion);
         dest.writeLong(this.flightStartTime);
     }
@@ -133,7 +133,7 @@ private State(Parcel in) {
         this.isFlying = in.readByte() != 0;
         this.calibrationStatus = in.readString();
         this.vehicleMode = in.readParcelable(VehicleMode.class.getClassLoader());
-        this.autopilotError = in.readString();
+        this.autopilotErrorId = in.readString();
         this.mavlinkVersion = in.readInt();
         this.flightStartTime = in.readLong();
     }

ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java

@@ -587,9 +587,8 @@ public void onDroneEvent(DroneInterfaces.DroneEventsType event, Drone drone) {
                 break;
 
             case AUTOPILOT_WARNING:
-                final ErrorType errorType = ErrorType.valueOf(drone.getState().getErrorType());
                 extrasBundle = new Bundle(1);
-                extrasBundle.putParcelable(AttributeEventExtra.EXTRA_AUTOPILOT_ERROR_TYPE, errorType);
+                extrasBundle.putString(AttributeEventExtra.EXTRA_AUTOPILOT_ERROR_ID, drone.getState().getErrorId());
                 droneEvent = AttributeEvent.AUTOPILOT_ERROR;
                 break;
 

ServiceApp/src/org/droidplanner/services/android/api/DroneApiUtils.java

@@ -350,7 +350,7 @@ static State getState(Drone drone, boolean isConnected) {
         String calibrationMessage = calibration.isCalibrating() ? calibration.getMessage() : null;
 
         return new State(isConnected, DroneApiUtils.getVehicleMode(droneMode), droneState.isArmed(), droneState.isFlying(),
-                droneState.getErrorType(), drone.getMavlinkVersion(), calibrationMessage,
+                droneState.getErrorId(), drone.getMavlinkVersion(), calibrationMessage,
                 droneState.getFlightStartTime());
     }
 

dependencyLibs/Core/src/org/droidplanner/core/drone/variables/State.java

@@ -15,7 +15,7 @@ public class State extends DroneVariable {
 
     private final AutopilotWarningParser warningParser;
 
-	private String errorType;
+	private String errorId;
 	private boolean armed = false;
 	private boolean isFlying = false;
 	private ApmModes mode = ApmModes.UNKNOWN;
@@ -38,7 +38,7 @@ public State(Drone myDrone, Clock clock, Handler handler, AutopilotWarningParser
 		this.clock = clock;
 		this.watchdog = handler;
         this.warningParser = warningParser;
-        this.errorType = warningParser.getDefaultWarning();
+        this.errorId = warningParser.getDefaultWarning();
 		resetFlightStartTime();
 	}
 
@@ -54,8 +54,8 @@ public ApmModes getMode() {
 		return mode;
 	}
 
-	public String getErrorType() {
-		return errorType;
+	public String getErrorId() {
+		return errorId;
 	}
 
 	public void setIsFlying(boolean newState) {
@@ -74,8 +74,8 @@ public boolean parseAutopilotError(String errorMsg){
         if(parsedError == null || parsedError.trim().isEmpty())
             return false;
 
-        if (!parsedError.equals(this.errorType)) {
-            this.errorType = parsedError;
+        if (!parsedError.equals(this.errorId)) {
+            this.errorId = parsedError;
             myDrone.notifyDroneEvent(DroneEventsType.AUTOPILOT_WARNING);
         }
 
@@ -85,7 +85,7 @@ public boolean parseAutopilotError(String errorMsg){
     }
 
     public void repeatWarning(){
-        if(errorType == null || errorType.length() == 0 || errorType.equals(warningParser.getDefaultWarning()))
+        if(errorId == null || errorId.length() == 0 || errorId.equals(warningParser.getDefaultWarning()))
             return;
 
         watchdog.removeCallbacks(watchdogCallback);
@@ -125,8 +125,8 @@ protected void resetWarning() {
         if(defaultWarning == null)
             defaultWarning = "";
 
-        if (!defaultWarning.equals(this.errorType)) {
-            this.errorType = defaultWarning;
+        if (!defaultWarning.equals(this.errorId)) {
+            this.errorId = defaultWarning;
             myDrone.notifyDroneEvent(DroneEventsType.AUTOPILOT_WARNING);
         }
 	}

release_android_library.gradle

@@ -29,6 +29,8 @@ task androidJavadocs(type: Javadoc) {
     title = projectDescription
     exclude '**/*.aidl'
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    options.links("http://docs.oracle.com/javase/7/docs/api/")
+    options.links("https://developer.android.com/reference/packages.html")
 }
 
 task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs){
@@ -77,6 +79,7 @@ bintray {
     pkg {
         repo = getMavenRepo()
         name = projectArtifactId
+        userOrg = '3d-robotics'
         desc = projectDescription
         websiteUrl = 'https://github.com/DroidPlanner/DroneKit-Android'
         issueTrackerUrl = 'https://github.com/DroidPlanner/DroneKit-Android/issues'