Merge pull request nextcloud#15801 from nextcloud/backport/15800/stable-3.34

[stable-3.34] fix: file upload limit message visibility

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt

@@ -7,6 +7,7 @@
  */
 package com.nextcloud.client.jobs.upload
 
+import android.app.Activity
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -20,6 +21,7 @@ import com.nextcloud.client.network.Connectivity
 import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.utils.extensions.getUploadIds
 import com.owncloud.android.MainApp
+import com.owncloud.android.R
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.UploadsStorageManager
@@ -35,6 +37,7 @@ import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation
 import com.owncloud.android.lib.resources.files.model.RemoteFile
 import com.owncloud.android.operations.RemoveFileOperation
 import com.owncloud.android.operations.UploadFileOperation
+import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.FileUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -459,6 +462,14 @@ class FileUploadHelper {
         return false
     }
 
+    fun showFileUploadLimitMessage(activity: Activity) {
+        val message = activity.getString(
+            R.string.file_upload_limit_message,
+            MAX_FILE_COUNT
+        )
+        DisplayUtils.showSnackMessage(activity, message)
+    }
+
     class UploadNotificationActionReceiver : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             val accountName = intent.getStringExtra(FileUploadWorker.EXTRA_ACCOUNT_NAME)

app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -944,7 +944,7 @@ public void uploadFiles() {
         }
 
         if (mStreamsToUpload.size() > FileUploadHelper.MAX_FILE_COUNT) {
-            DisplayUtils.showSnackMessage(this, R.string.max_file_count_warning_message);
+            FileUploadHelper.Companion.instance().showFileUploadLimitMessage(this);
             return;
         }
 

app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -503,7 +503,7 @@ public void onCheckAvailableSpaceFinish(boolean hasEnoughSpaceAvailable, String.
             } else {
                 final var chosenFiles = mFileListFragment.getCheckedFilePaths();
                 if (chosenFiles.length > FileUploadHelper.MAX_FILE_COUNT) {
-                    DisplayUtils.showSnackMessage(this, R.string.max_file_count_warning_message);
+                    FileUploadHelper.Companion.instance().showFileUploadLimitMessage(this);
                     return;
                 }
 
@@ -670,7 +670,7 @@ public void onClick(View v) {
                 } else {
                     final var chosenFiles = mFileListFragment.getCheckedFilePaths();
                     if (chosenFiles.length > FileUploadHelper.MAX_FILE_COUNT) {
-                        DisplayUtils.showSnackMessage(this, R.string.max_file_count_warning_message);
+                        FileUploadHelper.Companion.instance().showFileUploadLimitMessage(this);
                         return;
                     }
                     boolean isPositionZero = (binding.uploadFilesSpinnerBehaviour.getSelectedItemPosition() == 0);
@@ -720,7 +720,7 @@ public void onConfirmation(String callerTag) {
         Log_OC.d(TAG, "Positive button in dialog was clicked; dialog tag is " + callerTag);
         final var chosenFiles = mFileListFragment.getCheckedFilePaths();
         if (chosenFiles.length > FileUploadHelper.MAX_FILE_COUNT) {
-            DisplayUtils.showSnackMessage(this, R.string.max_file_count_warning_message);
+            FileUploadHelper.Companion.instance().showFileUploadLimitMessage(this);
             return;
         }
 

app/src/main/res/values/strings.xml

@@ -172,7 +172,7 @@
     <string name="uploader_error_message_source_file_not_found">File selected for upload not found. Please check whether the file exists.</string>
     <string name="uploader_error_message_source_file_not_copied">Could not copy file to a temporary folder. Try to resend it.</string>
     <string name="uploader_upload_files_behaviour">Upload option:</string>
-    <string name="max_file_count_warning_message">You have reached the maximum file upload limit. Please upload fewer than 500 files at a time.</string>
+    <string name="file_upload_limit_message">You can upload up to %d files at once."</string>
     <string name="file_upload_worker_same_file_already_exists">%s already exists, no conflict detected</string>
     <string name="uploader_upload_files_behaviour_move_to_nextcloud_folder">Move file to %1$s folder</string>
     <string name="uploader_upload_files_behaviour_only_upload">Keep file in source folder</string>