Merge branch 'master' of ssh://gitea.spawntree.de:1122/spawntree/probuddy-master

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 )
@@ -77,13 +79,21 @@ app.util.OneSignal = (function(){
                 {
                     // fail silently
                 }
-                
-                OneSignal
-                    .startInit( appId )
-                    .handleNotificationOpened( cbNotificationOpened )
-                    .endInit();
 
-                OneSignal.getIds( cbGetIds );
+                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 );
+                }
+
+                //OneSignal.getIds( cbGetIds );
             }
         }
         ,
@@ -91,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 );
+            }
+
         }
     }