Skip to content

Don't crash with Android < 7.0 (when requesting permission) #1007

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

Merged
merged 1 commit into from
Feb 24, 2025
Merged

Don't crash with Android < 7.0 (when requesting permission) #1007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 35 additions & 5 deletions android/src/main/java/com/onesignal/flutter/OneSignalNotifications.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.onesignal.flutter;

import androidx.annotation.NonNull;

import com.onesignal.debug.internal.logging.Logging;
import com.onesignal.OneSignal;
import com.onesignal.Continue;


import com.onesignal.notifications.INotification;
import com.onesignal.notifications.INotificationClickEvent;
Expand All @@ -23,11 +23,43 @@
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
import io.flutter.plugin.common.MethodChannel.Result;
import kotlin.coroutines.Continuation;
import kotlin.coroutines.CoroutineContext;
import kotlinx.coroutines.Dispatchers;

public class OneSignalNotifications extends FlutterMessengerResponder implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver {
private final HashMap<String, INotificationWillDisplayEvent> notificationOnWillDisplayEventCache = new HashMap<>();
private final HashMap<String, INotificationWillDisplayEvent> preventedDefaultCache = new HashMap<>();

/**
* A helper class to encapsulate invoking the suspending function [requestPermission] in Java.
* To support API level < 24, the SDK cannot use the OneSignal-defined [Continue.with] helper method.
*/
private class RequestPermissionContinuation implements Continuation<Boolean> {

private final MethodChannel.Result result;

public RequestPermissionContinuation(MethodChannel.Result result) {
this.result = result;
}

@NonNull
@Override
public CoroutineContext getContext() {
return (CoroutineContext) Dispatchers.getMain();
}

@Override
public void resumeWith(@NonNull Object o) {
if (o instanceof kotlin.Result.Failure) {
Throwable e = ((kotlin.Result.Failure) o).exception;
replyError(result, "OneSignal", "requestPermission failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
}
else {
replySuccess(result, o);
}
}
}

static void registerWith(BinaryMessenger messenger) {
OneSignalNotifications controller = new OneSignalNotifications();
Expand Down Expand Up @@ -72,9 +104,7 @@ private void requestPermission(MethodCall call, Result result) {
return;
}

OneSignal.getNotifications().requestPermission(fallback, Continue.with(permissionResult -> {
replySuccess(result, permissionResult.getData());
}));
OneSignal.getNotifications().requestPermission(fallback, new RequestPermissionContinuation(result));
}

private void removeNotification(MethodCall call, Result result) {
Expand Down
Loading