From 1ee55a643e3cd4f16def27def708aba1297ebdd1 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Wed, 20 Apr 2022 22:38:20 +0300
Subject: [PATCH] Crash fixes

---
 .../joinmastodon/android/fragments/ProfileFragment.java   | 6 ++++--
 .../fragments/onboarding/InstanceCatalogFragment.java     | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index b3619730..0daf53b7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -547,8 +547,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				.setCallback(new Callback<>(){
 					@Override
 					public void onSuccess(List<Relationship> result){
-						relationship=result.get(0);
-						updateRelationship();
+						if(!result.isEmpty()){
+							relationship=result.get(0);
+							updateRelationship();
+						}
 					}
 
 					@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
index 3728d6a2..b143fdf2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java
@@ -401,9 +401,11 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
 		instanceProgressDialog=new ProgressDialog(getActivity());
 		instanceProgressDialog.setMessage(getString(R.string.loading_instance));
 		instanceProgressDialog.setOnCancelListener(dialog->{
-			loadingInstanceRequest.cancel();
-			loadingInstanceRequest=null;
-			loadingInstanceDomain=null;
+			if(loadingInstanceRequest!=null){
+				loadingInstanceRequest.cancel();
+				loadingInstanceRequest=null;
+				loadingInstanceDomain=null;
+			}
 		});
 		instanceProgressDialog.show();
 	}