From 6b5d511ea027a898f9b953b8d0040474eb945e7e Mon Sep 17 00:00:00 2001
From: Fernando Valverde <fernando@visualcosita.com>
Date: Thu, 2 Dec 2021 13:56:28 -0600
Subject: [PATCH] Update Android PN integration fixes (#15541)

* Add missing android payload attributes

* Fix click_action in Android PN payload

* Native bridge fixes to interact with PN + Podcast + Video features
---
 app/assets/javascripts/initializePage.js | 4 ++--
 app/javascript/mobile/foremMobile.js     | 2 +-
 app/models/device.rb                     | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/initializePage.js b/app/assets/javascripts/initializePage.js
index 6f2930e7b..b155ef1e6 100644
--- a/app/assets/javascripts/initializePage.js
+++ b/app/assets/javascripts/initializePage.js
@@ -32,8 +32,6 @@ function callInitializers() {
   initializeCreditsPage();
   initializeProfileInfoToggle();
   initializeProfileBadgesToggle();
-  initializePodcastPlayback();
-  initializeVideoPlayback();
   initializeDrawerSliders();
   initializeHeroBannerClose();
   initializeOnboardingTaskCard();
@@ -58,6 +56,8 @@ function initializePage() {
       if (document.getElementById('sidebar-additional')) {
         document.getElementById('sidebar-additional').classList.add('showing');
       }
+      initializePodcastPlayback();
+      initializeVideoPlayback();
     }
   }, 1);
 
diff --git a/app/javascript/mobile/foremMobile.js b/app/javascript/mobile/foremMobile.js
index bc4b7461b..bf52e8380 100644
--- a/app/javascript/mobile/foremMobile.js
+++ b/app/javascript/mobile/foremMobile.js
@@ -66,7 +66,7 @@ export function foremMobileNamespace() {
       try {
         if (Runtime.isNativeIOS(namespace)) {
           window.webkit.messageHandlers[namespace].postMessage(message);
-        } else if (Runtime.isNativeAndroid(namespace)) {
+        } else if (Runtime.isNativeAndroid(`${namespace}Message`)) {
           AndroidBridge[`${namespace}Message`](JSON.stringify(message));
         }
       } catch (error) {
diff --git a/app/models/device.rb b/app/models/device.rb
index 9fdc16bde..7178d7e08 100644
--- a/app/models/device.rb
+++ b/app/models/device.rb
@@ -59,7 +59,12 @@ class Device < ApplicationRecord
     n.registration_ids = [token]
     n.priority = "high"
     n.content_available = true
-    n.notification = { title: title, body: body }
+    n.notification = {
+      title: title,
+      body: body,
+      sound: "default",
+      click_action: ".presentation.home.HomeActivity"
+    }
     n.data = { data: payload }
     n.save!
   end