From b64f9057f6bd341ba774819a635305ccbe755b40 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 13 Oct 2026 09:17:11 +0200 Subject: [PATCH 1/3] add quota check for all uploads Signed-off-by: alperozturk96 --- .../com/nextcloud/client/jobs/upload/AlbumFileUploadWorker.kt | 2 +- .../java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/AlbumFileUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/AlbumFileUploadWorker.kt index e36a8972c201..007796a8821b 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/upload/AlbumFileUploadWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/upload/AlbumFileUploadWorker.kt @@ -274,7 +274,7 @@ class AlbumFileUploadWorker( if (result.code == ResultCode.QUOTA_EXCEEDED) { Log_OC.w(TAG, "Quota exceeded, stopping uploads") notificationManager.showQuotaExceedNotification(operation) - break + return@withContext Result.failure() } sendUploadFinishEvent(totalUploadSize, currentUploadIndex, operation, result) diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt index e698f3850869..115661b64c19 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt @@ -350,7 +350,7 @@ class FileUploadWorker( if (result.code == ResultCode.QUOTA_EXCEEDED) { Log_OC.w(TAG, "Quota exceeded, stopping uploads") notificationManager.showQuotaExceedNotification(operation) - break + return@withContext Result.failure() } if (!result.isSuccess && !result.code.isUserCancellation()) { From de872d830d23c018d7d4900b03eada31525ea51e Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 13 Oct 2026 09:19:00 +0200 Subject: [PATCH 2/3] add quota check for auto upload Signed-off-by: alperozturk96 --- .../com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt index 1851113ebab2..94fb4ff31a4a 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt +++ b/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt @@ -369,6 +369,11 @@ class AutoUploadWorker( return@withContext } + if (result.code == ResultCode.QUOTA_EXCEEDED) { + Log_OC.w(TAG, "quota exceeded, stopping auto upload") + return@withContext + } + // Mark CONFLICT files as handled to prevent retries if (result.code.isConflict()) { repository.markFileAsHandled(localPath, syncedFolder) From bc3b78828faa76f4a7955c3681151992a469f254 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 13 Oct 2026 09:25:52 +0200 Subject: [PATCH 3/3] use lib Signed-off-by: alperozturk96 --- gradle/libs.versions.toml | 2 +- gradle/verification-metadata.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5549ae0df79e..433c2a34ad01 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ androidCommonLibraryVersion = "e72c899b0cf0f456aabe4816cf07548abd8828e9" androidGifDrawableVersion = "1.2.32" androidImageCropperVersion = "4.7.0" -androidLibraryVersion ="42ca8fd5598ac7c8320a985563f9ecf606a06d87" +androidLibraryVersion ="36c60a34dd" androidOpensslVersion = "3.5.6.1" androidPluginVersion = "9.4.1" androidsvgVersion = "1.4" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index dbf78ed17227..bbb85b5c5b40 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -22567,6 +22567,14 @@ + + + + + + + +