This repository has been archived by the owner on Sep 4, 2020. It is now read-only.
Added partial Android FCM support #975
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@jcesarmobile it looks pretty good to me, I'll leave a few comments on specific lines. Can you rebase with the v2.0.x branch and resubmit the PR as it won't merge clean? |
| @@ -40,60 +40,39 @@ | |||
| <config-file target="res/values/strings.xml" parent="/resources"> | |||
| <string name="google_app_id">$SENDER_ID</string> | |||
There was a problem hiding this comment.
@jcesarmobile do we need this anymore? Is it just contained in the google-services.json file?
There was a problem hiding this comment.
@macdonst yes, the new google-services.json file contains that, and much more
|
Rebased and removed some empty lines |
|
Okay, merged into the v2.0.x branch. We can keep iterating on this. Please reference issue #929. |
macdonst
pushed a commit
that referenced
this pull request
Nov 22, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Nov 23, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Nov 24, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Nov 24, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Nov 28, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Nov 28, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Dec 1, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Dec 1, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Dec 14, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Dec 14, 2016
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Jan 4, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Jan 6, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Jan 12, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
Apr 29, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
May 5, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
May 5, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
May 24, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
May 24, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
May 24, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
pushed a commit
that referenced
this pull request
May 24, 2017
* Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines
macdonst
added a commit
that referenced
this pull request
May 25, 2017
* Added partial Android FCM support (#975) * Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines * Fixed empty token on android first run (#1008) * Removed GCM files and added FCM files * Added .framework files as custom frameworks * Changed code to work with FCM * Added hook and resource file to copy GoogleService-Info.plist * fixed registration and removed unused code * Use CocoaPods * Fix rebase errors * Fix topic subscription and unsubscription on FCM * Refactor GCMIntentService to FCMService * Issue #689: Remove sender id from PushNotification init Android options * Issue #689: Remove sender id from PushNotification init iOS options * 📝 Update to using fcm-node * 🐛 Issue #1188: Strings.xml google_app_id conflict with google-services.json * Add empty google services plist * Pin FCM to 9.8.0 * 🔧 Add browser platform back for FCM branch * 🔨🔧⬆️ Use Babel to transpile ES2015 code * 🔧 add tern to gitignore * 🔖 Bumping plugin version to 2.0.0-rc1 * 2.0.0-rc1 * Updating CHANGELOG * Fixing my merge error for PR #1378 Optional event emit instead of function call for action buttons * 🐛🍎 Issue #1461: App crashes when initialising with topics (v2.0.0-rc1) * 🐛🐧📝⬆️ #1460: Build Issue Android * 🐛🍎🔧 Fixing a merge issue where aps-environment was accidentally removed * 🐧📝🐛 Issue #1470: Cannot install phonegap-plugin-push on master * 📝 Using a newer version on the examples * 🍎🐛 Issue #1497: App crashes after refreshing when using FCM (v2) * Bumping plugin version to 2.0.0-rc2 * 2.0.0-rc2 * Updating CHANGELOG * Added partial Android FCM support (#975) * Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines * Removed GCM files and added FCM files * Changed code to work with FCM * Added hook and resource file to copy GoogleService-Info.plist * Use CocoaPods * Fix rebase errors * Issue #689: Remove sender id from PushNotification init Android options * 🐛 Issue #1188: Strings.xml google_app_id conflict with google-services.json * Pin FCM to 9.8.0 * 🔧 Add browser platform back for FCM branch * 🔨🔧⬆️ Use Babel to transpile ES2015 code * 🔧 add tern to gitignore * 🔖 Bumping plugin version to 2.0.0-rc1 * 🐛🐧📝⬆️ #1460: Build Issue Android * Bumping plugin version to 2.0.0-rc2 * Added partial Android FCM support (#975) * Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines * Removed GCM files and added FCM files * Added hook and resource file to copy GoogleService-Info.plist * Use CocoaPods * Fix rebase errors * 🐛 Issue #1188: Strings.xml google_app_id conflict with google-services.json * Updating CHANGELOG * ✏️ fixing error in CHANGELOG * Bumping plugin version to 2.0.0-rc2 * Updating CHANGELOG * Added partial Android FCM support (#975) * Modified plugin.xml to include FCM changes * Plugin.xml changes for FCM * Java changes for FCM * Increased plugin version to 2.0.0 * Increased plugin version in package.json * Added topic subscription/unsubscription * Removed some empty lines * Removed GCM files and added FCM files * Changed code to work with FCM * Added hook and resource file to copy GoogleService-Info.plist * fixed registration and removed unused code * Use CocoaPods * Fix rebase errors * Issue #689: Remove sender id from PushNotification init Android options * Issue #689: Remove sender id from PushNotification init iOS options * 🐛 Issue #1188: Strings.xml google_app_id conflict with google-services.json * 🔧 add tern to gitignore * 🔖 Bumping plugin version to 2.0.0-rc1 * Bumping plugin version to 2.0.0-rc2 * Remove hook and use resource-file tag to copy google services file * Add resource-file way of copying google services files * Bump requirements * 🔧 Update cordovaDependencies * 🔖 Bumping plugin version to 2.0.0-rc3 * 2.0.0-rc3 * Updating CHANGELOG * Fixes 'framework not found GoogleToolboxForMac' linker error in 2.0.0-rc3 (#1715) * Remove unused files (#1732) * Remove GTM framework. (#1739)
|
This thread has been automatically locked. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Removed permissions and classes unneeded
Made required changes to work with FCM
Related Issue
Not linking the issue as it's not fully completed and only the android part
Motivation and Context
Because FCM is the new thing
How Has This Been Tested?
Tested on android 5 and android 6 devices
Types of changes
Checklist:
Known issue. The first time you launch the app you won't get the push token on the javascript part, needs changes to pick it when onTokenRefresh is called