Fixed possible npe when initializing a BaseSpatialItem object.

dronekit · Feb 6, 2015 · bb4d246 · bb4d246
1 parent fb5b031
commit bb4d246
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/AidlLib/build.gradle b/AidlLib/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 20043
-        versionName '2.0.43'
+        versionCode 20044
+        versionName '2.0.44'
     }
 
     defaultPublishConfig "release"

diff --git a/AidlLib/src/com/o3dr/services/android/lib/drone/mission/item/spatial/BaseSpatialItem.java b/AidlLib/src/com/o3dr/services/android/lib/drone/mission/item/spatial/BaseSpatialItem.java
@@ -19,7 +19,7 @@ protected BaseSpatialItem(MissionItemType type) {
 
     protected BaseSpatialItem(BaseSpatialItem copy){
         this(copy.getType());
-        coordinate = new LatLongAlt(copy.coordinate);
+        coordinate = copy.coordinate == null ? null : new LatLongAlt(copy.coordinate);
     }
 
     @Override

diff --git a/ClientLib/mobile/build.gradle b/ClientLib/mobile/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 ext {
     PUBLISH_ARTIFACT_ID = '3dr-services-lib'
-    PUBLISH_VERSION = '2.2.6'
+    PUBLISH_VERSION = '2.2.7'
     PROJECT_DESCRIPTION = "3DR Services Client Library"
     PROJECT_LABELS = ['3DR', '3DR Services', 'DroneAPI', 'Android']
     PROJECT_LICENSES = ['Apache-2.0']
@@ -15,7 +15,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 20206
+        versionCode 20207
         versionName PUBLISH_VERSION
     }
 

diff --git a/ClientLib/mobile/libs/AidlLib.jar b/ClientLib/mobile/libs/AidlLib.jar
diff --git a/ServiceApp/build.gradle b/ServiceApp/build.gradle
@@ -27,7 +27,7 @@ android {
         applicationId 'org.droidplanner.services.android'
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 10202
+        versionCode 10203
         versionName getGitVersion()
     }