From b65be9e5df08f26ac5e0892d08cbb988687b29d7 Mon Sep 17 00:00:00 2001
From: Daniel <d.knudsen@spawntree.de>
Date: Mon, 26 Jun 2023 12:58:23 +0200
Subject: [PATCH] notification opened handler for new corodova version

---
 src/client/app/index.php                |  2 +-
 src/client/app/js/app/util/OneSignal.js | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/client/app/index.php b/src/client/app/index.php
index ec48c40..d57d9c6 100644
--- a/src/client/app/index.php
+++ b/src/client/app/index.php
@@ -191,7 +191,7 @@ foreach( $incs as $jspath )
 
 <?php if ( isset( $_GET[ 'fromCordova' ] ) ):   ?>
 
-    <script type="text/javascript" src="cordova.js"></script>
+<!--    <script type="text/javascript" src="cordova.js"></script>-->
     <script type="text/javascript">
         function onDeviceReady()
         {
diff --git a/src/client/app/js/app/util/OneSignal.js b/src/client/app/js/app/util/OneSignal.js
index 9494bcf..cea0794 100644
--- a/src/client/app/js/app/util/OneSignal.js
+++ b/src/client/app/js/app/util/OneSignal.js
@@ -17,6 +17,7 @@ app.util.OneSignal = (function(){
      */
     cbNotificationOpened = function( jsonData )
     {
+        console.log('notificationOpenedCallback: ' + JSON.stringify(jsonData));
         if ( jsonData &&
             jsonData.notification &&
             jsonData.notification.payload &&
@@ -82,7 +83,26 @@ app.util.OneSignal = (function(){
 
                 if (window.navigator.userAgent === "ProBuddy/2.0 (Android)") {
                     // New cordova app (version 3)
+                    //OneSignal.setAppId(appId);
+
+                    // Uncomment to set OneSignal device logging to VERBOSE
+                    OneSignal.setLogLevel(6, 0);
+
+                    // NOTE: Update the setAppId value below with your OneSignal AppId.
                     OneSignal.setAppId(appId);
+                    // OneSignal.setNotificationOpenedHandler(function(jsonData) {
+                    //     console.log('notificationOpenedCallback: ' + JSON.stringify(jsonData));
+                    // });
+
+                    OneSignal.setNotificationOpenedHandler(cbNotificationOpened);
+
+                    //Prompts the user for notification permissions.
+                    //    * Since this shows a generic native prompt, we recommend instead using an In-App Message to prompt for notification permission (See step 6) to better communicate to your users what notifications they will get.
+                    OneSignal.promptForPushNotificationsWithUserResponse(function(accepted) {
+                        console.log("User accepted notifications: " + accepted);
+                    });
+
+
                 } else {
                     // Old cordova app (version 2)
                     OneSignal