nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'notification-refactor' of https://github.com/Freeyourgadget/Gadgetbridge into notification-refactor

This commit is contained in:
Andreas Shimokawa 2017-04-30 00:35:45 +02:00
parent 15102d525b bc28990a96
commit bdeb215fe0
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
View File

@ -31,6 +31,7 @@ import android.content.pm.PackageManager;
import android.media.MediaMetadata; import android.media.MediaMetadata;
import android.media.session.PlaybackState; import android.media.session.PlaybackState;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.service.notification.NotificationListenerService; import android.service.notification.NotificationListenerService;
@ -260,10 +261,32 @@ public class NotificationListener extends NotificationListenerService {
} }
CharSequence contentCS = null; CharSequence contentCS = null;
if (preferBigText && extras.containsKey(Notification.EXTRA_BIG_TEXT)) { if (extras.containsKey(Notification.EXTRA_MESSAGES)) {
contentCS = extras.getCharSequence(NotificationCompat.EXTRA_BIG_TEXT); Parcelable[] parcelables = extras.getParcelableArray(NotificationCompat.EXTRA_MESSAGES);
} else if (extras.containsKey(Notification.EXTRA_TEXT)) { String contentBuilder = "";
contentCS = extras.getCharSequence(NotificationCompat.EXTRA_TEXT); CharSequence sender;
CharSequence prevSender = "";
CharSequence message;
for (Parcelable p : parcelables) {
if (!(p instanceof Bundle))
continue;
sender = ((Bundle) p).getCharSequence("sender");
message = ((Bundle) p).getCharSequence("text");
if (sender == null || message == null)
continue;
if (!sender.equals(prevSender) && !sender.equals(notificationSpec.title)) {
contentBuilder += sender.toString() + ": ";
prevSender = sender;
}
contentBuilder += message.toString() + "\n";
}
contentCS = contentBuilder;
} else {
if (preferBigText && extras.containsKey(Notification.EXTRA_BIG_TEXT)) {
contentCS = extras.getCharSequence(NotificationCompat.EXTRA_BIG_TEXT);
} else if (extras.containsKey(Notification.EXTRA_TEXT)) {
contentCS = extras.getCharSequence(NotificationCompat.EXTRA_TEXT);
}
} }
if (contentCS != null) { if (contentCS != null) {
notificationSpec.body = contentCS.toString(); notificationSpec.body = contentCS.toString();