Merge pull request #14432 from nextcloud/fix/auto-upload-notification

Show auto upload notification in all activities
nextcloud · Jan 20, 2025 · 02f6d86 · 02f6d86
2 parents 61dfce1 + 5d89951
commit 02f6d86
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 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
@@ -672,8 +672,6 @@ protected void onNewIntent(Intent intent) {
                 DrawerActivity.menuItemId = R.id.nav_groupfolders;
                 setLeftFragment(new GroupfolderListFragment());
                 getSupportFragmentManager().executePendingTransactions();
-            } else if (AUTO_UPLOAD_NOTIFICATION.equals(intent.getAction())) {
-                showReEnableAutoUploadDialog();
             }
         }
     }
@@ -1249,6 +1247,8 @@ protected void onResume() {
             if (fileArgs != null) {
                 startFile = fileArgs;
                 setFile(startFile);
+            } else if (AUTO_UPLOAD_NOTIFICATION.equals(getIntent().getAction())) {
+                showReEnableAutoUploadDialog();
             }
         }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1301,6 +1301,6 @@
     <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 media location when prompted, as this allows Nextcloud to store location data when uploading images.\n\nPermission dialog is only shown when needed. In doubt, please double check via system settings.\n\nAuto upload will only be able to upload image and video 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="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 media location when prompted, as this allows Nextcloud to store location data when uploading images.\n\nThe permissions dialogue is only displayed when necessary. If in doubt, check the system settings.\n\nAuto upload will only be able to upload image and video 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>