Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass potentially nullable argument instead of guarding.

Browse Source 
It seems that `setContentIntent()` will do fine if we pass it a null
argument. The default value is `null` anyway, and it doesn't mandate
a non-null argument.
This commit is contained in:
Peter Serwylo 2017-02-24 15:21:49 +11:00 committed by mvp76
parent d2ef357403
commit aa945367c9
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
View File

@ -333,13 +333,9 @@ class NotificationHelper {
.setLargeIcon(iconLarge) .setLargeIcon(iconLarge)
.setLocalOnly(true) .setLocalOnly(true)
.setVisibility(NotificationCompat.VISIBILITY_SECRET) .setVisibility(NotificationCompat.VISIBILITY_SECRET)
.setGroup(GROUP_UPDATES); .setGroup(GROUP_UPDATES)
.setContentIntent(entry.intent);
// Handle intents
//
if (entry.intent != null) {
builder.setContentIntent(entry.intent);
}
// Handle actions // Handle actions
// //
@ -434,11 +430,8 @@ class NotificationHelper {
.setContentText(context.getString(R.string.notification_content_single_installed)) .setContentText(context.getString(R.string.notification_content_single_installed))
.setLocalOnly(true) .setLocalOnly(true)
.setVisibility(NotificationCompat.VISIBILITY_SECRET) .setVisibility(NotificationCompat.VISIBILITY_SECRET)
.setGroup(GROUP_INSTALLED); .setGroup(GROUP_INSTALLED)
.setContentIntent(entry.intent);
if (entry.intent != null) {
builder.setContentIntent(entry.intent);
}
Intent intentDeleted = new Intent(BROADCAST_NOTIFICATIONS_INSTALLED_CLEARED); Intent intentDeleted = new Intent(BROADCAST_NOTIFICATIONS_INSTALLED_CLEARED);
intentDeleted.putExtra(EXTRA_NOTIFICATION_KEY, entry.getUniqueKey()); intentDeleted.putExtra(EXTRA_NOTIFICATION_KEY, entry.getUniqueKey());