empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

only set non-null bitmaps for notifications

Browse source 
Fixes #2960
Closes #2979

// FREEBIE
This commit is contained in:
Jake McGinty 2015-04-13 13:36:30 -07:00 • committed by Moxie Marlinspike
parent 7aaedf500f
commit 4a9028aedd
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
View file

@ -24,6 +24,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.media.AudioManager;
@ -175,12 +176,13 @@ public class MessageNotifier {
return;
}
List<NotificationItem>notifications = notificationState.getNotifications();
NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
Recipient recipient = notifications.get(0).getIndividualRecipient();
List<NotificationItem> notifications = notificationState.getNotifications();
NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
Recipient recipient = notifications.get(0).getIndividualRecipient();
Bitmap recipientPhoto = recipient.getContactPhoto();
builder.setSmallIcon(R.drawable.icon_notification);
builder.setLargeIcon(recipient.getContactPhoto());
if (recipientPhoto != null) builder.setLargeIcon(recipientPhoto);
builder.setContentTitle(recipient.toShortString());
builder.setContentText(notifications.get(0).getText());
builder.setContentIntent(notifications.get(0).getPendingIntent(context));