Use @StringRes as message for OfflineException.Reason

And evaluate them in TipsAdapter

Signed-off-by: Stefan Niedermann <info@niedermann.it>

1 files changed, 29 insertions, 24 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/exceptions/OfflineException.java b/app/src/main/java/it/niedermann/nextcloud/deck/exceptions/OfflineException.java
index bcd41cb16..1415659a5 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/exceptions/OfflineException.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/exceptions/OfflineException.java
@@ -1,45 +1,50 @@
 package it.niedermann.nextcloud.deck.exceptions;
 
-import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+
+import it.niedermann.nextcloud.deck.R;
 
 public class OfflineException extends IllegalStateException {
 
     private final Reason reason;
 
+    public OfflineException() {
+        this(Reason.OFFLINE);
+    }
+
+    public OfflineException(@NonNull Reason reason) {
+        super(reason.getKey());
+        this.reason = reason;
+    }
+
+    @NonNull
+    public Reason getReason() {
+        return reason;
+    }
+
     public enum Reason {
-        OFFLINE("offline",  "The device is currently offline"),
-        CONNECTION_REFUSED("connection_refused", "Connection was refused, please check if your server is reachable"),
-        CONNECTION_TIMEOUT("connection_timeout", "Connection timed out, please check if you're connected to the internet"),
+        OFFLINE("Device is currently offline", R.string.error_dialog_tip_offline_no_internet),
+        CONNECTION_REFUSED("Connection refused", R.string.error_dialog_tip_offline_connection_refused),
+        CONNECTION_TIMEOUT("Connection timeout", R.string.error_dialog_tip_offline_connection_timeout),
         ;
 
-        private String key;
-        private String whatHappened;
+        private final String key;
+        @StringRes
+        private final int message;
 
-        Reason(String key, String whatHappened) {
+        Reason(@NonNull String key, @StringRes int message) {
             this.key = key;
-            this.whatHappened = whatHappened;
+            this.message = message;
         }
 
         public String getKey() {
             return key;
         }
 
-        public String getWhatHappened() {
-            return whatHappened;
+        @StringRes
+        public int getMessage() {
+            return message;
         }
     }
-
-
-    public OfflineException() {
-        this(Reason.OFFLINE);
-    }
-    public OfflineException(Reason reason) {
-        super(reason.getWhatHappened());
-        this.reason = reason;
-    }
-
-    @Nullable
-    public Reason getReason() {
-        return reason;
-    }
 }