move all hiddenapi functionality into MultiUser.java

ukanth · Aug 29, 2023 · 26da19c · 26da19c
1 parent 291a878
commit 26da19c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/app/src/main/java/dev/ukanth/ufirewall/Api.java b/app/src/main/java/dev/ukanth/ufirewall/Api.java
@@ -1449,6 +1449,8 @@ public static List<PackageInfoData> getApps(Context ctx, GetAppList appList) {
 
             for (PackageInfo pkginfo : installed) {
                 ApplicationInfo apinfo = pkginfo.applicationInfo;
+                if (apinfo == null) continue;
+
                 int user_id = MultiUser.applicationUserId(apinfo);
                 Log.d(TAG, "Processing app info: " + apinfo.packageName + " / user " + user_id + " / uid " + apinfo.uid);
                 count = count + 1;

diff --git a/app/src/main/java/dev/ukanth/ufirewall/MainActivity.java b/app/src/main/java/dev/ukanth/ufirewall/MainActivity.java
@@ -85,8 +85,6 @@
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.topjohnwu.superuser.Shell;
 
-import org.lsposed.hiddenapibypass.HiddenApiBypass;
-
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -164,13 +162,6 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte
     private static final int DEFAULT_VIEW_LIMIT = 4;
     private View view;
 
-    static {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            HiddenApiBypass.addHiddenApiExemptions("");
-        }
-    }
-
-
     public boolean isDirty() {
         return dirty;
     }
@@ -186,7 +177,7 @@ public void setDirty(boolean dirty) {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        MultiUser.setupPermissions();
+        MultiUser.setup();
 
         initTheme();
         G.registerPrivateLink();

diff --git a/app/src/main/java/dev/ukanth/ufirewall/MultiUser.java b/app/src/main/java/dev/ukanth/ufirewall/MultiUser.java
@@ -19,6 +19,8 @@
 
 import com.topjohnwu.superuser.Shell;
 
+import org.lsposed.hiddenapibypass.HiddenApiBypass;
+
 import dev.ukanth.ufirewall.log.Log;
 
 
@@ -55,7 +57,11 @@ public static List<UserInfo> getUsers() {
         return res;
     }
 
-    public static void setupPermissions() {
+    public static void setup() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            HiddenApiBypass.addHiddenApiExemptions("");
+        }
+
         Shell.Result result = Shell.cmd("pm grant dev.ukanth.ufirewall android.permission.INTERACT_ACROSS_USERS").exec();
         if (!result.isSuccess()) {
             Log.w(TAG, "pm grant INTERACT_ACROSS_USERS failed; further errors likely");
@@ -113,9 +119,8 @@ public static int applicationUserId(ApplicationInfo info) {
     }
 
     // Copied from LSPosed daemon/**/PackageService.java
-    // This requires INTERACT_ACROSS_USERS permission. LSPosed already has it,
-    // but we need to grant it at runtime from su - call setupPermissions() at
-    // the start of the app.
+    // This requires INTERACT_ACROSS_USERS permission. LSPosed already has it, but
+    // we need to grant it at runtime - make sure you call setup() in app.onCreate(_)
     public static List<PackageInfo> getInstalledPackagesFromAllUsers(int flags/*, boolean filterNoProcess*/) throws RemoteException {
         List<PackageInfo> res = new ArrayList<>();
         IPackageManager pm = getPackageManager();