Crash fixes

mastodon/build.gradle

@@ -13,8 +13,8 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 34
-		versionCode 111
-		versionName "2.6.0"
+		versionCode 112
+		versionName "2.6.1"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java

@@ -143,7 +143,7 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment<DiscoverNewsFragm
 
 		@Override
 		public int getItemViewType(int position){
-			return position==0 ? 1 : 2;
+			return position==0 ? -1 : -2;
 		}
 	}
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogFragment.java

@@ -47,14 +47,12 @@ import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
-import me.grishka.appkit.utils.MergeRecyclerAdapter;
 import okhttp3.Call;
 import okhttp3.Request;
 import okhttp3.Response;
 
 abstract class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstance>{
 	protected RecyclerView.Adapter adapter;
-	protected MergeRecyclerAdapter mergeAdapter;
 	protected CatalogInstance chosenInstance;
 	protected Button nextButton;
 	protected EditText searchEdit;

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 instanceof InstanceViewHolder ivh && holder.getAbsoluteAdapterPosition()==mergeAdapter.getPositionForAdapter(adapter)+idx){
+						if(holder instanceof InstanceViewHolder ivh && holder.getAbsoluteAdapterPosition()==idx){
 							ivh.radioButton.setChecked(false);
 							found=true;
 							break;

mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java

@@ -40,6 +40,7 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 	private View headerView;
 	private boolean loadedAutocomplete;
 	private ImageButton clearBtn;
+	private MergeRecyclerAdapter mergeAdapter;
 
 	public InstanceChooserLoginFragment(){
 		super(R.layout.fragment_login, 10);