From 3e26bd2f52a7dc292d8a844b11f6c42f35e435b5 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Wed, 3 Jul 2024 01:17:47 +0300
Subject: [PATCH] Crash fixes

---
 mastodon/build.gradle                             |  4 ++--
 .../onboarding/InstanceCatalogSignupFragment.java |  2 +-
 .../android/model/viewmodel/CardViewModel.java    | 15 +++++++++------
 .../android/ui/viewholders/LinkCardHolder.java    |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index c9fd7e40..c50342df 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -13,8 +13,8 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 107
-		versionName "2.5.5"
+		versionCode 108
+		versionName "2.5.6"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
index 765941d4..8abd8c4a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
@@ -691,7 +691,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
 					boolean found=false;
 					for(int i=0;i<list.getChildCount();i++){
 						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
-						if(holder.getAbsoluteAdapterPosition()==mergeAdapter.getPositionForAdapter(adapter)+idx && holder instanceof InstanceViewHolder ivh){
+						if(holder instanceof InstanceViewHolder ivh && holder.getAbsoluteAdapterPosition()==mergeAdapter.getPositionForAdapter(adapter)+idx){
 							ivh.radioButton.setChecked(false);
 							found=true;
 							break;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/CardViewModel.java b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/CardViewModel.java
index c1db2c1e..902e1810 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/CardViewModel.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/CardViewModel.java
@@ -27,11 +27,7 @@ public class CardViewModel{
 		this.parentObject=parentObject;
 		this.imageRequest=TextUtils.isEmpty(card.image) ? null : new UrlImageLoaderRequest(card.image, V.dp(width), V.dp(height));
 
-		Account authorAccount;
-		if(card.authors!=null && !card.authors.isEmpty() && card.authors.get(0).account!=null)
-			authorAccount=card.authors.get(0).account;
-		else
-			authorAccount=card.authorAccount;
+		Account authorAccount=getAuthorAccount();
 
 		if(authorAccount!=null){
 			parsedAuthorName=new SpannableStringBuilder(authorAccount.displayName);
@@ -46,7 +42,7 @@ public class CardViewModel{
 	}
 
 	public int getImageCount(){
-		return 1+(card.authorAccount!=null ? (1+authorNameEmojiHelper.getImageCount()) : 0);
+		return 1+(getAuthorAccount()!=null ? (1+authorNameEmojiHelper.getImageCount()) : 0);
 	}
 
 	public ImageLoaderRequest getImageRequest(int index){
@@ -56,4 +52,11 @@ public class CardViewModel{
 			default -> authorNameEmojiHelper.getImageRequest(index-2);
 		};
 	}
+
+	public Account getAuthorAccount(){
+		if(card.authors!=null && !card.authors.isEmpty() && card.authors.get(0).account!=null)
+			return card.authors.get(0).account;
+		else
+			return card.authorAccount;
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/LinkCardHolder.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/LinkCardHolder.java
index 12b801c7..4192b5f2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/LinkCardHolder.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/LinkCardHolder.java
@@ -189,7 +189,7 @@ public class LinkCardHolder<T extends LinkCardHolder.LinkCardProvider> extends S
 	private void onAuthorChipClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		args.putParcelable("profileAccount", Parcels.wrap(item.getCard().card.authorAccount));
+		args.putParcelable("profileAccount", Parcels.wrap(item.getCard().getAuthorAccount()));
 		Nav.go(activity, ProfileFragment.class, args);
 	}