From 988729efd44a325ca513bf69abd90ebb128298ba Mon Sep 17 00:00:00 2001
From: Daniel <d.knudsen@spawntree.de>
Date: Thu, 15 Jun 2023 16:57:43 +0200
Subject: [PATCH 1/4] comment one signal version

---
 src/client/app/js/app/util/OneSignal.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/client/app/js/app/util/OneSignal.js b/src/client/app/js/app/util/OneSignal.js
index 8d33e13..9c7a000 100644
--- a/src/client/app/js/app/util/OneSignal.js
+++ b/src/client/app/js/app/util/OneSignal.js
@@ -77,7 +77,17 @@ app.util.OneSignal = (function(){
                 {
                     // fail silently
                 }
-                
+
+                // Woher wissen wir welche cordova version hier aktuell läuft?
+                // if (cordova version == 2) {
+                //     OneSignal
+                //     .startInit( appId )
+                //     .handleNotificationOpened( cbNotificationOpened )
+                //     .endInit();
+                // } else {
+                //     OneSignal.setAppId(appId);
+                // }
+
                 OneSignal
                     .startInit( appId )
                     .handleNotificationOpened( cbNotificationOpened )

From 3364b9ee78fa36e75767c04e2a1c8cac805afa0b Mon Sep 17 00:00:00 2001
From: Daniel <d.knudsen@spawntree.de>
Date: Fri, 16 Jun 2023 13:55:43 +0200
Subject: [PATCH 2/4] cordova check

---
 src/client/app/js/app/util/OneSignal.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/client/app/js/app/util/OneSignal.js b/src/client/app/js/app/util/OneSignal.js
index 9c7a000..32682ef 100644
--- a/src/client/app/js/app/util/OneSignal.js
+++ b/src/client/app/js/app/util/OneSignal.js
@@ -78,20 +78,16 @@ app.util.OneSignal = (function(){
                     // fail silently
                 }
 
-                // Woher wissen wir welche cordova version hier aktuell läuft?
-                // if (cordova version == 2) {
-                //     OneSignal
-                //     .startInit( appId )
-                //     .handleNotificationOpened( cbNotificationOpened )
-                //     .endInit();
-                // } else {
-                //     OneSignal.setAppId(appId);
-                // }
-
-                OneSignal
-                    .startInit( appId )
-                    .handleNotificationOpened( cbNotificationOpened )
-                    .endInit();
+                if (window.navigator.userAgent === "ProBuddy/2.0 (Android)") {
+                    // New cordova app (version 3)
+                    OneSignal.setAppId(appId);
+                } else {
+                    // Old cordova app (version 2)
+                    OneSignal
+                        .startInit( appId )
+                        .handleNotificationOpened( cbNotificationOpened )
+                        .endInit();
+                }
 
                 OneSignal.getIds( cbGetIds );
             }

From 97bfd6f7521a67f89afac0b886c47fcbc8712c28 Mon Sep 17 00:00:00 2001
From: Daniel <d.knudsen@spawntree.de>
Date: Fri, 16 Jun 2023 17:18:24 +0200
Subject: [PATCH 3/4] removed getids for new cordova version

---
 src/client/app/js/app/util/OneSignal.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client/app/js/app/util/OneSignal.js b/src/client/app/js/app/util/OneSignal.js
index 32682ef..26d7edd 100644
--- a/src/client/app/js/app/util/OneSignal.js
+++ b/src/client/app/js/app/util/OneSignal.js
@@ -87,9 +87,11 @@ app.util.OneSignal = (function(){
                         .startInit( appId )
                         .handleNotificationOpened( cbNotificationOpened )
                         .endInit();
+
+                    OneSignal.getIds( cbGetIds );
                 }
 
-                OneSignal.getIds( cbGetIds );
+                //OneSignal.getIds( cbGetIds );
             }
         }
         ,

From b6a031295f294a212c9e03577aa41fad3b0564b5 Mon Sep 17 00:00:00 2001
From: Daniel <d.knudsen@spawntree.de>
Date: Fri, 16 Jun 2023 17:34:38 +0200
Subject: [PATCH 4/4] removed subscription eventhandler for new cordova app
 version

---
 src/client/app/js/app/util/OneSignal.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/client/app/js/app/util/OneSignal.js b/src/client/app/js/app/util/OneSignal.js
index 26d7edd..9494bcf 100644
--- a/src/client/app/js/app/util/OneSignal.js
+++ b/src/client/app/js/app/util/OneSignal.js
@@ -48,7 +48,9 @@ app.util.OneSignal = (function(){
             },
             function()
             {
-                OneSignal.setSubscription( true );
+                if (window.navigator.userAgent !== "ProBuddy/2.0 (Android)") {
+                    OneSignal.setSubscription( true );
+                }
             }
             ,
             function( err )
@@ -99,7 +101,10 @@ app.util.OneSignal = (function(){
         {
             if ( !window.plugins || !window.plugins.OneSignal ) return;
 
-            OneSignal.setSubscription( false );
+            if (window.navigator.userAgent !== "ProBuddy/2.0 (Android)") {
+                OneSignal.setSubscription( false );
+            }
+
         }
     }