From e1927733ba7ff28e955a9c98d706559ee87732a7 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 10 Sep 2016 23:52:25 +0200
Subject: [PATCH] remove special handling for conversations (latest release
 removed pebble messages)

---
 .../gadgetbridge/externalevents/NotificationListener.java   | 6 ------
 app/src/main/res/values/strings.xml                         | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index cf74be6a..0c07eee6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -209,12 +209,6 @@ public class NotificationListener extends NotificationListenerService {
             return;
         }
 
-        if (source.equals("eu.siacs.conversations")) {
-            if (!"never".equals(prefs.getString("notification_mode_pebblemsg", "when_screen_off"))) {
-                return;
-            }
-        }
-
         if (source.equals("com.fsck.k9")) {
             if (!"never".equals(prefs.getString("notification_mode_k9mail", "when_screen_off"))) {
                 return;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f1dd3f1..84ea525b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,7 +63,7 @@
     <string name="pref_title_notifications_sms">SMS</string>
     <string name="pref_title_notifications_k9mail">K9-Mail</string>
     <string name="pref_title_notifications_pebblemsg">Pebble Messages</string>
-    <string name="pref_summary_notifications_pebblemsg">Support for applications which send Notifications to the Pebble via Intent. Can be used for Conversations.</string>
+    <string name="pref_summary_notifications_pebblemsg">Support for applications which send Notifications to the Pebble via PebbleKit.</string>
     <string name="pref_title_notifications_generic">Generic notification support</string>
     <string name="pref_title_whenscreenon">… also when screen is on</string>
     <string name="pref_title_notification_filter">Do Not Disturb</string>