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

work around crash onHidden 

re: mastodon#512
This commit is contained in:
sk 2023-01-21 15:24:33 -03:00 committed by LucasGGamerM
parent 7939380172
commit 9df738831f
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
View File

@ -160,7 +160,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled); case FOLLOW -> builder.setSmallIcon(R.drawable.ic_fluent_person_add_24_filled);
case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled); case MENTION -> builder.setSmallIcon(R.drawable.ic_fluent_mention_24_filled);
case POLL -> builder.setSmallIcon(R.drawable.ic_fluent_poll_24_filled); case POLL -> builder.setSmallIcon(R.drawable.ic_fluent_poll_24_filled);
case STATUS -> R.drawable.ic_fluent_chat_24_filled; case STATUS -> builder.setSmallIcon(R.drawable.ic_fluent_chat_24_filled);
default -> builder.setSmallIcon(R.drawable.ic_ntf_logo); default -> builder.setSmallIcon(R.drawable.ic_ntf_logo);
} }

38
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
View File

@ -98,24 +98,26 @@ public class HomeTimelineFragment extends FabStatusListFragment {
@Override @Override
protected void onHidden(){ protected void onHidden(){
super.onHidden(); super.onHidden();
// if(!data.isEmpty()){ // workaround for mastodon#512. revert if fixed otherwise
// String topPostID=displayItems.get(list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset()).parentID; int position = list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset();
// if(!topPostID.equals(lastSavedMarkerID)){ if(!data.isEmpty() && position >= 0 && position < displayItems.size()){
// lastSavedMarkerID=topPostID; String topPostID=displayItems.get(position).parentID;
// new SaveMarkers(topPostID, null) if(!topPostID.equals(lastSavedMarkerID)){
// .setCallback(new Callback<>(){ lastSavedMarkerID=topPostID;
// @Override new SaveMarkers(topPostID, null)
// public void onSuccess(SaveMarkers.Response result){ .setCallback(new Callback<>(){
// } @Override
// public void onSuccess(SaveMarkers.Response result){
// @Override }
// public void onError(ErrorResponse error){
// lastSavedMarkerID=null; @Override
// } public void onError(ErrorResponse error){
// }) lastSavedMarkerID=null;
// .exec(accountID); }
// } })
// } .exec(accountID);
}
}
} }
public void onStatusCreated(StatusCreatedEvent ev){ public void onStatusCreated(StatusCreatedEvent ev){