From 0a3904b5e1c38392d81f273d4e655cb91cd8b054 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 27 Dec 2024 08:18:50 +0100
Subject: [PATCH 01/11] request media_location

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/main/AndroidManifest.xml              |  1 +
 .../ui/fragment/OCFileListFragment.java       |  3 +++
 .../owncloud/android/utils/PermissionUtil.kt  | 20 +++++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2d3bfe327d1e..a2abdd5d0b8f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
     <uses-permission
         android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
         android:maxSdkVersion="25" />
+    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
     <!--
  Apps that target Android 9 (API level 28) or higher and use foreground services
     must request the FOREGROUND_SERVICE permission
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index c2cd275613b0..5ceb576db256 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -490,6 +490,9 @@ public void registerFabListener() {
             // is not available in FolderPickerActivity
             viewThemeUtils.material.themeFAB(mFabMain);
             mFabMain.setOnClickListener(v -> {
+                PermissionUtil.requestMediaLocationPermission(activity);
+
+
                 final OCFileListBottomSheetDialog dialog =
                     new OCFileListBottomSheetDialog(activity,
                                                     this,
diff --git a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
index 71c2217d5fde..0d8a2e70730f 100644
--- a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
+++ b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
@@ -39,6 +39,7 @@ object PermissionUtil {
     const val PERMISSIONS_READ_CALENDAR_AUTOMATIC = 6
     const val PERMISSIONS_WRITE_CALENDAR = 7
     const val PERMISSIONS_POST_NOTIFICATIONS = 8
+    const val PERMISSIONS_MEDIA_LOCATION = 9
 
     const val REQUEST_CODE_MANAGE_ALL_FILES = 19203
 
@@ -302,4 +303,23 @@ object PermissionUtil {
             }
         }
     }
+
+    /**
+     * Request media location permission. Required on API level >= 34.
+     * Does not have any effect on API level < 34.
+     *
+     * @param activity target activity
+     */
+    @JvmStatic
+    fun requestMediaLocationPermission(activity: Activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            if (!checkSelfPermission(activity, Manifest.permission.ACCESS_MEDIA_LOCATION)) {
+                ActivityCompat.requestPermissions(
+                    activity,
+                    arrayOf(Manifest.permission.ACCESS_MEDIA_LOCATION),
+                    PERMISSIONS_POST_NOTIFICATIONS
+                )
+            }
+        }
+    }
 }

From 1aacaf34cc6ca25a362b9c71ba17b107fceb9794 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 9 Jan 2025 09:16:27 +0100
Subject: [PATCH 02/11] show more info about permissions

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/gplay/AndroidManifest.xml             |  2 +
 .../client/preferences/AppPreferences.java    |  3 ++
 .../preferences/AppPreferencesImpl.java       | 11 ++++
 .../ui/activity/FileDisplayActivity.java      | 53 +++++++++++++++++++
 .../ui/fragment/OCFileListFragment.java       |  3 --
 .../owncloud/android/utils/PermissionUtil.kt  |  3 +-
 app/src/main/res/values/strings.xml           |  3 ++
 7 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/app/src/gplay/AndroidManifest.xml b/app/src/gplay/AndroidManifest.xml
index 9e2d78552bcf..34de04e2556d 100644
--- a/app/src/gplay/AndroidManifest.xml
+++ b/app/src/gplay/AndroidManifest.xml
@@ -18,6 +18,8 @@
         tools:node="remove"
         tools:ignore="ScopedStorage" />
 
+    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
+
     <application
         android:name=".MainApp"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
index f98bcce0ecd2..6ad93eb4150f 100644
--- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
+++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
@@ -403,4 +403,7 @@ default void onDarkThemeModeChanged(DarkMode mode) {
     
     boolean isAutoUploadGPlayWarningShown();
     void setAutoUploadGPlayWarningShown(boolean value);
+
+    boolean isAutoUploadGPlayWarning2Shown();
+    void setAutoUploadGPlayWarning2Shown(boolean value);
 }
diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
index bb2850aafd66..a68bde7b28d5 100644
--- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
+++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
@@ -109,6 +109,7 @@ public final class AppPreferencesImpl implements AppPreferences {
     private static final String PREF__STOP_DOWNLOAD_JOBS_ON_START = "stop_download_jobs_on_start";
     
     private static final String PREF__AUTO_UPLOAD_GPLAY_WARNING_SHOWN = "auto_upload_gplay_warning_shown";
+    private static final String PREF__AUTO_UPLOAD_GPLAY_WARNING2_SHOWN = "auto_upload_gplay_warning2_shown";
 
     private static final String LOG_ENTRY = "log_entry";
 
@@ -837,4 +838,14 @@ public boolean isAutoUploadGPlayWarningShown() {
     public void setAutoUploadGPlayWarningShown(boolean value) {
         preferences.edit().putBoolean(PREF__AUTO_UPLOAD_GPLAY_WARNING_SHOWN, value).apply();
     }
+
+    @Override
+    public boolean isAutoUploadGPlayWarning2Shown() {
+        return preferences.getBoolean(PREF__AUTO_UPLOAD_GPLAY_WARNING2_SHOWN, false);
+    }
+
+    @Override
+    public void setAutoUploadGPlayWarning2Shown(boolean value) {
+        preferences.edit().putBoolean(PREF__AUTO_UPLOAD_GPLAY_WARNING2_SHOWN, value).apply();
+    }
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 1fa32f5e3309..da3b18d6394b 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -77,6 +77,7 @@
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.FilesBinding;
 import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.MediaFolderType;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.SyncedFolder;
 import com.owncloud.android.datamodel.SyncedFolderProvider;
@@ -283,6 +284,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         checkStoragePath();
         checkAutoUploadOnGPlay();
+        checkAutoUploadOnGPlay2();
 
         initSyncBroadcastReceiver();
         observeWorkerState();
@@ -335,6 +337,57 @@ private void checkAutoUploadOnGPlay() {
         preferences.setAutoUploadGPlayWarningShown(true);
     }
 
+    private void checkAutoUploadOnGPlay2() {
+        if (!BuildHelper.GPLAY.equals(BuildConfig.FLAVOR)) {
+            return;
+        }
+
+        // only show on Android11+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            return;
+        }
+
+        boolean showAutoUploadDialog = false;
+        for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
+            // show dialog only on
+            if (syncedFolder.getType() == MediaFolderType.CUSTOM) {
+                showAutoUploadDialog = true;
+                break;
+            }
+        }
+
+        if (showAutoUploadDialog) {
+            if (!preferences.isAutoUploadGPlayWarning2Shown()) {
+                new MaterialAlertDialogBuilder(this, R.style.Theme_ownCloud_Dialog)
+                    .setTitle(R.string.auto_upload_gplay)
+                    .setMessage(R.string.auto_upload_gplay_desc2)
+                    .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
+                        dialog.dismiss();
+                    })
+                    .setIcon(R.drawable.nav_synced_folders)
+                    .create()
+                    .show();
+            }
+        } else {
+            if (!preferences.isAutoUploadGPlayWarning2Shown()) {
+                new MaterialAlertDialogBuilder(this, R.style.Theme_ownCloud_Dialog)
+                    .setTitle(R.string.upload_gplay)
+                    .setMessage(R.string.upload_gplay_desc)
+                    .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
+                        dialog.dismiss();
+                    })
+                    .setIcon(R.drawable.nav_synced_folders)
+                    .create()
+                    .show();
+            } 
+        }
+
+        PermissionUtil.requestMediaLocationPermission(this);
+        PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils, true);
+
+        preferences.setAutoUploadGPlayWarning2Shown(false);
+    }
+
     @SuppressWarnings("unchecked")
     private void loadSavedInstanceState(Bundle savedInstanceState) {
         if (savedInstanceState != null) {
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 5ceb576db256..c2cd275613b0 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -490,9 +490,6 @@ public void registerFabListener() {
             // is not available in FolderPickerActivity
             viewThemeUtils.material.themeFAB(mFabMain);
             mFabMain.setOnClickListener(v -> {
-                PermissionUtil.requestMediaLocationPermission(activity);
-
-
                 final OCFileListBottomSheetDialog dialog =
                     new OCFileListBottomSheetDialog(activity,
                                                     this,
diff --git a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
index 0d8a2e70730f..f2ac0762a684 100644
--- a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
+++ b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
@@ -152,7 +152,8 @@ object PermissionUtil {
                     // use granular media permissions
                     arrayOf(
                         Manifest.permission.READ_MEDIA_IMAGES,
-                        Manifest.permission.READ_MEDIA_VIDEO
+                        Manifest.permission.READ_MEDIA_VIDEO,
+                        Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
                     )
                 } else {
                     arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d2893ca24d2..ce48a29cc01a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1297,4 +1297,7 @@
     <string name="auto_upload_gplay">Auto upload behaviour changed</string>
     <string name="auto_upload_gplay_desc">Due to new restrictions imposed by Google, the auto upload feature will no longer be able to automatically remove uploaded files.</string>
     <string name="pick_contact_to_share_with">Pick contact to share with</string>
+    <string name="auto_upload_gplay_desc2">Google restricted our app and removed an important permission.\nThus auto upload can only access images and videos, but no other file formats.\nFurthermore \"access location\" is required for persisting GPS information in images.\nPlease also double check that "all access" is granted for photo and video access.</string>
+    <string name="upload_gplay">Upload needs more permissions</string>
+    <string name="upload_gplay_desc">A new permission \"access location\" is required for persisting GPS information in images.\nPlease also double check that \"all access\" is granted for photo and video access.</string>
 </resources>

From 0d1456f9269272b23ca2db828c04d897a533b9d8 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 27 Dec 2024 08:18:50 +0100
Subject: [PATCH 03/11] request media_location

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../com/owncloud/android/ui/fragment/OCFileListFragment.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index c2cd275613b0..5ceb576db256 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -490,6 +490,9 @@ public void registerFabListener() {
             // is not available in FolderPickerActivity
             viewThemeUtils.material.themeFAB(mFabMain);
             mFabMain.setOnClickListener(v -> {
+                PermissionUtil.requestMediaLocationPermission(activity);
+
+
                 final OCFileListBottomSheetDialog dialog =
                     new OCFileListBottomSheetDialog(activity,
                                                     this,

From e3e9da31431839c34ea45f6b93e911f3ae0a4c60 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 10 Jan 2025 16:01:23 +0100
Subject: [PATCH 04/11] Show more info about auto upload on GPlay

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../client/jobs/MediaFoldersDetectionWork.kt  | 45 ++++++++++++++++++-
 .../client/preferences/AppPreferences.java    |  3 ++
 .../preferences/AppPreferencesImpl.java       | 11 +++++
 .../java/com/owncloud/android/MainApp.java    |  6 ++-
 .../ui/activity/FileDisplayActivity.java      | 20 +++++++--
 app/src/main/res/values/strings.xml           |  2 +
 6 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
index e7351dd59699..63e0f34f6c72 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
@@ -32,6 +32,8 @@ import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.core.Clock
 import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.client.preferences.AppPreferencesImpl
+import com.nextcloud.utils.BuildHelper
+import com.owncloud.android.BuildConfig
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.ArbitraryDataProvider
@@ -41,7 +43,8 @@ import com.owncloud.android.datamodel.MediaFoldersModel
 import com.owncloud.android.datamodel.MediaProvider
 import com.owncloud.android.datamodel.SyncedFolderProvider
 import com.owncloud.android.lib.common.utils.Log_OC
-import com.owncloud.android.ui.activity.ManageAccountsActivity
+import com.owncloud.android.ui.activity.FileDisplayActivity
+import com.owncloud.android.ui.activity.ManageAccountsActivity.PENDING_FOR_REMOVAL
 import com.owncloud.android.ui.activity.SyncedFoldersActivity
 import com.owncloud.android.ui.notifications.NotificationUtils
 import com.owncloud.android.utils.SyncedFolderUtils
@@ -75,6 +78,7 @@ class MediaFoldersDetectionWork constructor(
 
     @Suppress("LongMethod", "ComplexMethod", "NestedBlockDepth") // legacy code
     override fun doWork(): Result {
+        
         val arbitraryDataProvider: ArbitraryDataProvider = ArbitraryDataProviderImpl(context)
         val gson = Gson()
         val mediaFoldersModel: MediaFoldersModel
@@ -190,8 +194,47 @@ class MediaFoldersDetectionWork constructor(
                 gson.toJson(mediaFoldersModel)
             )
         }
+
+        // only send notification when synced folder is setup, gplay flavor and not branded client
+        if (syncedFolderProvider.syncedFolders.isNotEmpty() && 
+            BuildHelper.GPLAY == BuildConfig.FLAVOR && 
+            !preferences.isAutoUploadGPlayNotificationShown &&
+            !MainApp.isClientBranded()) {
+                sendAutoUploadNotification()
+            }
+        
         return Result.success()
     }
+    
+    private fun sendAutoUploadNotification() {
+        val notificationId = randomIdGenerator.nextInt()
+        val intent = Intent(context, FileDisplayActivity::class.java).apply {
+            setAction(FileDisplayActivity.AUTO_UPLOAD_NOTIFICATION)
+        }
+        val pendingIntent = PendingIntent.getActivity(
+            context,
+            0,
+            intent,
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        val notificationBuilder = NotificationCompat.Builder(
+            context,
+            NotificationUtils.NOTIFICATION_CHANNEL_GENERAL
+        )
+            .setSmallIcon(R.drawable.notification_icon)
+            .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.notification_icon))
+            .setContentTitle("Re-enable Disrupted Auto Uploads")
+            .setContentText("Click to learn how to re-enable auto uploads")
+            .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
+            .setAutoCancel(true)
+            .setContentIntent(pendingIntent)
+
+        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, notificationBuilder)
+
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.notify(notificationId, notificationBuilder.build())
+    }
 
     @Suppress("LongMethod")
     private fun sendNotification(contentTitle: String, subtitle: String, user: User, path: String, type: Int) {
diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
index 6ad93eb4150f..81b5d93e5856 100644
--- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
+++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java
@@ -406,4 +406,7 @@ default void onDarkThemeModeChanged(DarkMode mode) {
 
     boolean isAutoUploadGPlayWarning2Shown();
     void setAutoUploadGPlayWarning2Shown(boolean value);
+
+    boolean isAutoUploadGPlayNotificationShown();
+    void setAutoUploadGPlayNotificationShown(boolean value);
 }
diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
index a68bde7b28d5..7f229ade6d3b 100644
--- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
+++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
@@ -110,6 +110,7 @@ public final class AppPreferencesImpl implements AppPreferences {
     
     private static final String PREF__AUTO_UPLOAD_GPLAY_WARNING_SHOWN = "auto_upload_gplay_warning_shown";
     private static final String PREF__AUTO_UPLOAD_GPLAY_WARNING2_SHOWN = "auto_upload_gplay_warning2_shown";
+    private static final String PREF__AUTO_UPLOAD_GPLAY_NOTIFICATION_SHOWN = "auto_upload_gplay_notification_shown";
 
     private static final String LOG_ENTRY = "log_entry";
 
@@ -848,4 +849,14 @@ public boolean isAutoUploadGPlayWarning2Shown() {
     public void setAutoUploadGPlayWarning2Shown(boolean value) {
         preferences.edit().putBoolean(PREF__AUTO_UPLOAD_GPLAY_WARNING2_SHOWN, value).apply();
     }
+
+    @Override
+    public boolean isAutoUploadGPlayNotificationShown() {
+        return preferences.getBoolean(PREF__AUTO_UPLOAD_GPLAY_NOTIFICATION_SHOWN, false);
+    }
+
+    @Override
+    public void setAutoUploadGPlayNotificationShown(boolean value) {
+        preferences.edit().putBoolean(PREF__AUTO_UPLOAD_GPLAY_NOTIFICATION_SHOWN, value).apply();
+    }
 }
diff --git a/app/src/main/java/com/owncloud/android/MainApp.java b/app/src/main/java/com/owncloud/android/MainApp.java
index 4afaf9fcbf6b..0ed2d044485e 100644
--- a/app/src/main/java/com/owncloud/android/MainApp.java
+++ b/app/src/main/java/com/owncloud/android/MainApp.java
@@ -417,9 +417,13 @@ private void setProxyForNonBrandedPlusClients() {
             Log_OC.d(TAG, "Error caught at setProxyForNonBrandedPlusClients: " + e);
         }
     }
+    
+    public static boolean isClientBranded() {
+        return getAppContext().getResources().getBoolean(R.bool.is_branded_client);
+    }
 
     public static boolean isClientBrandedPlus() {
-        return (getAppContext().getResources().getBoolean(R.bool.is_branded_plus_client));
+        return getAppContext().getResources().getBoolean(R.bool.is_branded_plus_client);
     }
 
     private final IntentFilter restrictionsFilter = new IntentFilter(Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED);
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index da3b18d6394b..99469dc488a2 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -179,6 +179,7 @@ public class FileDisplayActivity extends FileActivity
     public static final String RESTART = "RESTART";
     public static final String ALL_FILES = "ALL_FILES";
     public static final String LIST_GROUPFOLDERS = "LIST_GROUPFOLDERS";
+    public static final String AUTO_UPLOAD_NOTIFICATION = "AUTO_UPLOAD_NOTIFICATION";
     public static final int SINGLE_USER_SIZE = 1;
     public static final String OPEN_FILE = "NC_OPEN_FILE";
     public static final String FOLDER_SYNC_CONFLICT = "FOLDER_SYNC_CONFLICT";
@@ -295,7 +296,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void checkAutoUploadOnGPlay() {
-        if (!BuildHelper.GPLAY.equals(BuildConfig.FLAVOR)) {
+        if (!BuildHelper.GPLAY.equals(BuildConfig.FLAVOR) || MainApp.isClientBranded()) {
             return;
         }
 
@@ -338,7 +339,7 @@ private void checkAutoUploadOnGPlay() {
     }
 
     private void checkAutoUploadOnGPlay2() {
-        if (!BuildHelper.GPLAY.equals(BuildConfig.FLAVOR)) {
+        if (!BuildHelper.GPLAY.equals(BuildConfig.FLAVOR) || MainApp.isClientBranded()) {
             return;
         }
 
@@ -363,6 +364,7 @@ private void checkAutoUploadOnGPlay2() {
                     .setMessage(R.string.auto_upload_gplay_desc2)
                     .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
                         dialog.dismiss();
+                        preferences.setAutoUploadGPlayWarning2Shown(true);
                     })
                     .setIcon(R.drawable.nav_synced_folders)
                     .create()
@@ -375,6 +377,7 @@ private void checkAutoUploadOnGPlay2() {
                     .setMessage(R.string.upload_gplay_desc)
                     .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
                         dialog.dismiss();
+                        preferences.setAutoUploadGPlayWarning2Shown(true);
                     })
                     .setIcon(R.drawable.nav_synced_folders)
                     .create()
@@ -385,7 +388,7 @@ private void checkAutoUploadOnGPlay2() {
         PermissionUtil.requestMediaLocationPermission(this);
         PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils, true);
 
-        preferences.setAutoUploadGPlayWarning2Shown(false);
+        
     }
 
     @SuppressWarnings("unchecked")
@@ -688,6 +691,17 @@ protected void onNewIntent(Intent intent) {
                 DrawerActivity.menuItemId = R.id.nav_groupfolders;
                 setLeftFragment(new GroupfolderListFragment());
                 getSupportFragmentManager().executePendingTransactions();
+            } else if (AUTO_UPLOAD_NOTIFICATION.equals(intent.getAction())) {
+                new MaterialAlertDialogBuilder(this, R.style.Theme_ownCloud_Dialog)
+                    .setTitle(R.string.re_enable_auto_upload)
+                    .setMessage(R.string.re_enable_auto_upload_desc)
+                    .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
+                        dialog.dismiss();
+                        preferences.setAutoUploadGPlayNotificationShown(true);
+                    })
+                    .setIcon(R.drawable.nav_synced_folders)
+                    .create()
+                    .show();
             }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce48a29cc01a..64b7cd783cc7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1300,4 +1300,6 @@
     <string name="auto_upload_gplay_desc2">Google restricted our app and removed an important permission.\nThus auto upload can only access images and videos, but no other file formats.\nFurthermore \"access location\" is required for persisting GPS information in images.\nPlease also double check that "all access" is granted for photo and video access.</string>
     <string name="upload_gplay">Upload needs more permissions</string>
     <string name="upload_gplay_desc">A new permission \"access location\" is required for persisting GPS information in images.\nPlease also double check that \"all access\" is granted for photo and video access.</string>
+    <string name="re_enable_auto_upload">Re-enable disrupted Auto Uploads</string>
+    <string name="re_enable_auto_upload_desc">Please check manually for missing file uploads since mid-December.\nTo re-enable Auto Uploads for new photos and videos:\n- Grant \"Photos and Videos\" permission in the next dialog,\n- Grant \"Location\" permission to keep location data in uploaded photos.\n\nTo re-enable Auto Uploads for all other files:\n- Auto Uploads of other files are not possible anymore with the Play Store version of the Nextcloud app.\n\nAuto Uploads stopped working because Google rejected the necessary file permission in a previous app update. Nextcloud is working with Google to rectify the situation and restore full functionality.</string>
 </resources>

From cef0410b541a90753f402cd43fa69980ce4b2bed Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 13 Jan 2025 13:32:41 +0100
Subject: [PATCH 05/11] fixes after review

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../client/jobs/MediaFoldersDetectionWork.kt  | 23 +++---
 .../owncloud/android/datamodel/OCFile.java    |  3 +-
 .../ui/activity/FileDisplayActivity.java      | 79 ++++++++-----------
 app/src/main/res/values/strings.xml           |  2 +
 4 files changed, 48 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
index 63e0f34f6c72..602885a50f8f 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
@@ -33,7 +33,6 @@ import com.nextcloud.client.core.Clock
 import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.client.preferences.AppPreferencesImpl
 import com.nextcloud.utils.BuildHelper
-import com.owncloud.android.BuildConfig
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.ArbitraryDataProvider
@@ -44,7 +43,7 @@ import com.owncloud.android.datamodel.MediaProvider
 import com.owncloud.android.datamodel.SyncedFolderProvider
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.ui.activity.FileDisplayActivity
-import com.owncloud.android.ui.activity.ManageAccountsActivity.PENDING_FOR_REMOVAL
+import com.owncloud.android.ui.activity.ManageAccountsActivity
 import com.owncloud.android.ui.activity.SyncedFoldersActivity
 import com.owncloud.android.ui.notifications.NotificationUtils
 import com.owncloud.android.utils.SyncedFolderUtils
@@ -78,7 +77,6 @@ class MediaFoldersDetectionWork constructor(
 
     @Suppress("LongMethod", "ComplexMethod", "NestedBlockDepth") // legacy code
     override fun doWork(): Result {
-        
         val arbitraryDataProvider: ArbitraryDataProvider = ArbitraryDataProviderImpl(context)
         val gson = Gson()
         val mediaFoldersModel: MediaFoldersModel
@@ -196,16 +194,17 @@ class MediaFoldersDetectionWork constructor(
         }
 
         // only send notification when synced folder is setup, gplay flavor and not branded client
-        if (syncedFolderProvider.syncedFolders.isNotEmpty() && 
-            BuildHelper.GPLAY == BuildConfig.FLAVOR && 
+        if (syncedFolderProvider.syncedFolders.isNotEmpty() &&
+            BuildHelper.isFlavourGPlay() &&
             !preferences.isAutoUploadGPlayNotificationShown &&
-            !MainApp.isClientBranded()) {
-                sendAutoUploadNotification()
-            }
-        
+            !MainApp.isClientBranded()
+        ) {
+            sendAutoUploadNotification()
+        }
+
         return Result.success()
     }
-    
+
     private fun sendAutoUploadNotification() {
         val notificationId = randomIdGenerator.nextInt()
         val intent = Intent(context, FileDisplayActivity::class.java).apply {
@@ -224,8 +223,8 @@ class MediaFoldersDetectionWork constructor(
         )
             .setSmallIcon(R.drawable.notification_icon)
             .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.notification_icon))
-            .setContentTitle("Re-enable Disrupted Auto Uploads")
-            .setContentText("Click to learn how to re-enable auto uploads")
+            .setContentTitle(context.getString(R.string.re_enable_disrupted_auto_uploads))
+            .setContentText(context.getString(R.string.click_to_learn_how_to_re_enable_auto_uploads))
             .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
             .setAutoCancel(true)
             .setContentIntent(pendingIntent)
diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
index 02ac9a23432e..479a59e130af 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
+++ b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
@@ -21,7 +21,6 @@
 import android.text.TextUtils;
 
 import com.nextcloud.utils.BuildHelper;
-import com.owncloud.android.BuildConfig;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.network.WebdavEntry;
 import com.owncloud.android.lib.common.network.WebdavUtils;
@@ -1093,7 +1092,7 @@ public void setInternalFolderSyncResult(String internalFolderSyncResult) {
     }
     
     public boolean isAPKorAAB() {
-        if (BuildHelper.GPLAY.equals(BuildConfig.FLAVOR)) {
+        if (BuildHelper.INSTANCE.isFlavourGPlay()) {
             return getFileName().endsWith(".apk") || getFileName().endsWith(".aab");
         } else {
             return false;
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 99469dc488a2..71f00cc0b227 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -72,7 +72,6 @@
 import com.nextcloud.utils.extensions.IntentExtensionsKt;
 import com.nextcloud.utils.fileNameValidator.FileNameValidator;
 import com.nextcloud.utils.view.FastScrollUtils;
-import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.FilesBinding;
@@ -284,8 +283,8 @@ protected void onCreate(Bundle savedInstanceState) {
         mPlayerConnection = new PlayerServiceConnection(this);
 
         checkStoragePath();
-        checkAutoUploadOnGPlay();
-        checkAutoUploadOnGPlay2();
+        notifyGPlayPermissionChanges();
+        showAutoUploadWarningForGPlayFlavour();
 
         initSyncBroadcastReceiver();
         observeWorkerState();
@@ -295,8 +294,8 @@ protected void onCreate(Bundle savedInstanceState) {
         offlineFolderConflictManager.registerRefreshSearchEventReceiver();
     }
 
-    private void checkAutoUploadOnGPlay() {
-        if (!BuildHelper.GPLAY.equals(BuildConfig.FLAVOR) || MainApp.isClientBranded()) {
+    private void notifyGPlayPermissionChanges() {
+        if (!BuildHelper.INSTANCE.isFlavourGPlay() || MainApp.isClientBranded()) {
             return;
         }
 
@@ -338,51 +337,37 @@ private void checkAutoUploadOnGPlay() {
         preferences.setAutoUploadGPlayWarningShown(true);
     }
 
-    private void checkAutoUploadOnGPlay2() {
-        if (!BuildHelper.GPLAY.equals(BuildConfig.FLAVOR) || MainApp.isClientBranded()) {
+    private void showAutoUploadWarningForGPlayFlavour() {
+        if (!BuildHelper.INSTANCE.isFlavourGPlay() || MainApp.isClientBranded()) {
             return;
         }
 
-        // only show on Android11+
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
             return;
         }
 
         boolean showAutoUploadDialog = false;
         for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
-            // show dialog only on
             if (syncedFolder.getType() == MediaFolderType.CUSTOM) {
                 showAutoUploadDialog = true;
                 break;
             }
         }
 
-        if (showAutoUploadDialog) {
-            if (!preferences.isAutoUploadGPlayWarning2Shown()) {
-                new MaterialAlertDialogBuilder(this, R.style.Theme_ownCloud_Dialog)
-                    .setTitle(R.string.auto_upload_gplay)
-                    .setMessage(R.string.auto_upload_gplay_desc2)
-                    .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
-                        dialog.dismiss();
-                        preferences.setAutoUploadGPlayWarning2Shown(true);
-                    })
-                    .setIcon(R.drawable.nav_synced_folders)
-                    .create()
-                    .show();
-            }
-        } else {
-            if (!preferences.isAutoUploadGPlayWarning2Shown()) {
-                new MaterialAlertDialogBuilder(this, R.style.Theme_ownCloud_Dialog)
-                    .setTitle(R.string.upload_gplay)
-                    .setMessage(R.string.upload_gplay_desc)
-                    .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
-                        dialog.dismiss();
-                        preferences.setAutoUploadGPlayWarning2Shown(true);
-                    })
-                    .setIcon(R.drawable.nav_synced_folders)
-                    .create()
-                    .show();
-            } 
+        if (!preferences.isAutoUploadGPlayWarning2Shown()) {
+            String title = showAutoUploadDialog ? getString(R.string.auto_upload_gplay) : getString(R.string.upload_gplay);
+            String message = showAutoUploadDialog ? getString(R.string.auto_upload_gplay_desc2) : getString(R.string.upload_gplay_desc);
+
+            new MaterialAlertDialogBuilder(this, R.style.Theme_ownCloud_Dialog)
+                .setTitle(title)
+                .setMessage(message)
+                .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
+                    dialog.dismiss();
+                    preferences.setAutoUploadGPlayWarning2Shown(true);
+                })
+                .setIcon(R.drawable.nav_synced_folders)
+                .create()
+                .show();
         }
 
         PermissionUtil.requestMediaLocationPermission(this);
@@ -692,19 +677,23 @@ protected void onNewIntent(Intent intent) {
                 setLeftFragment(new GroupfolderListFragment());
                 getSupportFragmentManager().executePendingTransactions();
             } else if (AUTO_UPLOAD_NOTIFICATION.equals(intent.getAction())) {
-                new MaterialAlertDialogBuilder(this, R.style.Theme_ownCloud_Dialog)
-                    .setTitle(R.string.re_enable_auto_upload)
-                    .setMessage(R.string.re_enable_auto_upload_desc)
-                    .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
-                        dialog.dismiss();
-                        preferences.setAutoUploadGPlayNotificationShown(true);
-                    })
-                    .setIcon(R.drawable.nav_synced_folders)
-                    .create()
-                    .show();
+                handleAutoUploadNotification();
             }
         }
     }
+    
+    private void handleAutoUploadNotification() {
+        new MaterialAlertDialogBuilder(this, R.style.Theme_ownCloud_Dialog)
+            .setTitle(R.string.re_enable_auto_upload)
+            .setMessage(R.string.re_enable_auto_upload_desc)
+            .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
+                dialog.dismiss();
+                preferences.setAutoUploadGPlayNotificationShown(true);
+            })
+            .setIcon(R.drawable.nav_synced_folders)
+            .create()
+            .show();
+    }
 
     private void onOpenFileIntent(Intent intent) {
         String extra = intent.getStringExtra(EXTRA_FILE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64b7cd783cc7..7ca5de978b09 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1302,4 +1302,6 @@
     <string name="upload_gplay_desc">A new permission \"access location\" is required for persisting GPS information in images.\nPlease also double check that \"all access\" is granted for photo and video access.</string>
     <string name="re_enable_auto_upload">Re-enable disrupted Auto Uploads</string>
     <string name="re_enable_auto_upload_desc">Please check manually for missing file uploads since mid-December.\nTo re-enable Auto Uploads for new photos and videos:\n- Grant \"Photos and Videos\" permission in the next dialog,\n- Grant \"Location\" permission to keep location data in uploaded photos.\n\nTo re-enable Auto Uploads for all other files:\n- Auto Uploads of other files are not possible anymore with the Play Store version of the Nextcloud app.\n\nAuto Uploads stopped working because Google rejected the necessary file permission in a previous app update. Nextcloud is working with Google to rectify the situation and restore full functionality.</string>
+    <string name="re_enable_disrupted_auto_uploads">Re-enable Disrupted Auto Uploads</string>
+    <string name="click_to_learn_how_to_re_enable_auto_uploads">Click to learn how to re-enable auto uploads</string>
 </resources>

From cf11dc8d5664e35ee8664b98f2845916a88d0e15 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Mon, 13 Jan 2025 14:43:04 +0000
Subject: [PATCH 06/11] Analysis: update lint results to reflect reduced
 error/warning count

Signed-off-by: github-actions <github-actions@github.com>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 scripts/analysis/lint-results.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 6e31d058dcc4..6e8e51169ae3 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 3 errors and 56 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 3 errors and 55 warnings</span>

From a35f2306f0ab67e5f3ca78735e2395b4cd2a3449 Mon Sep 17 00:00:00 2001
From: Tobias Kaminsky <tobias@kaminsky.me>
Date: Mon, 13 Jan 2025 15:55:49 +0100
Subject: [PATCH 07/11] Fix code scanning alert no. 243: Use of implicit
 PendingIntents

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Tobias Kaminsky <tobias@nextcloud.com>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
index 602885a50f8f..93a5475c33b9 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
@@ -207,7 +207,8 @@ class MediaFoldersDetectionWork constructor(
 
     private fun sendAutoUploadNotification() {
         val notificationId = randomIdGenerator.nextInt()
-        val intent = Intent(context, FileDisplayActivity::class.java).apply {
+        val intent = Intent().apply {
+            setClassName(context, FileDisplayActivity::class.java.name)
             setAction(FileDisplayActivity.AUTO_UPLOAD_NOTIFICATION)
         }
         val pendingIntent = PendingIntent.getActivity(

From f5af0804d41e59a08ad9e626496873aea316ad37 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Mon, 13 Jan 2025 16:09:06 +0100
Subject: [PATCH 08/11] no need to request external storage permission again,
 requestMediaLocationPermission when user pressed the close button

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../owncloud/android/ui/activity/FileDisplayActivity.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 71f00cc0b227..b80d3f0cb481 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -362,18 +362,14 @@ private void showAutoUploadWarningForGPlayFlavour() {
                 .setTitle(title)
                 .setMessage(message)
                 .setNegativeButton(R.string.dialog_close, (dialog, which) -> {
-                    dialog.dismiss();
+                    PermissionUtil.requestMediaLocationPermission(this);
                     preferences.setAutoUploadGPlayWarning2Shown(true);
+                    dialog.dismiss();
                 })
                 .setIcon(R.drawable.nav_synced_folders)
                 .create()
                 .show();
         }
-
-        PermissionUtil.requestMediaLocationPermission(this);
-        PermissionUtil.requestExternalStoragePermission(this, viewThemeUtils, true);
-
-        
     }
 
     @SuppressWarnings("unchecked")

From bbf5687733ddec04130c2a0218cedee8b1291cbd Mon Sep 17 00:00:00 2001
From: Tobias Kaminsky <tobias@kaminsky.me>
Date: Tue, 14 Jan 2025 07:33:35 +0100
Subject: [PATCH 09/11] Update app/src/main/res/values/strings.xml

Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Tobias Kaminsky <tobias@nextcloud.com>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 app/src/main/res/values/strings.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ca5de978b09..46deda48058e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1297,11 +1297,10 @@
     <string name="auto_upload_gplay">Auto upload behaviour changed</string>
     <string name="auto_upload_gplay_desc">Due to new restrictions imposed by Google, the auto upload feature will no longer be able to automatically remove uploaded files.</string>
     <string name="pick_contact_to_share_with">Pick contact to share with</string>
-    <string name="auto_upload_gplay_desc2">Google restricted our app and removed an important permission.\nThus auto upload can only access images and videos, but no other file formats.\nFurthermore \"access location\" is required for persisting GPS information in images.\nPlease also double check that "all access" is granted for photo and video access.</string>
-    <string name="upload_gplay">Upload needs more permissions</string>
-    <string name="upload_gplay_desc">A new permission \"access location\" is required for persisting GPS information in images.\nPlease also double check that \"all access\" is granted for photo and video access.</string>
-    <string name="re_enable_auto_upload">Re-enable disrupted Auto Uploads</string>
-    <string name="re_enable_auto_upload_desc">Please check manually for missing file uploads since mid-December.\nTo re-enable Auto Uploads for new photos and videos:\n- Grant \"Photos and Videos\" permission in the next dialog,\n- Grant \"Location\" permission to keep location data in uploaded photos.\n\nTo re-enable Auto Uploads for all other files:\n- Auto Uploads of other files are not possible anymore with the Play Store version of the Nextcloud app.\n\nAuto Uploads stopped working because Google rejected the necessary file permission in a previous app update. Nextcloud is working with Google to rectify the situation and restore full functionality.</string>
-    <string name="re_enable_disrupted_auto_uploads">Re-enable Disrupted Auto Uploads</string>
-    <string name="click_to_learn_how_to_re_enable_auto_uploads">Click to learn how to re-enable auto uploads</string>
+    <string name="auto_upload_gplay_desc2">Due to new restrictions imposed by Google, we have been forced to remove an important permission. As a result, auto upload will only be able to upload image and video files.\nAdditionally, a new permission is required to access location information for uploaded images.\nMake sure that media access is set to \"Always allow all\".</string>
+    <string name="upload_gplay">Permission changes</string>
+    <string name="upload_gplay_desc">A new permission is required to access location information for uploaded images.\nMake sure that media access is set to \"Always allow all\".</string>
+    <string name="re_enable_auto_upload">Changes to auto upload</string>
+    <string name="re_enable_auto_upload_desc">Due to new restrictions imposed by Google, we have been forced to remove an important permission. We are currently working with Google to resolve this issue and restore full functionality.\n\nTo re-enable auto upload for new photos and videos:\nSelect \"Allow all\" in the following dialogue or the system settings.\nAllow Nextcloud to use location when prompted, as this allows us to store location when uploading images.\n\nAuto upload will no longer be able to upload any other files when using the Google Play version of the Nextcloud app.\n\nPlease check for any files that may not have been uploaded since December 2024.</string>
+    <string name="click_to_learn_how_to_re_enable_auto_uploads">Manual intervention required to re-enable auto-upload</string>
 </resources>

From 523bfd301ce197136900769d1a88496e8aec576e Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Tue, 14 Jan 2025 07:37:49 +0100
Subject: [PATCH 10/11] update due to code review

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt | 2 +-
 .../com/owncloud/android/ui/fragment/OCFileListFragment.java    | 1 -
 app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
index 93a5475c33b9..411cb2351ab6 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
@@ -224,7 +224,7 @@ class MediaFoldersDetectionWork constructor(
         )
             .setSmallIcon(R.drawable.notification_icon)
             .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.notification_icon))
-            .setContentTitle(context.getString(R.string.re_enable_disrupted_auto_uploads))
+            .setContentTitle(context.getString(R.string.re_enable_auto_upload))
             .setContentText(context.getString(R.string.click_to_learn_how_to_re_enable_auto_uploads))
             .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
             .setAutoCancel(true)
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 5ceb576db256..5b38cf949374 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -492,7 +492,6 @@ public void registerFabListener() {
             mFabMain.setOnClickListener(v -> {
                 PermissionUtil.requestMediaLocationPermission(activity);
 
-
                 final OCFileListBottomSheetDialog dialog =
                     new OCFileListBottomSheetDialog(activity,
                                                     this,
diff --git a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
index f2ac0762a684..e81ba03c0c8d 100644
--- a/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
+++ b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.kt
@@ -318,7 +318,7 @@ object PermissionUtil {
                 ActivityCompat.requestPermissions(
                     activity,
                     arrayOf(Manifest.permission.ACCESS_MEDIA_LOCATION),
-                    PERMISSIONS_POST_NOTIFICATIONS
+                    PERMISSIONS_MEDIA_LOCATION
                 )
             }
         }

From 12b3fff7c9cfd4a3c9505add937cbb52e82706b9 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Tue, 14 Jan 2025 08:34:18 +0100
Subject: [PATCH 11/11] fix code analytics

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
index 411cb2351ab6..6cce6a127628 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt
@@ -194,6 +194,7 @@ class MediaFoldersDetectionWork constructor(
         }
 
         // only send notification when synced folder is setup, gplay flavor and not branded client
+        @Suppress("ComplexMethod")
         if (syncedFolderProvider.syncedFolders.isNotEmpty() &&
             BuildHelper.isFlavourGPlay() &&
             !preferences.isAutoUploadGPlayNotificationShown &&