fixed issue with complex mission item not building when disconnected …

…from the vehicle. updated status bar notification icon.
dronekit · Feb 16, 2015 · 0b30c27 · 0b30c27
1 parent ecaa6be
commit 0b30c27
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/ClientLib/mobile/libs/AidlLib.jar b/ClientLib/mobile/libs/AidlLib.jar
diff --git a/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java b/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java
@@ -853,21 +853,17 @@ public void buildComplexMissionItem(Bundle itemBundle) {
     }
 
     private Survey buildSurvey(Survey survey) {
-        if (droneMgr == null)
-            return survey;
-
-        org.droidplanner.core.mission.Mission droneMission = this.droneMgr.getDrone().getMission();
+        org.droidplanner.core.mission.Mission droneMission = droneMgr == null ? null
+                : this.droneMgr.getDrone().getMission();
         org.droidplanner.core.mission.survey.Survey updatedSurvey = (org.droidplanner.core.mission.survey.Survey) ProxyUtils.getMissionItemImpl
                 (droneMission, survey);
 
         return (Survey) ProxyUtils.getProxyMissionItem(updatedSurvey);
     }
 
     private StructureScanner buildStructureScanner(StructureScanner item) {
-        if (droneMgr == null)
-            return item;
-
-        org.droidplanner.core.mission.Mission droneMission = this.droneMgr.getDrone().getMission();
+        org.droidplanner.core.mission.Mission droneMission = droneMgr == null ? null
+        : this.droneMgr.getDrone().getMission();
         org.droidplanner.core.mission.waypoints.StructureScanner updatedScan = (org.droidplanner.core.mission.waypoints.StructureScanner) ProxyUtils
                 .getMissionItemImpl(droneMission, item);
 

diff --git a/ServiceApp/src/org/droidplanner/services/android/communication/service/UploaderService.java b/ServiceApp/src/org/droidplanner/services/android/communication/service/UploaderService.java
@@ -152,7 +152,7 @@ protected void onHandleIntent(Intent intent) {
 	private NotificationCompat.Builder generateNotificationBuilder() {
 		return new NotificationCompat.Builder(getApplicationContext())
 				.setContentTitle(getString(R.string.uploader_notification_title))
-				.setSmallIcon(R.drawable.ic_launcher)
+				.setSmallIcon(R.drawable.ic_stat_notify)
 				// .setProgress(fileSize, 0, false)
 				.setAutoCancel(true).setPriority(NotificationCompat.PRIORITY_HIGH);
 	}