From 538ed53b099aba0e04cdb3f6dd23db9c81a7e383 Mon Sep 17 00:00:00 2001
From: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
Date: Wed, 28 Feb 2024 11:36:44 +0100
Subject: [PATCH] Fix UsersAndGroupsSearchProvider causing SecurityException on
 non-vanilla builds

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
---
 .../android/providers/UsersAndGroupsSearchProvider.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java b/app/src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java
index 91de26cd59c2..0cee694903a3 100644
--- a/app/src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java
+++ b/app/src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java
@@ -106,6 +106,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     public static final String CONTENT = "content";
 
+    private String AUTHORITY;
     private String DATA_USER;
     private String DATA_GROUP;
     private String DATA_ROOM;
@@ -128,7 +129,7 @@ public static ShareType getShareType(String authority) {
     }
 
     private static void setActionShareWith(@NonNull Context context) {
-        ACTION_SHARE_WITH = context.getResources().getString(R.string.users_and_groups_share_with);
+        ACTION_SHARE_WITH = context.getString(R.string.users_and_groups_share_with);
     }
 
     @Nullable
@@ -146,7 +147,7 @@ public boolean onCreate() {
             return false;
         }
 
-        String AUTHORITY = getContext().getResources().getString(R.string.users_and_groups_search_authority);
+        AUTHORITY = getContext().getString(R.string.users_and_groups_search_authority);
         setActionShareWith(getContext());
         DATA_USER = AUTHORITY + ".data.user";
         DATA_GROUP = AUTHORITY + ".data.group";
@@ -311,9 +312,7 @@ private Cursor searchForUsersOrGroups(Uri uri) {
                             displayName = userName;
                             subline = (status.getMessage() == null || status.getMessage().isEmpty()) ? null :
                                 status.getMessage();
-                            Uri.Builder builder =
-                                Uri.parse("content://com.nextcloud.android.providers.UsersAndGroupsSearchProvider/icon")
-                                    .buildUpon();
+                            Uri.Builder builder = Uri.parse("content://" + AUTHORITY + "/icon").buildUpon();
 
                             builder.appendQueryParameter("shareWith", shareWith);
                             builder.appendQueryParameter("displayName", displayName);