Merge pull request #15221 from nextcloud/showQuotaErrorMessage

Show quota error message

Author: tobiasKaminsky

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

@@ -262,6 +262,13 @@ class FileUploadWorker(
             val entity = uploadsStorageManager.uploadDao.getUploadById(upload.uploadId, accountName)
             uploadsStorageManager.updateStatus(entity, result.isSuccess)
             currentUploadFileOperation = null
+
+            if (result.code == ResultCode.QUOTA_EXCEEDED) {
+                Log_OC.w(TAG, "Quota exceeded, stopping uploads")
+                notificationManager.showQuotaExceedNotification(operation, result.code)
+                break
+            }
+
             sendUploadFinishEvent(totalUploadSize, currentUploadIndex, operation, result)
         }
 

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

@@ -14,6 +14,7 @@ import com.nextcloud.utils.extensions.isFileSpecificError
 import com.nextcloud.utils.numberFormatter.NumberFormatter
 import com.owncloud.android.R
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
 import com.owncloud.android.operations.UploadFileOperation
 import com.owncloud.android.ui.notifications.NotificationUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
@@ -152,7 +153,7 @@ class UploadNotificationManager(private val context: Context, viewThemeUtils: Vi
     private fun showNewNotification(operation: UploadFileOperation) {
         notificationManager.notify(
             NotificationUtils.createUploadNotificationTag(operation.file),
-            FileUploadWorker.NOTIFICATION_ERROR_ID,
+            operation.file.hashCode(),
             notificationBuilder.build()
         )
     }
@@ -174,6 +175,17 @@ class UploadNotificationManager(private val context: Context, viewThemeUtils: Vi
         )
     }
 
+    fun showQuotaExceedNotification(operation: UploadFileOperation, resultCode: ResultCode) {
+        notifyForFailedResult(
+            operation,
+            resultCode,
+            null,
+            null,
+            null,
+            context.getString(R.string.upload_quota_exceeded)
+        )
+    }
+
     fun showConnectionErrorNotification() {
         notificationManager.cancel(getId())