diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist
new file mode 100644
index 000000000..b80564cf9
--- /dev/null
+++ b/GoogleService-Info.plist
@@ -0,0 +1,40 @@
+
+
+
+
+ AD_UNIT_ID_FOR_BANNER_TEST
+ ca-app-pub-3940256099942544/2934735716
+ AD_UNIT_ID_FOR_INTERSTITIAL_TEST
+ ca-app-pub-3940256099942544/4411468910
+ CLIENT_ID
+ 694767596569-c2cjrca92k99f6nkp3363lsb7ljhdgdr.apps.googleusercontent.com
+ REVERSED_CLIENT_ID
+ com.googleusercontent.apps.694767596569-c2cjrca92k99f6nkp3363lsb7ljhdgdr
+ API_KEY
+ AIzaSyA-77ZjkxII6GV97CC9rdUl83rzdEXu_rM
+ GCM_SENDER_ID
+ 694767596569
+ PLIST_VERSION
+ 1
+ BUNDLE_ID
+ com.moodle.moodlemobile
+ PROJECT_ID
+ moodlemobile-push
+ STORAGE_BUCKET
+ moodlemobile-push.appspot.com
+ IS_ADS_ENABLED
+
+ IS_ANALYTICS_ENABLED
+
+ IS_APPINVITE_ENABLED
+
+ IS_GCM_ENABLED
+
+ IS_SIGNIN_ENABLED
+
+ GOOGLE_APP_ID
+ 1:694767596569:ios:a4cdad4d168c9d1a
+ DATABASE_URL
+ https://moodlemobile-push.firebaseio.com
+
+
\ No newline at end of file
diff --git a/config.xml b/config.xml
index cdc0b199d..b39ed9cd6 100644
--- a/config.xml
+++ b/config.xml
@@ -41,6 +41,7 @@
+
@@ -77,6 +78,7 @@
+
@@ -137,8 +139,9 @@
-
-
+
+
+
diff --git a/google-services.json b/google-services.json
new file mode 100644
index 000000000..ff50800df
--- /dev/null
+++ b/google-services.json
@@ -0,0 +1,45 @@
+{
+ "project_info": {
+ "project_number": "694767596569",
+ "firebase_url": "https://moodlemobile-push.firebaseio.com",
+ "project_id": "moodlemobile-push",
+ "storage_bucket": "moodlemobile-push.appspot.com"
+ },
+ "client": [
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:694767596569:android:a4cdad4d168c9d1a",
+ "android_client_info": {
+ "package_name": "com.moodle.moodlemobile"
+ }
+ },
+ "oauth_client": [
+ {
+ "client_id": "694767596569-icveqqa2n56oh44l6ev1dr2oh67nh8il.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyCb2zogu0P_aZ2LNgdwzshWExITPKTXJyk"
+ },
+ {
+ "current_key": "AIzaSyDRT1HwT0gSsTty0whOVtoNKAh8SPrJXLE"
+ }
+ ],
+ "services": {
+ "analytics_service": {
+ "status": 1
+ },
+ "appinvite_service": {
+ "status": 1,
+ "other_platform_oauth_client": []
+ },
+ "ads_service": {
+ "status": 2
+ }
+ }
+ }
+ ],
+ "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index a72c22b50..0f114980d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1716,6 +1716,11 @@
}
}
},
+ "babel-plugin-add-header-comment": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz",
+ "integrity": "sha1-URxJAQYmQNWkgLSsPt1pRBlYUOw="
+ },
"bach": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
@@ -3220,6 +3225,11 @@
"resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-1.2.1.tgz",
"integrity": "sha512-4ihQApBGVKR1QZ4oOSGctKFfthtCfiWMTcIIfxe97vKxlvGr9NyXOvYG9vXU9S7yVR7Ua+Rj47hkE7pQIKvQTg=="
},
+ "cordova-support-google-services": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/cordova-support-google-services/-/cordova-support-google-services-1.1.0.tgz",
+ "integrity": "sha1-RjTFIgD4cGDReV6yhw6ZRC12Lm0="
+ },
"core-js": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
@@ -6314,6 +6324,11 @@
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
"dev": true
},
+ "install": {
+ "version": "0.8.9",
+ "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz",
+ "integrity": "sha1-n0tcDRhR74cunfheT3Fi1OXc2+0="
+ },
"interpret": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
@@ -8554,9 +8569,19 @@
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
"dev": true
},
+ "phonegap-plugin-multidex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/phonegap-plugin-multidex/-/phonegap-plugin-multidex-1.0.0.tgz",
+ "integrity": "sha512-1wvc3iQOQpEBaQbXgLxA2JUiLSQ2azdF/bF29ghXDiQJWSpQ1BF8gSuqttM8WZoj081Ps8OKL0gYxdDBkFNPqA=="
+ },
"phonegap-plugin-push": {
- "version": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#cf2ed2075d9d2d58a4c4f79543f669ed6366c148",
- "from": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle"
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/phonegap-plugin-push/-/phonegap-plugin-push-2.2.3.tgz",
+ "integrity": "sha512-5mjT0G1vfRhXVnZFLwjfzcFwYjVRMibgYDCfYvEujGsP8YwwrIIzcf+xBYAjQV/W2JCjzuNaYd7xJ0yVQaPeig==",
+ "requires": {
+ "babel-plugin-add-header-comment": "^1.0.3",
+ "install": "^0.8.2"
+ }
},
"pify": {
"version": "2.3.0",
diff --git a/package.json b/package.json
index 87f697455..c221f3a8e 100644
--- a/package.json
+++ b/package.json
@@ -102,6 +102,7 @@
"cordova-plugin-whitelist": "^1.3.3",
"cordova-plugin-zip": "^3.1.0",
"cordova-sqlite-storage": "^2.6.0",
+ "cordova-support-google-services": "^1.1.0",
"es6-promise-plugin": "^4.2.2",
"font-awesome": "^4.7.0",
"ionic-angular": "3.9.3",
@@ -109,7 +110,8 @@
"jszip": "^3.1.5",
"moment": "^2.22.2",
"nl.kingsquare.cordova.background-audio": "^1.0.1",
- "phonegap-plugin-push": "git+https://github.com/moodlemobile/phonegap-plugin-push.git#moodle",
+ "phonegap-plugin-multidex": "^1.0.0",
+ "phonegap-plugin-push": "^2.2.3",
"promise.prototype.finally": "^3.1.0",
"rxjs": "^5.5.11",
"sw-toolbox": "^3.6.0",
@@ -169,7 +171,8 @@
"cordova-sqlite-storage": {},
"nl.kingsquare.cordova.background-audio": {},
"phonegap-plugin-push": {
- "SENDER_ID": "694767596569"
+ "ANDROID_SUPPORT_V13_VERSION": "27.+",
+ "FCM_VERSION": "11.6.2"
}
}
},
diff --git a/src/addon/pushnotifications/providers/pushnotifications.ts b/src/addon/pushnotifications/providers/pushnotifications.ts
index fce797a79..6cd40d65b 100644
--- a/src/addon/pushnotifications/providers/pushnotifications.ts
+++ b/src/addon/pushnotifications/providers/pushnotifications.ts
@@ -94,7 +94,6 @@ export class AddonPushNotificationsProvider {
return this.configProvider.get(CoreConstants.SETTINGS_NOTIFICATION_SOUND, true).then((soundEnabled) => {
return {
android: {
- senderID: CoreConfigConstants.gcmpn,
sound: !!soundEnabled,
icon: 'smallicon'
},
diff --git a/src/config.json b/src/config.json
index 56244a5a5..331a72b6d 100644
--- a/src/config.json
+++ b/src/config.json
@@ -64,7 +64,6 @@
"password": "moodle"
}
},
- "gcmpn": "694767596569",
"customurlscheme": "moodlemobile",
"siteurl": "",
"multisitesdisplay": "",