From dcb5e360418cb4d1f81320f6ea17f232253666f0 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 13 Dec 2022 12:02:21 -0300
Subject: [PATCH] Revert "Revert "Fix #443""

This reverts commit e0c072ab9ceb77447c49dd8bbde420ea0d10f463.
---
 .../onboarding/InstanceChooserLoginFragment.java         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java
index 2d1318f20..d29d86a00 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceChooserLoginFragment.java
@@ -240,9 +240,12 @@ public class InstanceChooserLoginFragment extends InstanceCatalogFragment{
 			if(chosenInstance!=null){
 				int idx=filteredData.indexOf(chosenInstance);
 				if(idx!=-1){
-					RecyclerView.ViewHolder holder=list.findViewHolderForAdapterPosition(mergeAdapter.getPositionForAdapter(adapter)+idx);
-					if(holder instanceof InstanceViewHolder ivh){
-						ivh.radioButton.setChecked(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){
+							ivh.radioButton.setChecked(false);
+							break;
+						}
 					}
 				}
 			}