From e70d6a1260270da695f500e23e323ec4b177be01 Mon Sep 17 00:00:00 2001
From: Daniele Gobbetti <daniele+github@gobbetti.name>
Date: Tue, 3 Jan 2017 12:46:22 +0100
Subject: [PATCH 1/2] First take at issue template

---
 .github/ISSUE_TEMPLATE.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..511775585
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,8 @@
+####Your issue is:
+*In case of a bug, do not forget to attach logs!*
+
+####Your wearable device is:
+
+*Please specify model and firmware version if possible*
+
+####Your android version is:

From fd51f32765c40e0f125a4bbc5d2575ecbb1a66ec Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Tue, 3 Jan 2017 20:36:39 +0100
Subject: [PATCH 2/2] Add Riot as a recognized chat application (including
 pebble color and icon)

---
 .../freeyourgadget/gadgetbridge/model/AppNotificationType.java | 3 +++
 .../freeyourgadget/gadgetbridge/model/NotificationType.java    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
index 001bb6cfd..bfbe48dd1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/AppNotificationType.java
@@ -29,6 +29,9 @@ public class AppNotificationType extends HashMap<String, NotificationType> {
 		// Conversations
 		put("eu.siacs.conversations", NotificationType.CONVERSATIONS);
 
+		// Riot
+		put("im.vector.alpha", NotificationType.RIOT);
+
 		// Signal
 		put("org.thoughtcrime.securesms", NotificationType.SIGNAL);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java
index e3e32070f..daae8f4ce 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/NotificationType.java
@@ -13,6 +13,7 @@ public enum NotificationType {
     GENERIC_SMS(PebbleIconID.GENERIC_SMS, PebbleColor.VividViolet),
     FACEBOOK(PebbleIconID.NOTIFICATION_FACEBOOK, PebbleColor.Liberty),
     FACEBOOK_MESSENGER(PebbleIconID.NOTIFICATION_FACEBOOK_MESSENGER, PebbleColor.VeryLightBlue),
+    RIOT(PebbleIconID.NOTIFICATION_HIPCHAT, PebbleColor.LavenderIndigo),
     SIGNAL(PebbleIconID.NOTIFICATION_HIPCHAT, PebbleColor.BlueMoon),
     TWITTER(PebbleIconID.NOTIFICATION_TWITTER, PebbleColor.BlueMoon),
     TELEGRAM(PebbleIconID.NOTIFICATION_TELEGRAM, PebbleColor.PictonBlue),
@@ -46,6 +47,7 @@ public enum NotificationType {
                 return "generic_social";
             case CONVERSATIONS:
             case FACEBOOK_MESSENGER:
+            case RIOT:
             case SIGNAL:
             case TELEGRAM:
             case WHATSAPP: