From 33efb963a595b56f15b68f7a31e6ff0126e2e1cf Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Wed, 9 Oct 2019 19:12:11 +0100
Subject: [PATCH] add default notification channel for FCM

---
 .../bootstraps/lbry/build/templates/AndroidManifest.tmpl.xml   | 3 +++
 .../bootstraps/lbry/build/templates/strings.tmpl.xml           | 3 ++-
 src/main/java/io/lbry/browser/LbrynetMessagingService.java     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/AndroidManifest.tmpl.xml b/p4a/pythonforandroid/bootstraps/lbry/build/templates/AndroidManifest.tmpl.xml
index c9038967..0d244d06 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/AndroidManifest.tmpl.xml
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/AndroidManifest.tmpl.xml
@@ -64,6 +64,9 @@
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_color"
             android:resource="@color/lbryGreen" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="@string/default_notification_channel_id"/>
 
         {% for m in args.meta_data %}
         <meta-data android:name="{{ m.split('=', 1)[0] }}" android:value="{{ m.split('=', 1)[-1] }}"/>{% endfor %}
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/strings.tmpl.xml b/p4a/pythonforandroid/bootstraps/lbry/build/templates/strings.tmpl.xml
index 8e1abff8..d3df3120 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/strings.tmpl.xml
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/strings.tmpl.xml
@@ -4,7 +4,8 @@
     <string name="private_version">{{ private_version }}</string>
     <string name="presplash_color">{{ args.presplash_color }}</string>
     <string name="urlScheme">{{ url_scheme }}</string>
-    
+    <string name="default_notification_channel_id">io.lbry.browser.LBRY_ENGAGEMENT_CHANNEL</string>
+
     <string name="running">Running</string>
     <string name="service_status">Service Status</string>
     <string name="stopped">Stopped</string>
diff --git a/src/main/java/io/lbry/browser/LbrynetMessagingService.java b/src/main/java/io/lbry/browser/LbrynetMessagingService.java
index 0ad963dd..958d0e15 100644
--- a/src/main/java/io/lbry/browser/LbrynetMessagingService.java
+++ b/src/main/java/io/lbry/browser/LbrynetMessagingService.java
@@ -19,7 +19,7 @@ public class LbrynetMessagingService extends FirebaseMessagingService {
 
     private static final String TAG = "LbrynetMessagingService";
 
-    private static final String NOTIFICATION_CHANNEL_ID = "io.lbry.browser.LBRY_NOTIFICATION_CHANNEL";
+    private static final String NOTIFICATION_CHANNEL_ID = "io.lbry.browser.LBRY_ENGAGEMENT_CHANNEL";
 
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {