fix merge issue

MaikuB · Aug 14, 2022 · 78da181 · 78da181
1 parent e762614
commit 78da181
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/...rc/main/java/com/dexterous/flutterlocalnotifications/FlutterLocalNotificationsPlugin.java b/...rc/main/java/com/dexterous/flutterlocalnotifications/FlutterLocalNotificationsPlugin.java
@@ -1441,28 +1441,17 @@ private void show(MethodCall call, Result result) {
 
   private void getNotificationAppLaunchDetails(Result result) {
     Map<String, Object> notificationAppLaunchDetails = new HashMap<>();
-    Boolean notificationLaunchedApp =
-        mainActivity != null
-            && (SELECT_NOTIFICATION.equals(mainActivity.getIntent().getAction())
-                || SELECT_FOREGROUND_NOTIFICATION_ACTION.equals(
-                    mainActivity.getIntent().getAction()))
-            && !launchedActivityFromHistory(mainActivity.getIntent());
-    notificationAppLaunchDetails.put(NOTIFICATION_LAUNCHED_APP, notificationLaunchedApp);
-    if (notificationLaunchedApp) {
-      notificationAppLaunchDetails.put(
-          "notificationResponse", extractNotificationResponseMap(launchIntent));
     Boolean notificationLaunchedApp = false;
     if (mainActivity != null) {
       Intent launchIntent = mainActivity.getIntent();
       notificationLaunchedApp =
-              launchIntent != null
-                      && (SELECT_NOTIFICATION.equals(launchIntent.getAction())
-                      || SELECT_FOREGROUND_NOTIFICATION_ACTION.equals(
-                      launchIntent.getAction()))
-                      && !launchedActivityFromHistory(launchIntent);
+          launchIntent != null
+              && (SELECT_NOTIFICATION.equals(launchIntent.getAction())
+                  || SELECT_FOREGROUND_NOTIFICATION_ACTION.equals(launchIntent.getAction()))
+              && !launchedActivityFromHistory(launchIntent);
       if (notificationLaunchedApp) {
         notificationAppLaunchDetails.put(
-                "notificationResponse", extractNotificationResponseMap(launchIntent));
+            "notificationResponse", extractNotificationResponseMap(launchIntent));
       }
     }