expo-notifications 0.15.3 → 0.15.4

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 0.15.4 — 2022-06-27
+
+_This version does not introduce any user-facing changes._
+
 ## 0.15.3 — 2022-06-17
 
 ### 🐛 Bug fixes
@@ -18,6 +22,7 @@
 - Fixed Android data-only FCM notifications (i.e. notifications without a title and message) appearing in the notification drawer ([#17707](https://github.com/expo/expo/pull/17707) by [@sausti](https://github.com/sausti))
 - Add support for unregistering from push notifications on Android and iOS ([#17812](https://github.com/expo/expo/pull/17812) by [@sausti](https://github.com/sausti))
 - Fix another Android 12+ trampoline issue from push notifications. ([#17871](https://github.com/expo/expo/pull/17871) by [@kudo](https://github.com/kudo))
+- Fixed `useLastNotificationResponse` returns latest received notification but not the clicked notification on Android. ([#17974](https://github.com/expo/expo/pull/17974) by [@kudo](https://github.com/kudo))
 
 ## 0.15.2 — 2022-05-05
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.15.3'
+version = '0.15.4'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 21
-    versionName '0.15.3'
+    versionName '0.15.4'
   }
 
   lintOptions {

package/android/src/main/AndroidManifest.xml

@@ -34,6 +34,7 @@
       android:excludeFromRecents="true"
       android:noHistory="true"
       android:launchMode="standard"
+      android:taskAffinity=""
       />
   </application>
 </manifest>

package/android/src/main/java/expo/modules/notifications/service/NotificationForwarderActivity.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import expo.modules.notifications.BuildConfig
+import expo.modules.notifications.service.delegates.ExpoHandlingDelegate
 
 /**
  * An internal Activity that passes given Intent extras from
@@ -15,6 +16,8 @@ class NotificationForwarderActivity : Activity() {
     super.onCreate(savedInstanceState)
     val broadcastIntent =
       NotificationsService.createNotificationResponseBroadcastIntent(applicationContext, intent.extras)
+    val notificationResponse = NotificationsService.getNotificationResponseFromBroadcastIntent(broadcastIntent)
+    ExpoHandlingDelegate.openAppToForeground(this, notificationResponse)
     sendBroadcast(broadcastIntent)
     finish()
   }

package/android/src/main/java/expo/modules/notifications/service/delegates/ExpoHandlingDelegate.kt

@@ -67,15 +67,23 @@ class ExpoHandlingDelegate(protected val context: Context) : HandlingDelegate {
         // For intent with RemoteInput, it should be mutable.
         intentFlags = intentFlags or PendingIntent.FLAG_MUTABLE
       }
-      val foregroundActivityIntent = getNotificationActionLauncher(context) ?: getMainActivityLauncher(context) ?: run {
-        Log.w("expo-notifications", "No launch intent found for application. Interacting with the notification won't open the app. The implementation uses `getLaunchIntentForPackage` to find appropriate activity.")
-        Intent()
-      }
-      foregroundActivityIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK
-      NotificationsService.setNotificationResponseToIntent(foregroundActivityIntent, notificationResponse)
+
       val backgroundActivityIntent = Intent(context, NotificationForwarderActivity::class.java)
+      backgroundActivityIntent.data = broadcastIntent.data
+      backgroundActivityIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK
       backgroundActivityIntent.putExtras(broadcastIntent)
-      return PendingIntent.getActivities(context, 0, arrayOf(foregroundActivityIntent, backgroundActivityIntent), intentFlags)
+      val requestCode = broadcastIntent.component?.className?.hashCode() ?: NotificationsService::class.java.hashCode()
+      return PendingIntent.getActivity(context, requestCode, backgroundActivityIntent, intentFlags)
+    }
+
+    fun openAppToForeground(context: Context, notificationResponse: NotificationResponse) {
+      (getNotificationActionLauncher(context) ?: getMainActivityLauncher(context))?.let { intent ->
+        NotificationsService.setNotificationResponseToIntent(intent, notificationResponse)
+        context.startActivity(intent)
+        return
+      }
+
+      Log.w("expo-notifications", "No launch intent found for application. Interacting with the notification won't open the app. The implementation uses `getLaunchIntentForPackage` to find appropriate activity.")
     }
 
     private fun getNotificationActionLauncher(context: Context): Intent? {
@@ -130,16 +138,6 @@ class ExpoHandlingDelegate(protected val context: Context) : HandlingDelegate {
     }
   }
 
-  protected fun openAppToForeground(context: Context, notificationResponse: NotificationResponse) {
-    (getNotificationActionLauncher(context) ?: getMainActivityLauncher(context))?.let { intent ->
-      NotificationsService.setNotificationResponseToIntent(intent, notificationResponse)
-      context.startActivity(intent)
-      return
-    }
-
-    Log.w("expo-notifications", "No launch intent found for application. Interacting with the notification won't open the app. The implementation uses `getLaunchIntentForPackage` to find appropriate activity.")
-  }
-
   override fun handleNotificationsDropped() {
     getListeners().forEach {
       it.onNotificationsDropped()

package/ios/EXNotifications.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>EXNotifications.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>EXNotifications.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-notifications",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "Notifications module",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -58,5 +58,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "aa4163b5cb533fd4b3fc583e3958b36eaa97617c"
+  "gitHead": "702fddee92d0d96c29fc8144fa08d07ba0995492"
 }