opt: getCurrentUserId

ReChronoRain · Dec 16, 2024 · 715e51e · 715e51e
1 parent 4b56181
commit 715e51e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/prefs/PreferenceHeader.java b/app/src/main/java/com/sevtinge/hyperceiler/prefs/PreferenceHeader.java
@@ -19,6 +19,7 @@
 package com.sevtinge.hyperceiler.prefs;
 
 import static com.sevtinge.hyperceiler.BuildConfig.APPLICATION_ID;
+import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getCurrentUserId;
 import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getWhoAmI;
 import static com.sevtinge.hyperceiler.utils.shell.ShellUtils.safeExecCommandWithRoot;
 
@@ -100,8 +101,7 @@ private boolean isHidden(Context context) {
 
     @SuppressLint("Range")
     private void getScope() {
-        UserHandle currentUserHandle = android.os.Process.myUserHandle();
-        int userId = currentUserHandle.hashCode();
+        int userId = getCurrentUserId();
 
         safeExecCommandWithRoot("mkdir -p /data/local/tmp/HyperCeiler/cache/ && cp -r /data/adb/lspd/config /data/local/tmp/HyperCeiler/cache/ && chmod -R 777 /data/local/tmp/HyperCeiler/cache/config");
 

diff --git a/...tinge/hyperceiler/ui/fragment/main/settings/development/DevelopmentDebugInfoFragment.java b/...tinge/hyperceiler/ui/fragment/main/settings/development/DevelopmentDebugInfoFragment.java
@@ -39,6 +39,7 @@
 import static com.sevtinge.hyperceiler.utils.devicesdk.MiDeviceAppUtilsKt.isPad;
 import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getAndroidVersion;
 import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getBuildDate;
+import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getCurrentUserId;
 import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getHyperOSVersion;
 import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getMiuiVersion;
 import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.getSystemVersionIncremental;
@@ -131,6 +132,7 @@ public String getDebugInfo() {
             // propertiesCheck.put("RootPermission", String.valueOf(ShellInit.ready()));
             propertiesCheck.put("WhoAmI", getWhoAmI());
             propertiesCheck.put("LoggerStatus", IS_LOGGER_ALIVE + ", " + LOGGER_CHECKER_ERR_CODE);
+            propertiesCheck.put("CurrentUserId", String.valueOf(getCurrentUserId()));
         } catch (Exception ignored) {
         }
 

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/utils/devicesdk/SystemSDK.kt b/app/src/main/java/com/sevtinge/hyperceiler/utils/devicesdk/SystemSDK.kt
@@ -32,6 +32,7 @@ fun getBuilder(): String = getProp("ro.build.user")
 fun getBaseOs(): String = if (getProp("ro.build.version.base_os") != "") getProp("ro.build.version.base_os") else "null"
 fun getRomAuthor(): String = getProp("ro.rom.author") + getProp("ro.romid")
 fun getWhoAmI(): String = safeExecCommandWithRoot("whoami")
+fun getCurrentUserId(): Int = Process.myUserHandle().hashCode()
 
 /**
  * 获取设备 Android 版本