narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

catch dead system exception when creating error notification

Browse source
This commit is contained in:
Daniel Gultsch 2019-10-23 22:33:51 +02:00
parent 9c24ebd57b
commit 2f59d66fd1
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -563,14 +563,16 @@ public class NotificationService {
if (addedActionsCount < 3) { if (addedActionsCount < 3) {
final Message firstLocationMessage = getFirstLocationMessage(messages); final Message firstLocationMessage = getFirstLocationMessage(messages);
if (firstLocationMessage != null) { if (firstLocationMessage != null) {
String label = mXmppConnectionService.getResources().getString(R.string.show_location); final PendingIntent pendingShowLocationIntent = createShowLocationIntent(firstLocationMessage);
PendingIntent pendingShowLocationIntent = createShowLocationIntent(firstLocationMessage); if (pendingShowLocationIntent != null) {
NotificationCompat.Action locationAction = new NotificationCompat.Action.Builder( final String label = mXmppConnectionService.getResources().getString(R.string.show_location);
R.drawable.ic_room_white_24dp, NotificationCompat.Action locationAction = new NotificationCompat.Action.Builder(
label, R.drawable.ic_room_white_24dp,
pendingShowLocationIntent).build(); label,
mBuilder.addAction(locationAction); pendingShowLocationIntent).build();
++addedActionsCount; mBuilder.addAction(locationAction);
++addedActionsCount;
}
} }
} }
if (addedActionsCount < 3) { if (addedActionsCount < 3) {
@ -766,7 +768,7 @@ public class NotificationService {
return PendingIntent.getActivity(mXmppConnectionService, generateRequestCode(message.getConversation(), 18), intent, PendingIntent.FLAG_UPDATE_CURRENT); return PendingIntent.getActivity(mXmppConnectionService, generateRequestCode(message.getConversation(), 18), intent, PendingIntent.FLAG_UPDATE_CURRENT);
} }
} }
return createOpenConversationsIntent(); return null;
} }
private PendingIntent createContentIntent(final String conversationUuid, final String downloadMessageUuid) { private PendingIntent createContentIntent(final String conversationUuid, final String downloadMessageUuid) {
@ -906,7 +908,10 @@ public class NotificationService {
} }
} }
mBuilder.setContentText(mXmppConnectionService.getString(R.string.connected_accounts, connected, enabled)); mBuilder.setContentText(mXmppConnectionService.getString(R.string.connected_accounts, connected, enabled));
mBuilder.setContentIntent(createOpenConversationsIntent()); final PendingIntent openIntent = createOpenConversationsIntent();
if (openIntent != null) {
mBuilder.setContentIntent(openIntent);
}
mBuilder.setWhen(0); mBuilder.setWhen(0);
mBuilder.setPriority(Notification.PRIORITY_MIN); mBuilder.setPriority(Notification.PRIORITY_MIN);
mBuilder.setSmallIcon(connected > 0 ? R.drawable.ic_link_white_24dp : R.drawable.ic_link_off_white_24dp); mBuilder.setSmallIcon(connected > 0 ? R.drawable.ic_link_white_24dp : R.drawable.ic_link_off_white_24dp);
@ -920,7 +925,11 @@ public class NotificationService {
} }
private PendingIntent createOpenConversationsIntent() { private PendingIntent createOpenConversationsIntent() {
return PendingIntent.getActivity(mXmppConnectionService, 0, new Intent(mXmppConnectionService, ConversationsActivity.class), 0); try {
return PendingIntent.getActivity(mXmppConnectionService, 0, new Intent(mXmppConnectionService, ConversationsActivity.class), 0);
} catch (RuntimeException e) {
return null;
}
} }
void updateErrorNotification() { void updateErrorNotification() {