From a9ef1f9d47bf42116ef1d11bf42788740fe4f114 Mon Sep 17 00:00:00 2001 From: Grishka Date: Wed, 10 Jul 2024 02:48:33 +0300 Subject: [PATCH] Someone else's code throwing too many exceptions again, yay --- mastodon/build.gradle | 2 +- .../android/fragments/HomeTimelineFragment.java | 4 ---- .../org/joinmastodon/android/fragments/WebViewFragment.java | 6 ++++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mastodon/build.gradle b/mastodon/build.gradle index fa316ccc..8285e3fc 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -13,7 +13,7 @@ android { applicationId "org.joinmastodon.android" minSdk 23 targetSdk 34 - versionCode 110 + versionCode 111 versionName "2.6.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java index 0a4205b8..c30a8f13 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java @@ -278,7 +278,6 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD }); if(GithubSelfUpdater.needSelfUpdating()){ - E.register(this); updateUpdateState(GithubSelfUpdater.getInstance().getState()); } if(currentDonationCampaign!=null) @@ -634,9 +633,6 @@ public class HomeTimelineFragment extends StatusListFragment implements ToolbarD @Override public void onDestroyView(){ super.onDestroyView(); - if(GithubSelfUpdater.needSelfUpdating()){ - E.unregister(this); - } donationBanner=null; donationBannerDismissing=false; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/WebViewFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/WebViewFragment.java index 7cd3022a..862e3bc7 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/WebViewFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/WebViewFragment.java @@ -45,8 +45,10 @@ public abstract class WebViewFragment extends LoaderFragment{ @Override public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error){ - onError(new MastodonErrorResponse(error.getDescription().toString(), -1, null)); - updateBackCallback(); + if(!loaded){ + onError(new MastodonErrorResponse(error.getDescription().toString(), -1, null)); + updateBackCallback(); + } } @Override