iphone x fixes

1 files changed, 50 insertions, 28 deletions

diff --git a/StoneIsland/platforms/android/android.json b/StoneIsland/platforms/android/android.json
index 1a860dfb..3e69085c 100755
--- a/StoneIsland/platforms/android/android.json
+++ b/StoneIsland/platforms/android/android.json
@@ -37,10 +37,6 @@
                             "count": 1
                         },
                         {
-                            "xml": "<feature name=\"SplashScreen\"><param name=\"android-package\" value=\"org.apache.cordova.splashscreen.SplashScreen\" /><param name=\"onload\" value=\"true\" /></feature>",
-                            "count": 1
-                        },
-                        {
                             "xml": "<feature name=\"Geolocation\"><param name=\"android-package\" value=\"org.apache.cordova.geolocation.Geolocation\" /></feature>",
                             "count": 1
                         },
@@ -53,6 +49,10 @@
                             "count": 1
                         },
                         {
+                            "xml": "<feature name=\"SplashScreen\"><param name=\"android-package\" value=\"org.apache.cordova.splashscreen.SplashScreen\" /><param name=\"onload\" value=\"true\" /></feature>",
+                            "count": 1
+                        },
+                        {
                             "xml": "<feature name=\"PushNotification\"><param name=\"android-package\" value=\"com.adobe.phonegap.push.PushPlugin\" /></feature>",
                             "count": 1
                         }
@@ -71,15 +71,19 @@
                             "count": 1
                         },
                         {
-                            "xml": "<receiver android:name=\"com.adobe.phonegap.push.PushDismissedHandler\" />",
+                            "xml": "<receiver android:exported=\"true\" android:name=\"com.google.android.gms.gcm.GcmReceiver\" android:permission=\"com.google.android.c2dm.permission.SEND\"><intent-filter><action android:name=\"com.google.android.c2dm.intent.RECEIVE\" /><category android:name=\"${applicationId}\" /></intent-filter></receiver>",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<service android:exported=\"false\" android:name=\"com.adobe.phonegap.push.GCMIntentService\"><intent-filter><action android:name=\"com.google.android.c2dm.intent.RECEIVE\" /></intent-filter></service>",
                             "count": 1
                         },
                         {
-                            "xml": "<service android:name=\"com.adobe.phonegap.push.FCMService\"><intent-filter><action android:name=\"com.google.firebase.MESSAGING_EVENT\" /></intent-filter></service>",
+                            "xml": "<service android:exported=\"false\" android:name=\"com.adobe.phonegap.push.PushInstanceIDListenerService\"><intent-filter><action android:name=\"com.google.android.gms.iid.InstanceID\" /></intent-filter></service>",
                             "count": 1
                         },
                         {
-                            "xml": "<service android:name=\"com.adobe.phonegap.push.PushInstanceIDListenerService\"><intent-filter><action android:name=\"com.google.firebase.INSTANCE_ID_EVENT\" /></intent-filter></service>",
+                            "xml": "<service android:exported=\"false\" android:name=\"com.adobe.phonegap.push.RegistrationIntentService\" />",
                             "count": 1
                         }
                     ],
@@ -99,6 +103,26 @@
                         {
                             "xml": "<uses-permission android:name=\"android.permission.VIBRATE\" />",
                             "count": 1
+                        },
+                        {
+                            "xml": "<uses-permission android:name=\"com.google.android.c2dm.permission.RECEIVE\" />",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<uses-permission android:name=\"${applicationId}.permission.C2D_MESSAGE\" />",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<uses-permission android:name=\"${applicationId}.permission.PushHandlerActivity\" />",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<permission android:name=\"${applicationId}.permission.C2D_MESSAGE\" android:protectionLevel=\"signature\" />",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<permission android:name=\"${applicationId}.permission.PushHandlerActivity\" android:protectionLevel=\"signature\" />",
+                            "count": 1
                         }
                     ],
                     "/*/application/activity": [],
@@ -143,7 +167,12 @@
             },
             "res/values/strings.xml": {
                 "parents": {
-                    "/resources": []
+                    "/resources": [
+                        {
+                            "xml": "<string name=\"google_app_id\">85075801930</string>",
+                            "count": 1
+                        }
+                    ]
                 }
             },
             "config.xml": {
@@ -175,9 +204,6 @@
         "cordova-plugin-whitelist": {
             "PACKAGE_NAME": "us.okfoc.stoneisland"
         },
-        "cordova-plugin-console": {
-            "PACKAGE_NAME": "us.okfoc.stoneisland"
-        },
         "cordova-plugin-device": {
             "PACKAGE_NAME": "us.okfoc.stoneisland"
         },
@@ -187,9 +213,6 @@
         "cordova-plugin-dialogs": {
             "PACKAGE_NAME": "us.okfoc.stoneisland"
         },
-        "cordova-plugin-splashscreen": {
-            "PACKAGE_NAME": "us.okfoc.stoneisland"
-        },
         "cordova-plugin-compat": {
             "PACKAGE_NAME": "us.okfoc.stoneisland"
         },
@@ -206,10 +229,11 @@
             "APP_NAME": "Stone Island",
             "PACKAGE_NAME": "us.okfoc.stoneisland"
         },
-        "phonegap-plugin-push": {
+        "cordova-plugin-splashscreen": {
             "PACKAGE_NAME": "us.okfoc.stoneisland"
         },
-        "cordova-plugin-wkwebview-engine": {
+        "phonegap-plugin-push": {
+            "SENDER_ID": "85075801930",
             "PACKAGE_NAME": "us.okfoc.stoneisland"
         }
     },
@@ -282,14 +306,6 @@
             ]
         },
         {
-            "file": "plugins/cordova-plugin-splashscreen/www/splashscreen.js",
-            "id": "cordova-plugin-splashscreen.SplashScreen",
-            "pluginId": "cordova-plugin-splashscreen",
-            "clobbers": [
-                "navigator.splashscreen"
-            ]
-        },
-        {
             "file": "plugins/cordova-plugin-geolocation/www/android/geolocation.js",
             "id": "cordova-plugin-geolocation.geolocation",
             "pluginId": "cordova-plugin-geolocation",
@@ -321,6 +337,14 @@
             ]
         },
         {
+            "id": "cordova-plugin-splashscreen.SplashScreen",
+            "file": "plugins/cordova-plugin-splashscreen/www/splashscreen.js",
+            "pluginId": "cordova-plugin-splashscreen",
+            "clobbers": [
+                "navigator.splashscreen"
+            ]
+        },
+        {
             "id": "phonegap-plugin-push.PushNotification",
             "file": "plugins/phonegap-plugin-push/www/push.js",
             "pluginId": "phonegap-plugin-push",
@@ -334,17 +358,15 @@
         "cordova-plugin-x-socialsharing": "5.1.3",
         "cordova-plugin-customurlscheme": "4.2.0",
         "cordova-plugin-whitelist": "1.3.0",
-        "cordova-plugin-console": "1.0.4",
         "cordova-plugin-device": "1.1.3",
         "cordova-plugin-network-information": "1.3.0",
         "cordova-plugin-dialogs": "1.3.0",
-        "cordova-plugin-splashscreen": "4.0.0",
         "cordova-plugin-compat": "1.1.0",
         "cordova-plugin-geolocation": "2.4.0",
         "ionic-plugin-keyboard": "2.2.1",
         "cordova-plugin-statusbar": "2.2.3",
         "cordova-plugin-app-name": "1.0.4",
-        "phonegap-plugin-push": "2.0.0",
-        "cordova-plugin-wkwebview-engine": "1.1.3"
+        "cordova-plugin-splashscreen": "4.0.3",
+        "phonegap-plugin-push": "1.9.2"
     }
 }
\ No newline at end of file