Skip to content

Commit

Permalink
refactor(firebase_messaging): Remove deprecated Tasks.call() API fr…
Browse files Browse the repository at this point in the history 
…om android. (#8449)
  • Loading branch information
@russellwheatley
russellwheatley committed Apr 26, 2022
1 parent c5d288b commit 0510d11
Show file tree
Hide file tree
Showing 2 changed files with 178 additions and 99 deletions.
273 changes: 176 additions & 97 deletions ...d/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java
View file
Expand Up @@ -16,6 +16,7 @@
import androidx.core.app.NotificationManagerCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.TaskCompletionSource;
import com.google.android.gms.tasks.Tasks;
import com.google.firebase.FirebaseApp;
import com.google.firebase.messaging.FirebaseMessaging;
Expand Down Expand Up @@ -126,141 +127,207 @@ public void onReceive(Context context, Intent intent) {
}

private Task<Void> deleteToken() {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
Tasks.await(FirebaseMessaging.getInstance().deleteToken());
return null;
try {
Tasks.await(FirebaseMessaging.getInstance().deleteToken());
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Map<String, Object>> getToken() {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Map<String, Object>> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
String token = Tasks.await(FirebaseMessaging.getInstance().getToken());
return new HashMap<String, Object>() {
{
put("token", token);
}
};
try {
String token = Tasks.await(FirebaseMessaging.getInstance().getToken());
taskCompletionSource.setResult(
new HashMap<String, Object>() {
{
put("token", token);
}
});
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> subscribeToTopic(Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
FirebaseMessaging firebaseMessaging =
FlutterFirebaseMessagingUtils.getFirebaseMessagingForArguments(arguments);
String topic = (String) Objects.requireNonNull(arguments.get("topic"));
Tasks.await(firebaseMessaging.subscribeToTopic(topic));
return null;
try {
FirebaseMessaging firebaseMessaging =
FlutterFirebaseMessagingUtils.getFirebaseMessagingForArguments(arguments);
String topic = (String) Objects.requireNonNull(arguments.get("topic"));
Tasks.await(firebaseMessaging.subscribeToTopic(topic));
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> unsubscribeFromTopic(Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
FirebaseMessaging firebaseMessaging =
FlutterFirebaseMessagingUtils.getFirebaseMessagingForArguments(arguments);
String topic = (String) Objects.requireNonNull(arguments.get("topic"));
Tasks.await(firebaseMessaging.unsubscribeFromTopic(topic));
return null;
try {
FirebaseMessaging firebaseMessaging =
FlutterFirebaseMessagingUtils.getFirebaseMessagingForArguments(arguments);
String topic = (String) Objects.requireNonNull(arguments.get("topic"));
Tasks.await(firebaseMessaging.unsubscribeFromTopic(topic));
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Void> sendMessage(Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
FirebaseMessaging firebaseMessaging =
FlutterFirebaseMessagingUtils.getFirebaseMessagingForArguments(arguments);
RemoteMessage remoteMessage =
FlutterFirebaseMessagingUtils.getRemoteMessageForArguments(arguments);
firebaseMessaging.send(remoteMessage);
return null;
try {
FirebaseMessaging firebaseMessaging =
FlutterFirebaseMessagingUtils.getFirebaseMessagingForArguments(arguments);
RemoteMessage remoteMessage =
FlutterFirebaseMessagingUtils.getRemoteMessageForArguments(arguments);
firebaseMessaging.send(remoteMessage);
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Map<String, Object>> setAutoInitEnabled(Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Map<String, Object>> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
FirebaseMessaging firebaseMessaging =
FlutterFirebaseMessagingUtils.getFirebaseMessagingForArguments(arguments);
Boolean enabled = (Boolean) Objects.requireNonNull(arguments.get("enabled"));
firebaseMessaging.setAutoInitEnabled(enabled);
return new HashMap<String, Object>() {
{
put(
FlutterFirebaseMessagingUtils.IS_AUTO_INIT_ENABLED,
firebaseMessaging.isAutoInitEnabled());
}
};
try {
FirebaseMessaging firebaseMessaging =
FlutterFirebaseMessagingUtils.getFirebaseMessagingForArguments(arguments);
Boolean enabled = (Boolean) Objects.requireNonNull(arguments.get("enabled"));
firebaseMessaging.setAutoInitEnabled(enabled);
taskCompletionSource.setResult(
new HashMap<String, Object>() {
{
put(
FlutterFirebaseMessagingUtils.IS_AUTO_INIT_ENABLED,
firebaseMessaging.isAutoInitEnabled());
}
});
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Map<String, Object>> getInitialMessage(Map<String, Object> arguments) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Map<String, Object>> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
if (initialMessage != null) {
Map<String, Object> remoteMessageMap =
FlutterFirebaseMessagingUtils.remoteMessageToMap(initialMessage);
initialMessage = null;
return remoteMessageMap;
}
try {
if (initialMessage != null) {
Map<String, Object> remoteMessageMap =
FlutterFirebaseMessagingUtils.remoteMessageToMap(initialMessage);
initialMessage = null;
taskCompletionSource.setResult(remoteMessageMap);
return;
}

if (mainActivity == null) {
return null;
}
if (mainActivity == null) {
taskCompletionSource.setResult(null);
return;
}

Intent intent = mainActivity.getIntent();
Intent intent = mainActivity.getIntent();

if (intent == null || intent.getExtras() == null) {
return null;
}
if (intent == null || intent.getExtras() == null) {
taskCompletionSource.setResult(null);
return;
}

// Remote Message ID can be either one of the following...
String messageId = intent.getExtras().getString("google.message_id");
if (messageId == null) messageId = intent.getExtras().getString("message_id");
// Remote Message ID can be either one of the following...
String messageId = intent.getExtras().getString("google.message_id");
if (messageId == null) messageId = intent.getExtras().getString("message_id");

// We only want to handle non-consumed initial messages.
if (messageId == null || consumedInitialMessages.get(messageId) != null) {
return null;
}
// We only want to handle non-consumed initial messages.
if (messageId == null || consumedInitialMessages.get(messageId) != null) {
taskCompletionSource.setResult(null);
return;
}

RemoteMessage remoteMessage =
FlutterFirebaseMessagingReceiver.notifications.get(messageId);
RemoteMessage remoteMessage =
FlutterFirebaseMessagingReceiver.notifications.get(messageId);

// If we can't find a copy of the remote message in memory then check from our persisted store.
if (remoteMessage == null) {
remoteMessage =
FlutterFirebaseMessagingStore.getInstance().getFirebaseMessage(messageId);
FlutterFirebaseMessagingStore.getInstance().removeFirebaseMessage(messageId);
}
// If we can't find a copy of the remote message in memory then check from our persisted store.
if (remoteMessage == null) {
remoteMessage =
FlutterFirebaseMessagingStore.getInstance().getFirebaseMessage(messageId);
FlutterFirebaseMessagingStore.getInstance().removeFirebaseMessage(messageId);
}

if (remoteMessage == null) {
return null;
}
if (remoteMessage == null) {
taskCompletionSource.setResult(null);
return;
}

consumedInitialMessages.put(messageId, true);

taskCompletionSource.setResult(
FlutterFirebaseMessagingUtils.remoteMessageToMap(remoteMessage));

consumedInitialMessages.put(messageId, true);
return FlutterFirebaseMessagingUtils.remoteMessageToMap(remoteMessage);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

private Task<Map<String, Integer>> getPermissions() {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Map<String, Integer>> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
final Map<String, Integer> permissions = new HashMap<>();
final boolean areNotificationsEnabled =
NotificationManagerCompat.from(mainActivity).areNotificationsEnabled();
permissions.put("authorizationStatus", areNotificationsEnabled ? 1 : 0);
return permissions;
try {
final Map<String, Integer> permissions = new HashMap<>();
final boolean areNotificationsEnabled =
NotificationManagerCompat.from(mainActivity).areNotificationsEnabled();
permissions.put("authorizationStatus", areNotificationsEnabled ? 1 : 0);
taskCompletionSource.setResult(permissions);
} catch (Exception e) {
taskCompletionSource.setException(e);
}
});

return taskCompletionSource.getTask();
}

@Override
Expand Down Expand Up @@ -405,20 +472,32 @@ public boolean onNewIntent(Intent intent) {

@Override
public Task<Map<String, Object>> getPluginConstantsForFirebaseApp(FirebaseApp firebaseApp) {
return Tasks.call(
cachedThreadPool,
TaskCompletionSource<Map<String, Object>> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(
() -> {
Map<String, Object> constants = new HashMap<>();
if (firebaseApp.getName().equals("[DEFAULT]")) {
FirebaseMessaging firebaseMessaging = FirebaseMessaging.getInstance();
constants.put("AUTO_INIT_ENABLED", firebaseMessaging.isAutoInitEnabled());
try {
Map<String, Object> constants = new HashMap<>();
if (firebaseApp.getName().equals("[DEFAULT]")) {
FirebaseMessaging firebaseMessaging = FirebaseMessaging.getInstance();
constants.put("AUTO_INIT_ENABLED", firebaseMessaging.isAutoInitEnabled());
}
taskCompletionSource.setResult(constants);

} catch (Exception e) {
taskCompletionSource.setException(e);
}
return constants;
});

return taskCompletionSource.getTask();
}

@Override
public Task<Void> didReinitializeFirebaseCore() {
return Tasks.call(cachedThreadPool, () -> null);
TaskCompletionSource<Void> taskCompletionSource = new TaskCompletionSource<>();

cachedThreadPool.execute(() -> taskCompletionSource.setResult(null));

return taskCompletionSource.getTask();
}
}
4 changes: 2 additions & 2 deletions packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle
View file
Expand Up @@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 29
compileSdkVersion 31

lintOptions {
disable 'InvalidPackage'
Expand All @@ -35,7 +35,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "io.flutter.plugins.firebase.messaging.example"
minSdkVersion 19
targetSdkVersion 29
targetSdkVersion 31
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down

0 comments on commit 0510d11

Please sign in to comment.