Skip to content

Support for Android SDK 31 #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Support for Android SDK 31 #277

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8e95b4f
Update plugin.xml
marutifh Jan 7, 2022
dc3a2a7
Support for Android SDK 31
marutifh Jan 7, 2022
ac8b1a7
Update plugin.xml
marutifh Jul 22, 2022
5e2b20c
Update FCM version
Sep 26, 2022
06fed39
BOM 29.0.1
Sep 26, 2022
f96b1ce
IID version added
Sep 26, 2022
8e8ccc8
FirebaseInstanceId removed
Sep 26, 2022
dda923d
updates
Sep 26, 2022
7f34f7a
Update README.md
marutifh Sep 29, 2022
fa88843
Update README.md
marutifh Feb 16, 2023
038cea0
Android target SDK level 33 (Android 13)
inrobin Aug 24, 2023
30ade85
fix: Notifications no longer open app from Android 12+
inrobin Aug 24, 2023
2eee01a
Merge pull request #2 from inrobin/master
marutifh Aug 28, 2023
236ccff
return true in grantPermission if app already hasPermission to preven…
fcristini Sep 8, 2023
01f19a0
Handle grantPermission for API versions <33
paraschivionut Sep 22, 2023
5deec92
Merge pull request #4 from paraschivionut/master
marutifh Oct 26, 2023
26de9a9
Merge pull request #3 from fcristini/master
marutifh Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ Make sure you have ‘google-services.json’ for Android and/or ‘GoogleServic
|Preference|Default Value|Description|
|---|---|---|
|ANDROID_DEFAULT_NOTIFICATION_ICON|@mipmap/ic_launcher|Default notification icon.|
|ANDROID_FCM_VERSION|21.0.0|Native Firebase Message SDK version.<br>:warning: Replaced by BoM versioning on Gradle >= 3.4.|
|ANDROID_FIREBASE_BOM_VERSION|26.0.0|[Firebase BoM](https://firebase.google.com/docs/android/learn-more#bom) version.|
|ANDROID_FCM_VERSION|23.0.0|Native Firebase Message SDK version.<br>:warning: Replaced by BoM versioning on Gradle >= 3.4.|
|ANDROID_FIREBASE_BOM_VERSION|29.0.1|[Firebase BoM](https://firebase.google.com/docs/android/learn-more#bom) version.|
|ANDROID_GOOGLE_SERVICES_VERSION|4.3.4|Native Google Services SDK version.|
|ANDROID_GRADLE_TOOLS_VERSION|4.1.0|Gradle tools version.|
|IOS_FIREBASE_MESSAGING_VERSION|~> 7.4.0|Native Firebase Message SDK version|
Expand Down
9 changes: 5 additions & 4 deletions plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,21 @@
<!-- ANDROID CONFIGURATION -->
<platform name="android">
<preference name="ANDROID_DEFAULT_NOTIFICATION_ICON" default="@mipmap/ic_launcher" />
<preference name="ANDROID_FCM_VERSION" default="21.0.0" />
<preference name="ANDROID_FIREBASE_BOM_VERSION" default="26.0.0" />
<preference name="ANDROID_FCM_VERSION" default="23.0.0" />
<preference name="ANDROID_FIREBASE_BOM_VERSION" default="29.0.1" />
<preference name="ANDROID_GOOGLE_SERVICES_VERSION" default="4.3.4" />
<preference name="ANDROID_GRADLE_TOOLS_VERSION" default="4.1.0" />

<config-file target="AndroidManifest.xml" parent="/manifest/application">
<activity android:name="com.gae.scaffolder.plugin.FCMPluginActivity" android:launchMode="singleTop">
<activity android:name="com.gae.scaffolder.plugin.FCMPluginActivity" android:exported="true" android:launchMode="singleTop">
<intent-filter>
<action android:name="FCM_PLUGIN_ACTIVITY" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<service
android:name="com.gae.scaffolder.plugin.MyFirebaseMessagingService"
android:name="com.gae.scaffolder.plugin.MyFirebaseMessagingService"
android:exported="false"
android:stopWithTask="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
Expand Down
12 changes: 5 additions & 7 deletions src/android/com/gae/scaffolder/plugin/FCMPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.iid.FirebaseInstanceId;
import com.google.firebase.iid.InstanceIdResult;
import com.google.firebase.messaging.FirebaseMessaging;

import org.apache.cordova.CallbackContext;
Expand Down Expand Up @@ -179,9 +177,9 @@ public void getInitialPushPayload(CallbackContext callback) {

public void getToken(final TokenListeners<String, JSONObject> callback) {
try {
FirebaseInstanceId.getInstance().getInstanceId().addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
FirebaseMessaging.getInstance().getToken().addOnCompleteListener(new OnCompleteListener<String>() {
@Override
public void onComplete(Task<InstanceIdResult> task) {
public void onComplete(Task<String> task) {
if (!task.isSuccessful()) {
Log.w(TAG, "getInstanceId failed", task.getException());
try {
Expand All @@ -194,14 +192,14 @@ public void onComplete(Task<InstanceIdResult> task) {
}

// Get new Instance ID token
String newToken = task.getResult().getToken();
String newToken = task.getResult();

Log.i(TAG, "\tToken: " + newToken);
callback.success(newToken);
}
});

FirebaseInstanceId.getInstance().getInstanceId().addOnFailureListener(new OnFailureListener() {
FirebaseMessaging.getInstance().getToken().addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(final Exception e) {
try {
Expand All @@ -224,7 +222,7 @@ private void deleteInstanceId(final CallbackContext callbackContext) {
cordova.getThreadPool().execute(new Runnable() {
public void run() {
try {
FirebaseInstanceId.getInstance().deleteInstanceId();
FirebaseMessaging.getInstance().deleteToken();
callbackContext.success();
} catch (Exception e) {
callbackContext.error(e.getMessage());
Expand Down