fix: Fix #61 when React context was null

Rapsssito · Jun 9, 2021 · 2efefaa · 2efefaa
1 parent eb92dca
commit 2efefaa
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/android/src/main/java/com/asterinet/react/bgactions/RNBackgroundActionsTask.java b/android/src/main/java/com/asterinet/react/bgactions/RNBackgroundActionsTask.java
@@ -4,6 +4,7 @@
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ -24,7 +25,7 @@ final public class RNBackgroundActionsTask extends HeadlessJsTaskService {
     private static final String CHANNEL_ID = "RN_BACKGROUND_ACTIONS_CHANNEL";
 
     @NonNull
-    public static Notification buildNotification(@NonNull final ReactContext context, @NonNull final BackgroundTaskOptions bgOptions) {
+    public static Notification buildNotification(@NonNull Context context, @NonNull final BackgroundTaskOptions bgOptions) {
         // Get info
         final String taskTitle = bgOptions.getTaskTitle();
         final String taskDesc = bgOptions.getTaskDesc();
@@ -35,7 +36,8 @@ public static Notification buildNotification(@NonNull final ReactContext context
         if (linkingURI != null) {
             notificationIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(linkingURI));
         } else {
-            notificationIntent = new Intent(context, context.getCurrentActivity().getClass());
+            //as RN works on single activity architecture - we don't need to find current activity on behalf of react context
+            notificationIntent = new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER);
         }
         final PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
         final NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID)
@@ -54,7 +56,6 @@ public static Notification buildNotification(@NonNull final ReactContext context
             final boolean progressIndeterminate = progressBarBundle.getBoolean("indeterminate");
             builder.setProgress(progressMax, progressCurrent, progressIndeterminate);
         }
-
         return builder.build();
     }
 
@@ -77,7 +78,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         final BackgroundTaskOptions bgOptions = new BackgroundTaskOptions(extras);
         createNotificationChannel(bgOptions.getTaskTitle(), bgOptions.getTaskDesc()); // Necessary creating channel for API 26+
         // Create the notification
-        final Notification notification = buildNotification(getReactNativeHost().getReactInstanceManager().getCurrentReactContext(), bgOptions);
+        final Notification notification = buildNotification(this, bgOptions);
         startForeground(SERVICE_NOTIFICATION_ID, notification);
         return super.onStartCommand(intent, flags, startId);
     }