From da9f2da964dff382837194243714b090d235ec64 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 16 Dec 2024 16:33:42 +0100 Subject: [PATCH] Show "account is disabled" when account is disabled Signed-off-by: tobiasKaminsky --- app/src/main/java/com/nextcloud/client/NominatimClient.kt | 2 +- .../main/java/com/owncloud/android/db/UploadResult.java | 7 ++++++- .../owncloud/android/ui/activity/FileDisplayActivity.java | 4 ++++ .../com/owncloud/android/ui/adapter/UploadListAdapter.java | 3 +++ .../com/owncloud/android/utils/ErrorMessageAdapter.java | 2 ++ app/src/main/res/values/strings.xml | 1 + build.gradle | 2 +- 7 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/NominatimClient.kt b/app/src/main/java/com/nextcloud/client/NominatimClient.kt index f4100b2fb678..7d8f35b07fb2 100644 --- a/app/src/main/java/com/nextcloud/client/NominatimClient.kt +++ b/app/src/main/java/com/nextcloud/client/NominatimClient.kt @@ -12,7 +12,7 @@ import com.google.gson.annotations.SerializedName import com.owncloud.android.MainApp import okhttp3.OkHttpClient import okhttp3.Request -import okhttp3.internal.http.HTTP_OK +import java.net.HttpURLConnection.HTTP_OK import java.net.URLEncoder class NominatimClient constructor(geocoderBaseUrl: String, email: String) { diff --git a/app/src/main/java/com/owncloud/android/db/UploadResult.java b/app/src/main/java/com/owncloud/android/db/UploadResult.java index 7d491c81b96a..b73f4103a38b 100644 --- a/app/src/main/java/com/owncloud/android/db/UploadResult.java +++ b/app/src/main/java/com/owncloud/android/db/UploadResult.java @@ -37,7 +37,8 @@ public enum UploadResult { CANNOT_CREATE_FILE(20), LOCAL_STORAGE_NOT_COPIED(21), QUOTA_EXCEEDED(22), - SAME_FILE_CONFLICT(23); + SAME_FILE_CONFLICT(23), + USER_DISABLED(24); private final int value; @@ -101,6 +102,8 @@ public static UploadResult fromValue(int value) { return QUOTA_EXCEEDED; case 23: return SAME_FILE_CONFLICT; + case 24: + return USER_DISABLED; } return UNKNOWN; } @@ -161,6 +164,8 @@ public static UploadResult fromOperationResult(RemoteOperationResult result) { return CANNOT_CREATE_FILE; case QUOTA_EXCEEDED: return QUOTA_EXCEEDED; + case USER_DISABLED: + return USER_DISABLED; default: return UNKNOWN; } 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 index 955e3e8769db..d4a654b5dce8 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1371,6 +1371,10 @@ public void onReceive(Context context, Intent intent) { case MAINTENANCE_MODE: showInfoBox(R.string.maintenance_mode); break; + + case USER_DISABLED: + showInfoBox(R.string.disabled_user); + break; case NO_NETWORK_CONNECTION: showInfoBox(R.string.offline_mode); diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java index e4d08e2335d6..4d91816b9173 100755 --- a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java +++ b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java @@ -798,6 +798,9 @@ private String getUploadFailedStatusText(UploadResult result) { case MAINTENANCE_MODE: status = parentActivity.getString(R.string.maintenance_mode); break; + case USER_DISABLED: + status = parentActivity.getString(R.string.disabled_user); + break; case SSL_RECOVERABLE_PEER_UNVERIFIED: status = parentActivity.getString( diff --git a/app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java b/app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java index 6795feb714e6..e8295fdc5dfe 100644 --- a/app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java +++ b/app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java @@ -430,6 +430,8 @@ String getMessageForResult(RemoteOperationResult result, Resources res) { } else if (result.getCode() == ResultCode.QUOTA_EXCEEDED) { message = res.getString(R.string.upload_quota_exceeded); + } else if (result.getCode() == ResultCode.USER_DISABLED) { + message = res.getString(R.string.disabled_user); } else if (!TextUtils.isEmpty(result.getHttpPhrase())) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 819e2211316f..b09a3861c179 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -642,6 +642,7 @@ Do you really want to delete the selected items? Do you really want to delete the selected items and their contents? Server is in maintenance mode + Account is disabled No internet connection You\'re Offline, But Work Continues Even without an internet connection, you can organize your folders, create files. Once you\'re back online, your pending actions will automatically sync. diff --git a/build.gradle b/build.gradle index 50865b2337fe..4f8401c758d2 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ */ buildscript { ext { - androidLibraryVersion ="638326e14bc234ca3285852af461d41e6e08d1aa" + androidLibraryVersion ="d46ecea34cec32a0a4cd43a0be7a1aa42ea6bd5b" androidPluginVersion = '8.7.3' androidxMediaVersion = '1.4.1' androidxTestVersion = "1.6.1"