Someone else's code throwing too many exceptions again, yay

mastodon · Jul 9, 2024 · a9ef1f9 · a9ef1f9
1 parent 0182763
commit a9ef1f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -278,7 +278,6 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
 		});
 
 		if(GithubSelfUpdater.needSelfUpdating()){
-			E.register(this);
 			updateUpdateState(GithubSelfUpdater.getInstance().getState());
 		}
 		if(currentDonationCampaign!=null)
@@ -634,9 +633,6 @@ public void onError(ErrorResponse error){}
 	@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
@@ -45,8 +45,10 @@ public void onPageFinished(WebView view, String url){
 
 			@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