owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crash fixes

Browse Source
This commit is contained in:
Grishka
2024-07-17 05:10:57 +03:00
parent c2e4781265
commit bae1c70718
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/build.gradle
View File

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

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

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

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

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

2
mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceCatalogSignupFragment.java
View File

@@ -691,7 +691,7 @@ public class InstanceCatalogSignupFragment extends InstanceCatalogFragment{
boolean found=false; boolean found=false;
for(int i=0;i<list.getChildCount();i++){ for(int i=0;i<list.getChildCount();i++){
RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(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); ivh.radioButton.setChecked(false);
found=true; found=true;
break; break;

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

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