Filters: rename shared_uid to uid

Allow any UID-based filtering, not just shared UID-based filtering.

Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>

Author: MuntashirAkon

app/src/main/java/io/github/muntashirakon/AppManager/filters/FilterableAppInfo.java

@@ -126,6 +126,11 @@ public int getUserId() {
         return mUserId;
     }
 
+    @Override
+    public int getUid() {
+        return mApplicationInfo.uid;
+    }
+
     @Override
     @NonNull
     public String getAppLabel() {

app/src/main/java/io/github/muntashirakon/AppManager/filters/IFilterableAppInfo.java

@@ -27,6 +27,8 @@ public interface IFilterableAppInfo {
 
     int getUserId();
 
+    int getUid();
+
     @NonNull
     String getAppLabel();
 

app/src/main/java/io/github/muntashirakon/AppManager/filters/options/FilterOptions.java

@@ -27,12 +27,12 @@ public static FilterOption create(@NonNull String filterName) {
             case "pkg_name": return new PackageNameOption();
             case "running_apps": return new RunningAppsOption();
             case "screen_time": return new ScreenTimeOption();
-            case "shared_uid": return new SharedUidOption();
             case "signature": return new SignatureOption();
             case "target_sdk": return new TargetSdkOption();
             case "times_opened": return new TimesOpenedOption();
             case "total_size": return new TotalSizeOption();
             case "trackers": return new TrackersOption();
+            case "uid": return new UidOption();
             case "version_name": return new VersionNameOption();
         }
         throw new IllegalArgumentException("Invalid filter: " + filterName);

app/src/main/java/io/github/muntashirakon/AppManager/filters/options/SharedUidOption.java

@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package io.github.muntashirakon.AppManager.filters.options;
+
+import android.content.Context;
+import android.text.SpannableStringBuilder;
+
+import androidx.annotation.NonNull;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import io.github.muntashirakon.AppManager.filters.IFilterableAppInfo;
+import io.github.muntashirakon.AppManager.utils.ArrayUtils;
+import io.github.muntashirakon.AppManager.utils.LangUtils;
+
+public class UidOption extends FilterOption {
+    private final Map<String, Integer> mKeysWithType = new LinkedHashMap<String, Integer>() {{
+        put(KEY_ALL, TYPE_NONE);
+        put("uid_eq", TYPE_INT);
+        put("uid_le", TYPE_INT);
+        put("uid_ge", TYPE_INT);
+        put("with_shared", TYPE_NONE);
+        put("without_shared", TYPE_NONE);
+        put("shared_uid_name", TYPE_STR_SINGLE);
+        put("shared_uid_names", TYPE_STR_MULTIPLE);
+        put("shared_uid_name_regex", TYPE_REGEX);
+    }};
+
+    public UidOption() {
+        super("uid");
+    }
+
+    @NonNull
+    @Override
+    public Map<String, Integer> getKeysWithType() {
+        return mKeysWithType;
+    }
+
+    @NonNull
+    @Override
+    public TestResult test(@NonNull IFilterableAppInfo info, @NonNull TestResult result) {
+        switch (key) {
+            case KEY_ALL:
+                return result.setMatched(false);
+            case "uid_eq":
+                return result.setMatched(info.getUid() == intValue);
+            case "uid_le":
+                return result.setMatched(info.getUid() <= intValue);
+            case "uid_ge":
+                return result.setMatched(info.getUid() >= intValue);
+            case "with_shared":
+                return result.setMatched(info.getSharedUserId() != null);
+            case "without_shared":
+                return result.setMatched(info.getSharedUserId() == null);
+            case "shared_uid_name":
+                return result.setMatched(Objects.equals(info.getSharedUserId(), value));
+            case "shared_uid_names":
+                return result.setMatched(ArrayUtils.contains(stringValues, info.getSharedUserId()));
+            case "shared_uid_name_regex":
+                return result.setMatched(regexValue.matcher(info.getSharedUserId()).matches());
+            default:
+                throw new UnsupportedOperationException("Invalid key " + key);
+        }
+    }
+
+    @NonNull
+    @Override
+    public CharSequence toLocalizedString(@NonNull Context context) {
+        SpannableStringBuilder sb = new SpannableStringBuilder("UID");
+        switch (key) {
+            case KEY_ALL:
+                return sb.append(LangUtils.getSeparatorString()).append("any");
+            case "uid_eq":
+                return sb.append(" = ").append(Integer.toString(intValue));
+            case "uid_le":
+                return sb.append(" ≤ ").append(Integer.toString(intValue));
+            case "uid_ge":
+                return sb.append(" ≥ ").append(Integer.toString(intValue));
+            case "with_shared":
+                return "Only the apps with a shared UID";
+            case "without_shared":
+                return "Only the apps without a shared UID";
+            case "shared_uid_name":
+                return "Only the apps with the shared UID " + value;
+            case "shared_uid_names":
+                return "Only the apps with the shared UID (exclusive) " + String.join(", ", stringValues);
+            case "shared_uid_name_regex":
+                return "Only the apps with the shared UID that matches '" + value + "'";
+            default:
+                throw new UnsupportedOperationException("Invalid key " + key);
+        }
+    }
+}

app/src/main/java/io/github/muntashirakon/AppManager/filters/options/UidOption.java

@@ -360,6 +360,12 @@ public int getUserId() {
         return -1;
     }
 
+    @Override
+    public int getUid() {
+        int uid = mApplicationInfo != null ? mApplicationInfo.uid : this.uid;
+        return UserHandleHidden.getAppId(uid);
+    }
+
     public void setPackageUsageInfo(@Nullable PackageUsageInfo packageUsageInfo) {
         mPackageUsageInfo = packageUsageInfo;
     }

app/src/main/java/io/github/muntashirakon/AppManager/main/ApplicationItem.java

@@ -264,12 +264,12 @@
         <item>pkg_name</item>
         <item>running_apps</item>
         <item>screen_time</item>
-        <item>shared_uid</item>
         <item>signature</item>
         <item>target_sdk</item>
         <item>times_opened</item>
         <item>total_size</item>
         <item>trackers</item>
+        <item>uid</item>
         <item>version_name</item>
     </string-array>
     <string name="usage_daily">Daily</string>