From d81b44f8ee027bbc5d3d47bdb260ec6b711b87e1 Mon Sep 17 00:00:00 2001
From: Howard Wu <40033067+Howard20181@users.noreply.github.com>
Date: Sat, 23 Apr 2022 16:05:35 +0800
Subject: [PATCH] Show the username that the module is installed to (#1887)

---
 .../java/org/lsposed/lspd/service/LSPManagerService.java    | 4 +++-
 .../src/main/java/org/lsposed/lspd/service/UserService.java | 6 ++++++
 daemon/src/main/res/values-zh-rCN/strings.xml               | 2 +-
 daemon/src/main/res/values/strings.xml                      | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/daemon/src/main/java/org/lsposed/lspd/service/LSPManagerService.java b/daemon/src/main/java/org/lsposed/lspd/service/LSPManagerService.java
index a43e26cf..f14f9ba9 100644
--- a/daemon/src/main/java/org/lsposed/lspd/service/LSPManagerService.java
+++ b/daemon/src/main/java/org/lsposed/lspd/service/LSPManagerService.java
@@ -263,6 +263,8 @@ public class LSPManagerService extends ILSPManagerService.Stub {
                                         boolean systemModule) {
         try {
             var context = new FakeContext();
+            var userInfo = UserService.getUserInfo(moduleUserId);
+            String userName = userInfo != null ? userInfo.name : String.valueOf(moduleUserId);
             String title = context.getString(enabled ? systemModule ?
                     R.string.xposed_module_updated_notification_title_system :
                     R.string.xposed_module_updated_notification_title :
@@ -270,7 +272,7 @@ public class LSPManagerService extends ILSPManagerService.Stub {
             String content = context.getString(enabled ? systemModule ?
                     R.string.xposed_module_updated_notification_content_system :
                     R.string.xposed_module_updated_notification_content :
-                    R.string.module_is_not_activated_yet_detailed, modulePackageName);
+                    R.string.module_is_not_activated_yet_detailed, modulePackageName, userName);
 
             var style = new Notification.BigTextStyle();
             style.bigText(content);
diff --git a/daemon/src/main/java/org/lsposed/lspd/service/UserService.java b/daemon/src/main/java/org/lsposed/lspd/service/UserService.java
index 915a2521..3fa8cd06 100644
--- a/daemon/src/main/java/org/lsposed/lspd/service/UserService.java
+++ b/daemon/src/main/java/org/lsposed/lspd/service/UserService.java
@@ -95,6 +95,12 @@ public class UserService {
         return users;
     }
 
+    public static UserInfo getUserInfo(int userId) throws RemoteException {
+        IUserManager um = getUserManager();
+        if (um == null) return null;
+        return um.getUserInfo(userId);
+    }
+
     public static int getProfileParent(int userId) throws RemoteException {
         IUserManager um = getUserManager();
         if (um == null) return -1;
diff --git a/daemon/src/main/res/values-zh-rCN/strings.xml b/daemon/src/main/res/values-zh-rCN/strings.xml
index 2065ed81..c5ebe615 100644
--- a/daemon/src/main/res/values-zh-rCN/strings.xml
+++ b/daemon/src/main/res/values-zh-rCN/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <!-- Notification -->
     <string name="module_is_not_activated_yet">Xposed 模块尚未激活</string>
-    <string name="module_is_not_activated_yet_detailed">%s 已安装，但尚未激活</string>
+    <string name="module_is_not_activated_yet_detailed">%1$s 已安装到用户 %2$s，但尚未激活</string>
     <string name="xposed_module_updated_notification_title">Xposed 模块已更新</string>
     <string name="xposed_module_updated_notification_content">%s 已更新，请强行停止并重新打开其作用域内的应用</string>
     <string name="xposed_module_updated_notification_title_system">Xposed 模块已更新，需要重新启动</string>
diff --git a/daemon/src/main/res/values/strings.xml b/daemon/src/main/res/values/strings.xml
index 3c9e7525..6d6793a6 100644
--- a/daemon/src/main/res/values/strings.xml
+++ b/daemon/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <!-- Notification -->
     <string name="module_is_not_activated_yet">Xposed module is not activated yet</string>
-    <string name="module_is_not_activated_yet_detailed">%s has been installed, but is not activated yet</string>
+    <string name="module_is_not_activated_yet_detailed">%1$s has been installed to user %2$s, but is not activated yet</string>
     <string name="xposed_module_updated_notification_title">Xposed module updated</string>
     <string name="xposed_module_updated_notification_content">%s has been updated, please force stop and restart apps in its scope</string>
     <string name="xposed_module_updated_notification_title_system">Xposed module updated, system reboot required</string>