From c69bf1b0afd350f31b61c2ff319d162285fa1a60 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 15 Aug 2015 22:38:10 +0200
Subject: [PATCH] Pebble: always use 2.x notification on FW 2.x except for K9

FW 2.x notifications enables the "dismiss all" action, but for K9 we would loose
the mail icon. So K9 still needs the force option.
---
 .../gadgetbridge/service/devices/pebble/PebbleProtocol.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
index 225243b3..e2e6c241 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
@@ -268,7 +268,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
             // 3.x notification
             String[] parts = {title, subtitle, body};
             return encodeBlobdbNotification((int) (ts & 0xffffffff), parts);
-        } else if (mForceProtocol) {
+        } else if (mForceProtocol || type != NOTIFICATION_EMAIL) {
             // 2.x notification
             return encodeExtensibleNotification(id, (int) (ts & 0xffffffff), title, subtitle, body, type);
         } else {