Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crashes

This commit is contained in:
Grishka 2022-04-13 19:35:39 +03:00
parent 3d7f2c154a
commit 14656472a9
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
View File

@ -216,6 +216,7 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
view.setScaleX(1f); view.setScaleX(1f);
view.setScaleY(1f); view.setScaleY(1f);
transitioningHolder.itemView.setElevation(0f); transitioningHolder.itemView.setElevation(0f);
if(list!=null)
list.setClipChildren(true); list.setClipChildren(true);
transitioningHolder=null; transitioningHolder=null;
} }
@ -596,6 +597,8 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
@Override @Override
public ImageLoaderRequest getImageRequest(int position, int image){ public ImageLoaderRequest getImageRequest(int position, int image){
if(position>=displayItems.size()) // TODO fix this in the image loader, these crashes are driving me crazy
return null;
return displayItems.get(position).getImageRequest(image); return displayItems.get(position).getImageRequest(image);
} }

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

@ -107,6 +107,8 @@ public class DiscoverAccountsFragment extends BaseRecyclerFragment<DiscoverAccou
public void onSuccess(List<Relationship> result){ public void onSuccess(List<Relationship> result){
relationshipsRequest=null; relationshipsRequest=null;
relationships=result.stream().collect(Collectors.toMap(rel->rel.id, Function.identity())); relationships=result.stream().collect(Collectors.toMap(rel->rel.id, Function.identity()));
if(list==null)
return;
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 AccountViewHolder) if(holder instanceof AccountViewHolder)

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

@ -493,7 +493,7 @@ public class InstanceCatalogFragment extends BaseRecyclerFragment<CatalogInstanc
@Override @Override
public int getItemViewType(int position){ public int getItemViewType(int position){
return 1; return -1;
} }
} }