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

Merge pull request #126 from roidelapluie/qksms 

Allow QKSMS notifications to be handled as a generic notification if …
This commit is contained in:
Andreas Shimokawa 2015-09-14 09:12:19 +02:00
parent 95e22a4e32 21d59b23c1
commit aa524cc5ea
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,6 @@ public class NotificationListener extends NotificationListenerService {
source.equals("com.android.systemui") || source.equals("com.android.systemui") ||
source.equals("com.android.dialer") || source.equals("com.android.dialer") ||
source.equals("com.android.mms") || source.equals("com.android.mms") ||
source.equals("com.moez.QKSMS") ||
source.equals("com.cyanogenmod.eleven")) { source.equals("com.cyanogenmod.eleven")) {
return; return;
} }
@ -149,6 +148,12 @@ public class NotificationListener extends NotificationListenerService {
} }
} }
if (source.equals("com.moez.QKSMS")) {
if (!"never".equals(sharedPrefs.getString("notification_mode_sms", "when_screen_off"))) {
return;
}
}
HashSet<String> blacklist = (HashSet<String>) sharedPrefs.getStringSet("package_blacklist", null); HashSet<String> blacklist = (HashSet<String>) sharedPrefs.getStringSet("package_blacklist", null);
if (blacklist != null && blacklist.contains(source)) { if (blacklist != null && blacklist.contains(source)) {
return; return;
@ -167,6 +172,9 @@ public class NotificationListener extends NotificationListenerService {
case "com.android.email": case "com.android.email":
notificationKind = NotificationKind.EMAIL; notificationKind = NotificationKind.EMAIL;
break; break;
case "com.moez.QKSMS":
notificationKind = NotificationKind.SMS;
break;
case "eu.siacs.conversations": case "eu.siacs.conversations":
notificationKind = NotificationKind.CHAT; notificationKind = NotificationKind.CHAT;
break; break;

1
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationKind.java
View File

@ -7,5 +7,6 @@ public enum NotificationKind {
CHAT, CHAT,
EMAIL, EMAIL,
FACEBOOK, FACEBOOK,
SMS,
TWITTER, TWITTER,
} }

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
View File

@ -635,6 +635,10 @@ public class PebbleProtocol extends GBDeviceProtocol {
icon_id = PebbleIconID.GENERIC_EMAIL; icon_id = PebbleIconID.GENERIC_EMAIL;
color_id = PebbleColor.JaegerGreen; color_id = PebbleColor.JaegerGreen;
break; break;
case SMS:
icon_id = PebbleIconID.GENERIC_SMS;
color_id = PebbleColor.VividViolet;
break;
case FACEBOOK: case FACEBOOK:
icon_id = PebbleIconID.NOTIFICATION_FACEBOOK; icon_id = PebbleIconID.NOTIFICATION_FACEBOOK;
color_id = PebbleColor.VeryLightBlue; color_id = PebbleColor.VeryLightBlue;