Ability to disable Private Space shortcuts

They are disabled by default.
Neamar · Nov 25, 2024 · 386f7a6 · 386f7a6
1 parent 3420b8f
commit 386f7a6
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 1 deletion.
diff --git a/app/src/main/java/fr/neamar/kiss/SettingsActivity.java b/app/src/main/java/fr/neamar/kiss/SettingsActivity.java
@@ -672,6 +672,8 @@ public void onDenied() {
                 }
             } else if ("selected-contact-mime-types".equals(key)) {
                 getDataHandler().reloadContactsProvider();
+            } else if ("disable-private-space-shortcuts".equals(key)) {
+                getDataHandler().reloadShortcuts();
             }
         }
 

diff --git a/app/src/main/java/fr/neamar/kiss/loader/LoadShortcutsPojos.java b/app/src/main/java/fr/neamar/kiss/loader/LoadShortcutsPojos.java
@@ -2,9 +2,15 @@
 package fr.neamar.kiss.loader;
 
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.LauncherApps;
+import android.content.pm.LauncherUserInfo;
 import android.content.pm.ShortcutInfo;
 import android.os.Build;
 import android.os.UserManager;
+import android.preference.PreferenceManager;
+
+import androidx.annotation.RequiresApi;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,6 +39,8 @@ protected List<ShortcutPojo> doInBackground(Void... params) {
             return new ArrayList<>();
         }
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
         List<ShortcutRecord> records = DBHelper.getShortcuts(context);
         DataHandler dataHandler = KissApplication.getApplication(context).getDataHandler();
         TagsHandler tagsHandler = dataHandler.getTagsHandler();
@@ -52,8 +60,13 @@ protected List<ShortcutPojo> doInBackground(Void... params) {
         // get all oreo shortcuts from system directly
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+            LauncherApps launcherApps = (LauncherApps) context.getSystemService(Context.LAUNCHER_APPS_SERVICE);
             List<ShortcutInfo> shortcutInfos = ShortcutUtil.getAllShortcuts(context);
             for (ShortcutInfo shortcutInfo : shortcutInfos) {
+                LauncherUserInfo info = null;
+                if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                    info = launcherApps.getLauncherUserInfo(shortcutInfo.getUserHandle());
+                }
                 if (isCancelled()) {
                     break;
                 }
@@ -62,7 +75,16 @@ protected List<ShortcutPojo> doInBackground(Void... params) {
                     if (shortcutRecord != null) {
                         boolean disabled = PackageManagerUtils.isAppSuspended(context, shortcutInfo.getPackage(), new UserHandle(context, shortcutInfo.getUserHandle())) || userManager.isQuietModeEnabled(shortcutInfo.getUserHandle());
                         ShortcutPojo pojo = createPojo(shortcutRecord, tagsHandler, ShortcutUtil.getComponentName(context, shortcutInfo), shortcutInfo.isPinned(), shortcutInfo.isDynamic(), disabled);
-                        pojos.add(pojo);
+                        if ((android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM)
+                            && (info != null)) {
+                            boolean privateSpaceShortcutsDisabled = prefs.getBoolean("disable-private-space-shortcuts", true);
+                            if (shouldAddShortcut(userManager, info, shortcutInfo.getUserHandle(),
+                                    privateSpaceShortcutsDisabled)) {
+                                pojos.add(pojo);
+                            }
+                        } else {
+                            pojos.add(pojo);
+                        }
                     }
                 }
             }
@@ -71,10 +93,30 @@ protected List<ShortcutPojo> doInBackground(Void... params) {
         return pojos;
     }
 
+    @RequiresApi(35)
+    private boolean shouldAddShortcut(UserManager manager, LauncherUserInfo info,
+                                      android.os.UserHandle profile, boolean privateSpaceShortcutsDisabled) {
+        if (!info.getUserType().equalsIgnoreCase(UserManager.USER_TYPE_PROFILE_PRIVATE)) {
+            return true;
+        } else {
+            if (privateSpaceShortcutsDisabled) {
+                return false;
+            }
+            else return !isQuietModeEnabled(manager, profile);
+        }
+    }
+
     private ShortcutPojo createPojo(ShortcutRecord shortcutRecord, TagsHandler tagsHandler, String componentName, boolean pinned, boolean dynamic, boolean disabled) {
         ShortcutPojo pojo = new ShortcutPojo(shortcutRecord, componentName, pinned, dynamic, disabled);
         pojo.setName(shortcutRecord.name);
         pojo.setTags(tagsHandler.getTags(pojo.id));
         return pojo;
     }
+
+    private boolean isQuietModeEnabled(UserManager manager, android.os.UserHandle profile) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return manager.isQuietModeEnabled(profile);
+        }
+        return false;
+    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -357,4 +357,5 @@
     <string name="tagged_result_sort_mode_desc">Select how results should be sorted when shown by tag</string>
     <string name="tags_category">Tags</string>
     <string name="menu_private_space">Private Space</string>
+    <string name="disable_private_space_shortcuts">Disable Private Space app shortcuts</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -408,6 +408,10 @@
                 android:defaultValue="false"
                 android:key="call-contact-on-click"
                 android:title="@string/contacts_call_on_click" />
+            <fr.neamar.kiss.preference.SwitchPreference
+                android:defaultValue="true"
+                android:key="disable-private-space-shortcuts"
+                android:title="@string/disable_private_space_shortcuts" />
         </PreferenceCategory>
         <PreferenceScreen
             android:key="wallpaper-holder"