iphone x fixes

1 files changed, 44 insertions, 19 deletions

diff --git a/StoneIsland/plugins/phonegap-plugin-push/plugin.xml b/StoneIsland/plugins/phonegap-plugin-push/plugin.xml
index 2c507e4d..bf9c659a 100755
--- a/StoneIsland/plugins/phonegap-plugin-push/plugin.xml
+++ b/StoneIsland/plugins/phonegap-plugin-push/plugin.xml
@@ -1,60 +1,75 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:amazon="http://schemas.android.com/apk/lib/com.amazon.device.ads" xmlns:rim="http://www.blackberry.com/ns/widgets" id="phonegap-plugin-push" version="2.0.0">
+<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:amazon="http://schemas.android.com/apk/lib/com.amazon.device.ads" xmlns:rim="http://www.blackberry.com/ns/widgets" id="phonegap-plugin-push" version="1.9.2">
   <name>PushPlugin</name>
   <description>
-    This plugin allows your application to receive push notifications on Android, iOS and Windows devices.
-    Android uses Firebase Cloud Messaging.
+		This plugin allows your application to receive push notifications on Android, iOS and Windows devices.
+    Android uses Google Cloud Messaging.
     iOS uses Apple APNS Notifications.
     Windows uses Microsoft WNS Notifications.
-  </description>
+	</description>
   <license>MIT</license>
   <js-module src="www/push.js" name="PushNotification">
     <clobbers target="PushNotification"/>
   </js-module>
   <engines>
-    <engine name="cordova" version=">=7.0.0"/>
-    <engine name="cordova-android" version=">=6.2.1"/>
-    <engine name="cordova-ios" version=">=4.4.0"/>
+    <engine name="cordova" version=">=6.4.0"/>
+    <engine name="cordova-android" version=">=6.0.0"/>
+    <engine name="cordova-ios" version=">=4.3.0"/>
   </engines>
+  <preference name="SENDER_ID" default="85075801930"/>
   <platform name="android">
     <config-file target="res/xml/config.xml" parent="/*">
       <feature name="PushNotification">
         <param name="android-package" value="com.adobe.phonegap.push.PushPlugin"/>
       </feature>
     </config-file>
+    <config-file target="res/values/strings.xml" parent="/resources">
+      <string name="google_app_id">$SENDER_ID</string>
+    </config-file>
     <config-file target="AndroidManifest.xml" parent="/manifest">
       <uses-permission android:name="android.permission.INTERNET"/>
       <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
       <uses-permission android:name="android.permission.WAKE_LOCK"/>
       <uses-permission android:name="android.permission.VIBRATE"/>
+      <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+      <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE"/>
+      <uses-permission android:name="${applicationId}.permission.PushHandlerActivity"/>
+      <permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature"/>
+      <permission android:name="${applicationId}.permission.PushHandlerActivity" android:protectionLevel="signature"/>
     </config-file>
     <config-file target="AndroidManifest.xml" parent="/manifest/application">
       <activity android:name="com.adobe.phonegap.push.PushHandlerActivity" android:exported="true" android:permission="${applicationId}.permission.PushHandlerActivity"/>
       <receiver android:name="com.adobe.phonegap.push.BackgroundActionButtonHandler"/>
-      <receiver android:name="com.adobe.phonegap.push.PushDismissedHandler"/>
-      <service android:name="com.adobe.phonegap.push.FCMService">
+      <receiver android:name="com.google.android.gms.gcm.GcmReceiver" android:exported="true" 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>
+      <service android:name="com.adobe.phonegap.push.GCMIntentService" android:exported="false">
         <intent-filter>
-          <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+          <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
         </intent-filter>
       </service>
-      <service android:name="com.adobe.phonegap.push.PushInstanceIDListenerService">
+      <service android:name="com.adobe.phonegap.push.PushInstanceIDListenerService" android:exported="false">
         <intent-filter>
-          <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+          <action android:name="com.google.android.gms.iid.InstanceID"/>
         </intent-filter>
       </service>
+      <service android:name="com.adobe.phonegap.push.RegistrationIntentService" android:exported="false"/>
     </config-file>
-    <framework src="com.android.support:support-v13:25.1.0"/>
-    <framework src="me.leolin:ShortcutBadger:1.1.17@aar"/>
-    <framework src="com.google.firebase:firebase-messaging:11.0.1"/>
     <framework src="push.gradle" custom="true" type="gradleReference"/>
-    <source-file src="src/android/com/adobe/phonegap/push/FCMService.java" target-dir="src/com/adobe/phonegap/push/"/>
+    <framework src="com.android.support:support-v13:23+"/>
+    <framework src="com.google.android.gms:play-services-gcm:9.8+"/>
+    <framework src="me.leolin:ShortcutBadger:1.1.11@aar"/>
+    <source-file src="src/android/com/adobe/phonegap/push/GCMIntentService.java" target-dir="src/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/PushConstants.java" target-dir="src/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/PushHandlerActivity.java" target-dir="src/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/PushInstanceIDListenerService.java" target-dir="src/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/PushPlugin.java" target-dir="src/com/adobe/phonegap/push/"/>
+    <source-file src="src/android/com/adobe/phonegap/push/RegistrationIntentService.java" target-dir="src/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/PermissionUtils.java" target-dir="src/com/adobe/phonegap/push/"/>
     <source-file src="src/android/com/adobe/phonegap/push/BackgroundActionButtonHandler.java" target-dir="src/com/adobe/phonegap/push/"/>
-    <source-file src="src/android/com/adobe/phonegap/push/PushDismissedHandler.java" target-dir="src/com/adobe/phonegap/push/"/>
   </platform>
   <platform name="browser">
     <js-module src="www/browser/push.js" name="BrowserPush">
@@ -74,6 +89,12 @@
         <string>remote-notification</string>
       </array>
     </config-file>
+    <config-file target="*-Info.plist" parent="GCM_SENDER_ID">
+      <string>$SENDER_ID</string>
+    </config-file>
+    <config-file target="*-Info.plist" parent="IS_GCM_ENABLED">
+      <true/>
+    </config-file>
     <config-file target="*-Debug.plist" parent="aps-environment">
       <string>development</string>
     </config-file>
@@ -84,12 +105,16 @@
     <source-file src="src/ios/PushPlugin.m"/>
     <header-file src="src/ios/AppDelegate+notification.h"/>
     <header-file src="src/ios/PushPlugin.h"/>
-    <framework src="FirebaseMessaging" type="podspec" spec="~> 2.0.0"/>
+    <framework src="AddressBook.framework"/>
+    <framework src="libsqlite3.tbd"/>
+    <framework src="libz.tbd"/>
+    <framework src="GoogleCloudMessaging" type="podspec" spec="~> 1.2.0"/>
+    <framework src="GGLInstanceID" type="podspec" spec="~> 1.2.1"/>
   </platform>
   <platform name="windows">
     <hook type="after_plugin_install" src="hooks/windows/setToastCapable.js"/>
     <js-module src="src/windows/PushPluginProxy.js" name="PushPlugin">
-      <runs/>
+      <merges target=""/>
     </js-module>
     <config-file target="config.xml" parent="/*">
       <preference name="WindowsToastCapable" value="true"/>