Fix(Inventory): prevent error with android.permission.QUERY_USERS (on…

…ly for sys app)
glpi-project · Dec 4, 2024 · 4a816fa · 4a816fa
1 parent 4299214
commit 4a816fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/inventory/build.gradle b/inventory/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+}
 
 android {
     compileSdk 34

diff --git a/inventory/src/main/java/org/flyve/inventory/categories/User.java b/inventory/src/main/java/org/flyve/inventory/categories/User.java
@@ -112,22 +112,7 @@ public User(Context xCtx) {
     public String getUserName() {
         String userName = "N/A";
         try {
-            if (Build.VERSION.SDK_INT >= 17) {
-                UserManager userMgr = (UserManager) context.getSystemService(Context.USER_SERVICE);
-                if (userMgr != null) {
-                    try {
-                        // validate permission exception
-                        userName = userMgr.getUserName();
-                    } catch (Exception ex) {
-                        InventoryLog.e(InventoryLog.getMessage(context, CommonErrorType.USER_NAME, ex.getMessage()));
-                        userName = Build.USER;
-                    }
-                } else {
-                    userName = Build.USER;
-                }
-            } else {
-                userName = Build.USER;
-            }
+            userName = Build.USER;
         } catch (Exception ex) {
             InventoryLog.e(InventoryLog.getMessage(context, CommonErrorType.USER_NAME, ex.getMessage()));
         }