From 0b30c272599f5eddab576e15a58af929ff888d88 Mon Sep 17 00:00:00 2001 From: ne0fhyk Date: Mon, 16 Feb 2015 13:25:32 -0800 Subject: [PATCH] fixed issue with complex mission item not building when disconnected from the vehicle. updated status bar notification icon. --- ClientLib/mobile/libs/AidlLib.jar | Bin 493015 -> 493194 bytes .../services/android/api/DroneApi.java | 12 ++++-------- .../service/UploaderService.java | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ClientLib/mobile/libs/AidlLib.jar b/ClientLib/mobile/libs/AidlLib.jar index b17a554d2a0eec9345ff1a6a4972a87d337dc79f..9e2aef6cd193ccc6350d52680828e6220af77c9d 100644 GIT binary patch delta 25871 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 diff --git a/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java b/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java index a577810612..7c04fa4e31 100644 --- a/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java +++ b/ServiceApp/src/org/droidplanner/services/android/api/DroneApi.java @@ -853,10 +853,8 @@ 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); @@ -864,10 +862,8 @@ private Survey buildSurvey(Survey survey) { } 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 index 9ad3042825..74a4aecbd7 100644 --- 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); }