From f5b8206959e28f2d12d442fedfe351a8ddd39ce2 Mon Sep 17 00:00:00 2001
From: Bazsalanszky <balazs@toldi.eu>
Date: Thu, 25 Jul 2024 10:42:41 +0200
Subject: [PATCH] Fix token checking (again)

Failure to call the API (e.g. network error) with the token caused incorrect relogin requests.
---
 .../eu/toldi/infinityforlemmy/activities/MainActivity.java  | 6 ++++++
 .../java/eu/toldi/infinityforlemmy/user/FetchUserData.java  | 3 ++-
 app/src/main/res/values/strings.xml                         | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java
index 9431092f..379dc7f3 100644
--- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java
+++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java
@@ -54,6 +54,7 @@ import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
 import com.google.android.material.textfield.TextInputEditText;
@@ -1113,6 +1114,11 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
                             .setCancelable(false)
                             .show();
                 }
+
+                @Override
+                public void onCheckFailed(String message) {
+                    applySnackBarTheme(Snackbar.make(findViewById(android.R.id.content), getString(R.string.failed_to_check_token_validity,message), Snackbar.LENGTH_LONG)).show();
+                }
             });
         }
     }
diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/user/FetchUserData.java b/app/src/main/java/eu/toldi/infinityforlemmy/user/FetchUserData.java
index 0511e8e0..6288a701 100644
--- a/app/src/main/java/eu/toldi/infinityforlemmy/user/FetchUserData.java
+++ b/app/src/main/java/eu/toldi/infinityforlemmy/user/FetchUserData.java
@@ -124,7 +124,7 @@ public class FetchUserData {
 
             @Override
             public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
-                validateAuthTokenListener.onValidateAuthTokenFailed();
+                validateAuthTokenListener.onCheckFailed(t.getMessage());
             }
         });
     }
@@ -133,6 +133,7 @@ public class FetchUserData {
         void onValidateAuthTokenSuccess();
 
         void onValidateAuthTokenFailed();
+        void onCheckFailed(String message);
     }
 
     public interface FetchUserUnreadCountListener {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f9904bed..16962ab8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1334,4 +1334,5 @@
     <string name="settings_dont_hide_your_own_read_posts_automatically">Don\'t hide your own read posts automatically</string>
     <string name="deleted_by_creator">deleted by creator</string>
     <string name="removed_by_moderator">removed by moderator</string>
+    <string name="failed_to_check_token_validity">Failed to check token validity: %s</string>
 </resources>
\ No newline at end of file