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

Handle case where notification.extras is not available #174

This commit is contained in:
cpfeiffer 2015-11-23 22:09:47 +01:00
parent 394a0905dc
commit 4616dcc965
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
View File

@ -156,6 +156,9 @@ public class GBApplication extends Application {
dbLock.unlock(); dbLock.unlock();
} }
public static boolean isRunningOnKitkatOrLater() {
return VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
}
public static boolean isRunningLollipopOrLater() { public static boolean isRunningLollipopOrLater() {
return VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; return VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
} }
@ -190,5 +193,4 @@ public class GBApplication extends Application {
blacklist.remove(packageName); blacklist.remove(packageName);
saveBlackList(); saveBlackList();
} }
} }

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

@ -1,6 +1,7 @@
package nodomain.freeyourgadget.gadgetbridge.externalevents; package nodomain.freeyourgadget.gadgetbridge.externalevents;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.Notification; import android.app.Notification;
import android.app.PendingIntent; import android.app.PendingIntent;
@ -11,6 +12,7 @@ import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.PowerManager; import android.os.PowerManager;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
@ -216,17 +218,26 @@ public class NotificationListener extends NotificationListenerService {
LOG.info("Processing notification from source " + source); LOG.info("Processing notification from source " + source);
if (GBApplication.isRunningOnKitkatOrLater()) {
dissectNotificationTo(notification, notificationSpec);
}
notificationSpec.id = (int) sbn.getPostTime(); //FIMXE: a truly unique id would be better
GBApplication.deviceService().onNotification(notificationSpec);
}
@TargetApi(Build.VERSION_CODES.KITKAT)
private void dissectNotificationTo(Notification notification, NotificationSpec notificationSpec) {
Bundle extras = notification.extras; Bundle extras = notification.extras;
notificationSpec.title = extras.getCharSequence(Notification.EXTRA_TITLE).toString(); CharSequence title = extras.getCharSequence(Notification.EXTRA_TITLE);
if (title != null) {
notificationSpec.title = title.toString();
}
if (extras.containsKey(Notification.EXTRA_TEXT)) { if (extras.containsKey(Notification.EXTRA_TEXT)) {
CharSequence contentCS = extras.getCharSequence(Notification.EXTRA_TEXT); CharSequence contentCS = extras.getCharSequence(Notification.EXTRA_TEXT);
if (contentCS != null) { if (contentCS != null) {
notificationSpec.body = contentCS.toString(); notificationSpec.body = contentCS.toString();
} }
} }
notificationSpec.id = (int) sbn.getPostTime(); //FIMXE: a truly unique id would be better
GBApplication.deviceService().onNotification(notificationSpec);
} }
private boolean isServiceRunning() { private boolean isServiceRunning() {