From 89042113a52f2c4824103549cd3b7ec643536867 Mon Sep 17 00:00:00 2001 From: Grishka Date: Tue, 10 Oct 2023 23:43:44 +0300 Subject: [PATCH] Fix default server loading timeout --- .../org/joinmastodon/android/api/MastodonAPIController.java | 4 ++-- .../org/joinmastodon/android/fragments/SplashFragment.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java index a4063f08b..27857d4f2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java @@ -97,7 +97,7 @@ public class MastodonAPIController{ call.enqueue(new Callback(){ @Override public void onFailure(@NonNull Call call, @NonNull IOException e){ - if(call.isCanceled()) + if(req.canceled) return; if(BuildConfig.DEBUG) Log.w(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" failed", e); @@ -109,7 +109,7 @@ public class MastodonAPIController{ @Override public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException{ - if(call.isCanceled()) + if(req.canceled) return; if(BuildConfig.DEBUG) Log.d(TAG, "["+(session==null ? "no-auth" : session.getID())+"] "+hreq+" received response: "+response); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java index 05622a216..ae1f73549 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java @@ -199,6 +199,8 @@ public class SplashFragment extends AppKitFragment{ private void loadAndChooseDefaultServer(){ loadingDefaultServer=true; + defaultServerButton.setTextVisible(false); + defaultServerProgress.setVisibility(View.VISIBLE); new GetCatalogDefaultInstances() .setCallback(new Callback<>(){ @Override