From 80cf9fa8fe1c0aa976b4aff791f6a2bc0f55ffe0 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 22 May 2016 23:32:25 +0200
Subject: [PATCH] Pebble: allow to delete apps from pbw cache

Also remove delete entries from all system apps' context menus (not only health)
---
 .../activities/AppManagerActivity.java        | 36 ++++++++++++++++---
 app/src/main/res/menu/appmanager_context.xml  |  3 ++
 app/src/main/res/values/strings.xml           |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
index 56a324dd8..de5147e99 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
@@ -58,7 +58,7 @@ public class AppManagerActivity extends GBActivity {
                     boolean found = false;
                     for (final ListIterator<GBDeviceApp> iter = appList.listIterator(); iter.hasNext(); ) {
                         final GBDeviceApp app = iter.next();
-                        if (app.getName().equals(appName) && app.getCreator().equals(appCreator)) {
+                        if (app.getUUID().equals(uuid)) {
                             app.setOnDevice(true);
                             iter.set(app);
                             found = true;
@@ -181,11 +181,13 @@ public class AppManagerActivity extends GBActivity {
 
         if (!selectedApp.isInCache()) {
             menu.removeItem(R.id.appmanager_app_reinstall);
+            menu.removeItem(R.id.appmanager_app_delete_cache);
         }
         if (!PebbleProtocol.UUID_PEBBLE_HEALTH.equals(selectedApp.getUUID())) {
             menu.removeItem(R.id.appmanager_health_activate);
             menu.removeItem(R.id.appmanager_health_deactivate);
-        } else if (PebbleProtocol.UUID_PEBBLE_HEALTH.equals(selectedApp.getUUID())) {
+        }
+        if (selectedApp.getType() == GBDeviceApp.Type.APP_SYSTEM) {
             menu.removeItem(R.id.appmanager_app_delete);
         }
         if (!selectedApp.isConfigurable()) {
@@ -194,19 +196,45 @@ public class AppManagerActivity extends GBActivity {
         menu.setHeaderTitle(selectedApp.getName());
     }
 
+    private void removeAppFromList(UUID uuid) {
+        for (final ListIterator<GBDeviceApp> iter = appList.listIterator(); iter.hasNext(); ) {
+            final GBDeviceApp app = iter.next();
+            if (app.getUUID().equals(uuid)) {
+                iter.remove();
+                mGBDeviceAppAdapter.notifyDataSetChanged();
+                break;
+            }
+        }
+    }
+
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.appmanager_health_deactivate:
+            case R.id.appmanager_app_delete_cache:
+                File cachedFile = null;
+                boolean deleteSuccess = true;
+                try {
+                    cachedFile = new File(FileUtils.getExternalFilesDir().getPath() + "/pbw-cache/" + selectedApp.getUUID() + ".pbw");
+                    deleteSuccess = cachedFile.delete();
+                } catch (IOException e) {
+                    LOG.warn("could not get external dir while trying to access pbw cache.");
+                }
+                if (!deleteSuccess) {
+                    LOG.warn("could not delete file from pbw cache: " + cachedFile.toString());
+                }
+                // fall through
             case R.id.appmanager_app_delete:
-                GBApplication.deviceService().onAppDelete(selectedApp.getUUID());
+                UUID uuid = selectedApp.getUUID();
+                GBApplication.deviceService().onAppDelete(uuid);
+                removeAppFromList(uuid);
                 return true;
             case R.id.appmanager_app_reinstall:
                 File cachePath;
                 try {
                     cachePath = new File(FileUtils.getExternalFilesDir().getPath() + "/pbw-cache/" + selectedApp.getUUID() + ".pbw");
                 } catch (IOException e) {
-                    LOG.warn("could not get external dir while reading pbw cache.");
+                    LOG.warn("could not get external dir while trying to access pbw cache.");
                     return true;
                 }
                 GBApplication.deviceService().onInstallApp(Uri.fromFile(cachePath));
diff --git a/app/src/main/res/menu/appmanager_context.xml b/app/src/main/res/menu/appmanager_context.xml
index dd5d22c3b..873e0c246 100644
--- a/app/src/main/res/menu/appmanager_context.xml
+++ b/app/src/main/res/menu/appmanager_context.xml
@@ -6,6 +6,9 @@
     <item
         android:id="@+id/appmanager_app_delete"
         android:title="@string/appmananger_app_delete"/>
+    <item
+        android:id="@+id/appmanager_app_delete_cache"
+        android:title="@string/appmananger_app_delete_cache"/>
     <item
         android:id="@+id/appmanager_health_activate"
         android:title="@string/appmanager_health_activate"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95f0f1884..141484d16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
     <!-- Strings related to AppManager -->
     <string name="title_activity_appmanager">App Manager</string>
     <string name="appmananger_app_delete">Delete</string>
+    <string name="appmananger_app_delete_cache">Delete and remove from cache</string>
 
     <!-- Strings related to AppBlacklist -->
     <string name="title_activity_appblacklist">Notification Blacklist</string>
@@ -251,5 +252,4 @@
     <string name="charts_legend_heartrate">Heart Rate</string>
     <string name="live_activity_heart_rate">Heart Rate</string>
     <string name="pref_title_general_autocreonnect">Reconnect automatically</string>
-
 </resources>