From 47ca6fb209c5bff43902f5745352003d0aee4344 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Mon, 30 May 2022 19:13:43 +0200
Subject: [PATCH] added error message, proguard fix

---
 app/proguard-rules.pro                                        | 4 +---
 .../org/nuclearfog/twidda/backend/api/TwitterException.java   | 3 +++
 .../org/nuclearfog/twidda/backend/utils/ErrorHandler.java     | 4 ++++
 app/src/main/res/values-de-rDE/strings.xml                    | 1 +
 app/src/main/res/values/strings.xml                           | 1 +
 build.gradle                                                  | 2 +-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index e2f51a14..544b5ca4 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -20,6 +20,4 @@
 
 -dontwarn javax.annotation.Nullable
 
--keepclassmembers class * implements android.os.Parcelable {
-        public static final ** CREATOR;
-}
\ No newline at end of file
+-keepclassmembers class * implements android.os.Parcelable {*;}
\ No newline at end of file
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/TwitterException.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/TwitterException.java
index 8f020e3b..b8d8512e 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/api/TwitterException.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/TwitterException.java
@@ -112,6 +112,9 @@ public class TwitterException extends Exception implements TwitterError {
             case 261:
                 return ERROR_API_ACCESS_DENIED;
 
+            case 324:
+                return INVALID_MEDIA;
+
             case 354:
                 return DM_TOO_LONG;
 
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 0242a54d..8eb5691a 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
@@ -105,6 +105,9 @@ public final class ErrorHandler {
                 case TwitterError.REQUEST_FORBIDDEN:
                     return context.getString(R.string.error_forbidden_api_access);
 
+                case TwitterError.INVALID_MEDIA:
+                    return context.getString(R.string.error_invalid_media);
+
                 case TwitterError.APP_SUSPENDED:
                 case TwitterError.ERROR_API_ACCESS_DENIED:
                     GlobalSettings settings = GlobalSettings.getInstance(context);
@@ -147,6 +150,7 @@ public final class ErrorHandler {
         int REQUEST_FORBIDDEN = 18;
         int APP_SUSPENDED = 19;
         int ERROR_API_ACCESS_DENIED = 20;
+        int INVALID_MEDIA = 21;
 
         int getErrorType();
 
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index b76bb5be..fe80ac57 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -240,4 +240,5 @@
     <string name="confirm_unknown_error">Unbekannter Fehler!</string>
     <string name="dialog_confirm_remember">merken</string>
     <string name="directmessage_media_button">Medienanhang</string>
+    <string name="error_invalid_media">Ungültige Mediendatei!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 728b5e36..32690529 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -93,6 +93,7 @@
     <string name="error_mention_exceed">Too much mentions!</string>
     <string name="error_result_cancelled">Error, result cancelled!</string>
     <string name="error_twitter_search">Error, search query is too long or contains illegal characters!</string>
+    <string name="error_invalid_media">Invalid media file!</string>
     <string name="error_not_defined">Not specified error!</string>
     <string name="error_forbidden_api_access">API does not support this operation!</string>
     <string name="error_login_information">could not load login information!</string>
diff --git a/build.gradle b/build.gradle
index 6044aa06..a3307a43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath 'io.michaelrocks:paranoid-gradle-plugin:0.3.7'
         classpath 'gradle.plugin.ru.cleverpumpkin.proguard-dictionaries-generator:plugin:1.0.8'
     }