Merge branch 'master' into patch-1

Author: Gorlesunilkumar

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())
 

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

@@ -613,7 +613,6 @@
     <string name="offline_mode">ليس هناك اتصال بالأنترنت</string>
     <string name="offline_mode_info_description">حتى بدون اتصال بالإنترنت، يمكنك تنظيم مجلداتك وإنشاء ملفات. بمجرد عودة الاتصال بالإنترنت، ستتم مزامنة الإجراءات المعلقة تلقائياً.</string>
     <string name="offline_mode_info_title">أنت غير متصل؛ لكن العمل مستمر</string>
-    <string name="offline_operations_file_does_not_exists_yet">الملف لم يتوفر حتى الآن. يرجى رفع الملف أولاً.</string>
     <string name="offline_operations_worker_notification_error_text">لا يمكن إكمال العملية دون اتصال. %s</string>
     <string name="offline_operations_worker_notification_manager_ticker">عمليات دون اتصال بالإنترنت</string>
     <string name="offline_operations_worker_notification_start_text">بدء عمليات بدون اتصال</string>

app/src/main/res/values-b+en+001/strings.xml

@@ -648,7 +648,6 @@
     <string name="offline_mode">No internet connection</string>
     <string name="offline_mode_info_description">Even without an internet connection, you can organise your folders, create files. Once you\'re back online, your pending actions will automatically sync.</string>
     <string name="offline_mode_info_title">You\'re offline, but work continues</string>
-    <string name="offline_operations_file_does_not_exists_yet">File does not exists, yet. Please upload the file first.</string>
     <string name="offline_operations_worker_notification_create_file_conflict_text">Could not create %s. A file with the same name exists on the server.</string>
     <string name="offline_operations_worker_notification_create_folder_conflict_text">Could not create %s. A folder with the same name exists on the server.</string>
     <string name="offline_operations_worker_notification_error_text">The offline operation cannot be completed. %s</string>

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

@@ -594,7 +594,6 @@
     <string name="oc_file_list_adapter_offline_operation_description_text">Operació pendent</string>
     <string name="offline_mode">No hi ha connexió a internet</string>
     <string name="offline_mode_info_description">Fins i tot sense connexió a Internet, podeu organitzar les vostres carpetes i crear fitxers. Quan torneu a estar en línia, les accions pendents se sincronitzaran automàticament.</string>
-    <string name="offline_operations_file_does_not_exists_yet">El fitxer encara no existeix. Pugeu primer el fitxer.</string>
     <string name="offline_operations_worker_notification_error_text">No es pot completar l\'operació fora de línia. %s</string>
     <string name="offline_operations_worker_notification_manager_ticker">Operacions fora de línia</string>
     <string name="oneHour">1 hora</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -648,7 +648,6 @@
     <string name="offline_mode">Bez připojení k Internetu</string>
     <string name="offline_mode_info_description">I bez připojení k Internetu je možné uspořádávat své složky a vytvářet soubory. Jakmile budete opět online, vaše čekající změny budou automaticky synchronizovány.</string>
     <string name="offline_mode_info_title">Jste bez připojení, ale práce pokračuje</string>
-    <string name="offline_operations_file_does_not_exists_yet">Soubor ještě neexistuje. Nejprve ho prosím nahrajte.</string>
     <string name="offline_operations_worker_notification_create_file_conflict_text">Nebylo možné vytvořit %s. Takto nazvaný soubor už na serveru existuje.</string>
     <string name="offline_operations_worker_notification_create_folder_conflict_text">Nebylo možné vytvořit %s. Takto nazvaná složka už na serveru existuje.</string>
     <string name="offline_operations_worker_notification_error_text">Offline operaci není možné dokončit. %s</string>

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

@@ -638,7 +638,6 @@
     <string name="offline_mode">Ingen internetforbindelse</string>
     <string name="offline_mode_info_description">Selv uden internetforbindelse kan du organisere dine mapper, oprette filer. Når du er online igen, synkroniseres dine afventende handlinger automatisk.</string>
     <string name="offline_mode_info_title">Du er offline, men arbejdet fortsætter</string>
-    <string name="offline_operations_file_does_not_exists_yet">Filen eksisterer ikke endnu. Upload venligst filen først.</string>
     <string name="offline_operations_worker_notification_create_file_conflict_text">Kunne ikke oprette %s. En fil med det samme navn eksisterer på serveren.</string>
     <string name="offline_operations_worker_notification_create_folder_conflict_text">Kunne ikke oprette %s. En mappe med det samme navn eksisterer på serveren.</string>
     <string name="offline_operations_worker_notification_error_text">Offline handlingen kan ikke gennemføres. %s</string>

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

@@ -648,7 +648,6 @@
     <string name="offline_mode">Keine Internetverbindung</string>
     <string name="offline_mode_info_description">Auch ohne Internetverbindung können Sie Ihre Ordner organisieren und Dateien erstellen. Sobald Sie wieder online sind, werden die ausstehenden Aktionen automatisch synchronisiert.</string>
     <string name="offline_mode_info_title">Sie sind offline, können aber weiterarbeiten</string>
-    <string name="offline_operations_file_does_not_exists_yet">Datei existiert noch nicht. Bitte laden Sie zuerst die Datei hoch.</string>
     <string name="offline_operations_worker_notification_create_file_conflict_text">%s konnte nicht erstellt werden. Eine Datei mit demselben Namen ist bereits auf dem Server vorhanden.</string>
     <string name="offline_operations_worker_notification_create_folder_conflict_text">%s konnte nicht erstellt werden. Ein Ordner mit demselben Namen ist bereits auf dem Server vorhanden.</string>
     <string name="offline_operations_worker_notification_error_text">Der Offlinevorgang kann nicht abgeschlossen werden. %s</string>

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

@@ -633,7 +633,6 @@
     <string name="offline_mode">No hay conexión a internet</string>
     <string name="offline_mode_info_description">Incluso sin una conexión a internet, puede organizar sus carpetas o crear archivos. Una vez vuelva a estar en línea, las acciones pendientes se sincronizarán automáticamente.</string>
     <string name="offline_mode_info_title">Está desconectado, pero el trabajo continúa</string>
-    <string name="offline_operations_file_does_not_exists_yet">El archivo no existe, todavía. Por favor, suba primero el archivo.</string>
     <string name="offline_operations_worker_notification_create_file_conflict_text">No se pudo crear %s. Un archivo con el mismo nombre existe en el servidor.</string>
     <string name="offline_operations_worker_notification_create_folder_conflict_text">No se pudo crear %s. Una carpeta con el mismo nombre existe en el servidor.</string>
     <string name="offline_operations_worker_notification_error_text">La operación sin conexión no se ha podido completar. %s</string>

app/src/main/res/values-et-rEE/strings.xml

@@ -648,7 +648,6 @@
     <string name="offline_mode">Internetiühendus puudub</string>
     <string name="offline_mode_info_description">Ka ilma internetiühenduseta saad hallata oma kaustu, korrastada ja luua uusi faile. Võrguühenduse taastumisel tehtud muudatused sünkroniseeritakse automaatselt.</string>
     <string name="offline_mode_info_title">Sa pole võrgus, aga töö jätkub</string>
-    <string name="offline_operations_file_does_not_exists_yet">Faili pole veel olemas. Esmalt palun laadi fail üles.</string>
     <string name="offline_operations_worker_notification_create_file_conflict_text">Kuna sama nimega fail on serveris juba olemas, siis %s faili loomine on katkestatud.</string>
     <string name="offline_operations_worker_notification_create_folder_conflict_text">Kuna sama nimega kaust on serveris juba olemas, siis %s kausta loomine on katkestatud.</string>
     <string name="offline_operations_worker_notification_error_text">Vallasrežiimis tegevust ei õnnestu lõpetada. %s</string>