Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes null pointer exceptions

This commit is contained in:
tom79 2017-10-18 14:31:29 +02:00
parent d4842eda35
commit 8c7ec2b0f3
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
View File

@ -767,9 +767,10 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
notifications.removeAll(notificationsToRemove); notifications.removeAll(notificationsToRemove);
notificationsListAdapter.notifyDataSetChanged(); notificationsListAdapter.notifyDataSetChanged();
} }
if( targetedId != null ) {
if (statusAction == API.StatusAction.REBLOG) { if (statusAction == API.StatusAction.REBLOG) {
for (Notification notification : notifications) { for (Notification notification : notifications) {
if (notification.getStatus().getId().equals(targetedId)) { if (notification.getStatus() != null && notification.getStatus().getId().equals(targetedId)) {
notification.getStatus().setReblogs_count(notification.getStatus().getReblogs_count() + 1); notification.getStatus().setReblogs_count(notification.getStatus().getReblogs_count() + 1);
break; break;
} }
@ -777,7 +778,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
notificationsListAdapter.notifyDataSetChanged(); notificationsListAdapter.notifyDataSetChanged();
} else if (statusAction == API.StatusAction.UNREBLOG) { } else if (statusAction == API.StatusAction.UNREBLOG) {
for (Notification notification : notifications) { for (Notification notification : notifications) {
if (notification.getStatus().getId().equals(targetedId)) { if (notification.getStatus() != null && notification.getStatus().getId().equals(targetedId)) {
if (notification.getStatus().getReblogs_count() - 1 >= 0) if (notification.getStatus().getReblogs_count() - 1 >= 0)
notification.getStatus().setReblogs_count(notification.getStatus().getReblogs_count() - 1); notification.getStatus().setReblogs_count(notification.getStatus().getReblogs_count() - 1);
break; break;
@ -786,7 +787,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
notificationsListAdapter.notifyDataSetChanged(); notificationsListAdapter.notifyDataSetChanged();
} else if (statusAction == API.StatusAction.FAVOURITE) { } else if (statusAction == API.StatusAction.FAVOURITE) {
for (Notification notification : notifications) { for (Notification notification : notifications) {
if (notification.getStatus().getId().equals(targetedId)) { if (notification.getStatus() != null && notification.getStatus().getId().equals(targetedId)) {
notification.getStatus().setFavourites_count(notification.getStatus().getFavourites_count() + 1); notification.getStatus().setFavourites_count(notification.getStatus().getFavourites_count() + 1);
break; break;
} }
@ -794,7 +795,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
notificationsListAdapter.notifyDataSetChanged(); notificationsListAdapter.notifyDataSetChanged();
} else if (statusAction == API.StatusAction.UNFAVOURITE) { } else if (statusAction == API.StatusAction.UNFAVOURITE) {
for (Notification notification : notifications) { for (Notification notification : notifications) {
if (notification.getStatus().getId().equals(targetedId)) { if (notification.getStatus() != null && notification.getStatus().getId().equals(targetedId)) {
if (notification.getStatus().getFavourites_count() - 1 >= 0) if (notification.getStatus().getFavourites_count() - 1 >= 0)
notification.getStatus().setFavourites_count(notification.getStatus().getFavourites_count() - 1); notification.getStatus().setFavourites_count(notification.getStatus().getFavourites_count() - 1);
break; break;
@ -803,6 +804,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
notificationsListAdapter.notifyDataSetChanged(); notificationsListAdapter.notifyDataSetChanged();
} }
} }
}
@Override @Override
public void onPostNotificationsAction(APIResponse apiResponse, Notification notification) { public void onPostNotificationsAction(APIResponse apiResponse, Notification notification) {