From 44bf8496d21f336b035d742c645b287a6055b624 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Mon, 29 Jun 2020 17:04:27 +0530
Subject: [PATCH] Delete pwa from Provider when shortcut is deleted

---
 app/src/main/AndroidManifest.xml                |  2 ++
 .../features/launcher/LauncherActivity.java     | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index abc340ba90..fc2935bc72 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,6 +43,8 @@
     <uses-permission android:name="lineageos.permission.READ_WEATHER" />
     <!-- LineageOS specific permissions END -->
 
+    <uses-permission android:name="foundation.e.pwaplayer.provider.READ_WRITE"/>
+
     <application
         android:name=".BlissLauncher"
         android:hardwareAccelerated="true"
diff --git a/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java b/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
index 89025eaf2d..7b79beb9f5 100755
--- a/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
+++ b/app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java
@@ -39,6 +39,7 @@ import android.os.UserManager;
 import android.provider.Settings;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.DragEvent;
 import android.view.Gravity;
@@ -1977,12 +1978,16 @@ public class LauncherActivity extends AppCompatActivity implements
                     startActivity(i);
                 }
             } else if (launcherItem.itemType == Constants.ITEM_TYPE_SHORTCUT) {
-                AlertDialog dialog =new AlertDialog.Builder(new ContextThemeWrapper(this, R.style.AlertDialogCustom))
+                AlertDialog dialog = new AlertDialog.Builder(new ContextThemeWrapper(this, R.style.AlertDialogCustom))
                         .setTitle(launcherItem.title)
                         .setMessage(R.string.uninstall_shortcut_dialog)
                         .setPositiveButton(R.string.ok, (dialog1, which) -> {
-                            DeepShortcutManager.getInstance(this).unpinShortcut(ShortcutKey.fromItem((ShortcutItem) launcherItem));
-                            removeShortcutView((ShortcutItem) launcherItem, blissFrameLayout);
+                            ShortcutItem shortcut = (ShortcutItem) launcherItem;
+                            DeepShortcutManager.getInstance(this).unpinShortcut(ShortcutKey.fromItem(shortcut));
+                            if (DeepShortcutManager.getInstance(this).wasLastCallSuccess()) {
+                                deleteShortcutFromProvider(shortcut.id);
+                                removeShortcutView(shortcut, blissFrameLayout);
+                            }
                         })
                         .setNegativeButton(R.string.cancel, null)
                         .setIcon(launcherItem.icon)
@@ -2000,6 +2005,12 @@ public class LauncherActivity extends AppCompatActivity implements
         blissFrameLayout.addView(imageView, layoutParams);
     }
 
+    private void deleteShortcutFromProvider(String id) {
+        ContentResolver resolver = getContentResolver();
+        int count = resolver.delete(Uri.parse("content://foundation.e.pwaplayer.provider/pwa"), null, new String[]{id});
+        Log.d("LauncherActivity", "Items deleted from pwa provider: " + count);
+    }
+
     private void removeShortcutView(ShortcutItem shortcutItem, BlissFrameLayout blissFrameLayout) {
         DatabaseManager.getManager(this).removeLauncherItem(shortcutItem.id);
         if (mFolderWindowContainer.getVisibility() == View.VISIBLE) {
-- 
GitLab