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

fix crash in onEmojiReactionsChanged

Browse Source
This commit is contained in:
sk
2023-09-01 01:16:52 +02:00
parent e26c641dc7
commit 203254c9f4
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
View File

@@ -247,8 +247,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
@Subscribe @Subscribe
public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){ public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
for(Notification n:data){ for(Notification n:data){
if (n.status == null) continue; if(n.status!=null && n.status.getContentStatus().id.equals(ev.id)){
if(n.status.getContentStatus().id.equals(ev.id)){
n.status.getContentStatus().update(ev); n.status.getContentStatus().update(ev);
AccountSessionManager.get(accountID).getCacheController().updateNotification(n); AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
for(int i=0;i<list.getChildCount();i++){ for(int i=0;i<list.getChildCount();i++){
@@ -262,8 +261,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
} }
} }
for(Notification n:preloadedData){ for(Notification n:preloadedData){
if (n.status == null) continue; if(n.status!=null && n.status.getContentStatus().id.equals(ev.id)){
if(n.status.getContentStatus().id.equals(ev.id)){
n.status.getContentStatus().update(ev); n.status.getContentStatus().update(ev);
AccountSessionManager.get(accountID).getCacheController().updateNotification(n); AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
} }
@@ -273,7 +271,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
@Subscribe @Subscribe
public void onEmojiReactionsChanged(EmojiReactionsUpdatedEvent ev){ public void onEmojiReactionsChanged(EmojiReactionsUpdatedEvent ev){
for(Notification n : data){ for(Notification n : data){
if(n.status.getContentStatus().id.equals(ev.id)){ if(n.status!=null && n.status.getContentStatus().id.equals(ev.id)){
n.status.getContentStatus().update(ev); n.status.getContentStatus().update(ev);
AccountSessionManager.get(accountID).getCacheController().updateNotification(n); AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
for(int i=0; i<list.getChildCount(); i++){ for(int i=0; i<list.getChildCount(); i++){
@@ -287,7 +285,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
} }
} }
for(Notification n : preloadedData){ for(Notification n : preloadedData){
if(n.status.getContentStatus().id.equals(ev.id)){ if(n.status!=null && n.status.getContentStatus().id.equals(ev.id)){
n.status.getContentStatus().update(ev); n.status.getContentStatus().update(ev);
AccountSessionManager.get(accountID).getCacheController().updateNotification(n); AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
} }