From 992a697072c71dc374f27add137ea73fb2444454 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 24 Feb 2020 09:08:23 -0500
Subject: remove sound/vibrate settings on push from app, better handled in
 system settings

---
 config.xml                             |  9 +++++----
 package.json                           | 13 +++++++------
 www/js/EventServer.js                  |  2 +-
 www/templates/eventserversettings.html |  6 +-----
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/config.xml b/config.xml
index dddaac4e..7065697e 100644
--- a/config.xml
+++ b/config.xml
@@ -163,10 +163,6 @@
     <plugin name="cordova-plugin-x-socialsharing" spec="^5.4.3">
         <variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.1+" />
     </plugin>
-    <plugin name="phonegap-plugin-push" spec="~2.2.3">
-        <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
-        <variable name="FCM_VERSION" value="11.6.2" />
-    </plugin>
     <plugin name="cordova-custom-config" spec="5.0.2" />
     <plugin name="cordova-plugin-advanced-http" spec="git+https://github.com/silkimen/cordova-plugin-advanced-http.git" />
     <plugin name="cordova-plugin-advanced-websocket" spec="1.1.5" />
@@ -175,6 +171,11 @@
         <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " />
     </plugin>
     <plugin name="cordova-plugin-inappbrowser" spec="3.2.0" />
+    <plugin name="cordova-support-google-services" spec="1.3.2" />
+    <plugin name="phonegap-plugin-push" spec="2.3.0">
+        <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
+        <variable name="FCM_VERSION" value="17.0.+" />
+    </plugin>
     <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
         <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
     </plugin>
diff --git a/package.json b/package.json
index 58456fcb..739c68dc 100644
--- a/package.json
+++ b/package.json
@@ -46,10 +46,6 @@
       "cordova-plugin-x-socialsharing": {
         "ANDROID_SUPPORT_V4_VERSION": "24.1.1+"
       },
-      "phonegap-plugin-push": {
-        "ANDROID_SUPPORT_V13_VERSION": "27.+",
-        "FCM_VERSION": "11.6.2"
-      },
       "cordova-custom-config": {},
       "cordova-plugin-advanced-websocket": {},
       "cordova-plugin-splashscreen": {},
@@ -58,6 +54,11 @@
         "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums"
       },
       "cordova-plugin-inappbrowser": {},
+      "cordova-support-google-services": {},
+      "phonegap-plugin-push": {
+        "ANDROID_SUPPORT_V13_VERSION": "27.+",
+        "FCM_VERSION": "17.0.+"
+      },
       "cordova-plugin-ionic-webview": {
         "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
       }
@@ -98,7 +99,7 @@
     "cordova-plugin-whitelist": "^1.3.4",
     "cordova-plugin-x-socialsharing": "^5.4.7",
     "cordova-sqlite-storage": "^1.5.3",
-    "cordova-support-google-services": "^1.1.0",
+    "cordova-support-google-services": "1.3.2",
     "deep-equal": "^1.0.1",
     "define-properties": "^1.1.3",
     "dialog": "^0.3.1",
@@ -119,7 +120,7 @@
     "object-is": "^1.0.2",
     "object-keys": "^1.1.1",
     "phonegap-plugin-multidex": "^1.0.0",
-    "phonegap-plugin-push": "^2.2.3",
+    "phonegap-plugin-push": "2.3.0",
     "regexp.prototype.flags": "^1.3.0"
   },
   "devDependencies": {
diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index 7dcb6937..ad5f673a 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -536,7 +536,7 @@ angular.module('zmApp.controllers')
             "ios": {
               "alert": "true",
               "badge": "true",
-              "sound": ld.soundOnPush,
+              "sound": "true",
               //"sound": "true",
               "clearBadge": "true",
               //"fcmSandbox": "true"
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html
index a56652e4..ea5080aa 100644
--- a/www/templates/eventserversettings.html
+++ b/www/templates/eventserversettings.html
@@ -26,11 +26,7 @@
       <br />
       <p>{{'kDisablePush' | translate }}</p>
     </ion-toggle>
-    <!-- vibrate app setting is not av. on iOS-->
-    <ion-toggle ng-if="loginData.isUseEventServer && $root.platformOS !='ios'" ng-model="loginData.vibrateOnPush"
-      toggle-class="toggle-calm">{{'kVibrateOnPush'| translate }}</ion-toggle>
-    <ion-toggle ng-if="loginData.isUseEventServer" ng-model="loginData.soundOnPush" toggle-class="toggle-calm" class="item-text-wrap">{{'kSoundOnPush'|
-      translate }}</ion-toggle>
+    
 
     <ion-list>
       <div ng-repeat="monitor in monitors">
-- 
cgit v1.2.3