From 5027ba6add4dd361dc8c67b3e2ff2d55c31c77b7 Mon Sep 17 00:00:00 2001 From: nuclearfog Date: Wed, 27 Oct 2021 19:30:00 +0200 Subject: [PATCH] layout fix, added error message, added license Signed-off-by: nuclearfog --- .../backend/engine/EngineException.java | 7 +++++-- .../twidda/backend/utils/ErrorHandler.java | 3 +++ app/src/main/res/layout/dialog_confirm.xml | 2 ++ app/src/main/res/values-de-rDE/strings.xml | 1 + app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/licenses.xml | 21 +++++++++++++++++++ 7 files changed, 34 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/engine/EngineException.java b/app/src/main/java/org/nuclearfog/twidda/backend/engine/EngineException.java index 80b03c32..0b92acab 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/engine/EngineException.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/engine/EngineException.java @@ -1,10 +1,10 @@ package org.nuclearfog.twidda.backend.engine; -import twitter4j.TwitterException; - import static org.nuclearfog.twidda.backend.engine.EngineException.ErrorType.RESOURCE_NOT_FOUND; import static org.nuclearfog.twidda.backend.engine.EngineException.ErrorType.USER_NOT_FOUND; +import twitter4j.TwitterException; + /** * Exception class for {@link TwitterEngine} * @@ -30,6 +30,7 @@ public class EngineException extends Exception { NO_LINK_DEFINED, NO_CONNECTION, IMAGE_NOT_LOADED, + REQUEST_CANCELLED, ACCOUNT_UPDATE_FAILED, ERROR_API_ACCESS_DENIED, ERROR_NOT_DEFINED @@ -128,6 +129,8 @@ public class EngineException extends Exception { default: if (error.getStatusCode() == 401) { errorType = ErrorType.NOT_AUTHORIZED; + } else if (error.getStatusCode() == 408) { + errorType = ErrorType.REQUEST_CANCELLED; } else if (error.isCausedByNetworkIssue()) { errorType = ErrorType.NO_CONNECTION; } else { diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/utils/ErrorHandler.java b/app/src/main/java/org/nuclearfog/twidda/backend/utils/ErrorHandler.java index 3fb8fb38..01ae7f94 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/utils/ErrorHandler.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/utils/ErrorHandler.java @@ -100,6 +100,9 @@ public final class ErrorHandler { case ACCOUNT_UPDATE_FAILED: return context.getString(R.string.error_acc_update); + case REQUEST_CANCELLED: + return context.getString(R.string.error_result_cancelled); + case APP_SUSPENDED: case ERROR_API_ACCESS_DENIED: GlobalSettings settings = GlobalSettings.getInstance(context); diff --git a/app/src/main/res/layout/dialog_confirm.xml b/app/src/main/res/layout/dialog_confirm.xml index d507906e..e1a2999f 100644 --- a/app/src/main/res/layout/dialog_confirm.xml +++ b/app/src/main/res/layout/dialog_confirm.xml @@ -27,6 +27,8 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/confirm_text_margin" android:textSize="@dimen/confirm_message_fontsize" + android:maxLines="@integer/confirm_message_max_ines" + android:scrollbars="vertical" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/confirm_title" app:layout_constraintBottom_toTopOf="@id/confirm_barrier" diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index e82962ce..81ee7548 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -216,4 +216,5 @@ Schreibrechte werden benötigt um Bilder zu speichern. Leserechte werden benötigt um Bilder und Videos einzufügen. Standortinformationen werden ausschließlich für Tweets verwendet. + Fehler, Anfrage wurde abgebrochen! \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 89e561dd..173e4d38 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -195,6 +195,7 @@ 14sp 18sp 22sp + 8 20dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cc750b60..ebb23334 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -198,6 +198,7 @@ Error, API access denied! Please check your API Keys. Error, API Keys expired! Please update app! Too much mentions! + Error, result cancelled! Error, search query is too long or contains illegal characters! Not specified error! diff --git a/app/src/main/res/xml/licenses.xml b/app/src/main/res/xml/licenses.xml index 5ec7f109..1c9b3fd4 100644 --- a/app/src/main/res/xml/licenses.xml +++ b/app/src/main/res/xml/licenses.xml @@ -1,5 +1,26 @@ + + Copyright 2018 nuclearfog + Licensed under the Apache License, + Version 2.0 (the "License"); + you may not use this file except + in compliance with the License. + You may obtain a copy of the License at + https://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law + or agreed to in writing, + software Distributed under the License + is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. + See the License for the specific + language governing permissions and + limitations under the License. + +