From 3456a6973c102c12d153fc57f09afccf2f5dd7f0 Mon Sep 17 00:00:00 2001
From: jinliu9508 <jinliu9508@gmail.com>
Date: Mon, 13 Jan 2025 18:53:09 -0500
Subject: [PATCH] Fix: incorrect activity path for
 NotificationOpenedActivityHMS

---
 .../notifications/src/main/AndroidManifest.xml    |  3 ++-
 .../NotificationOpenedActivityHMS.kt              |  4 ++--
 .../com/onesignal/notifications/ClassPathTests.kt | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 rename OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/{notifications/activities => }/NotificationOpenedActivityHMS.kt (96%)
 create mode 100644 OneSignalSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/ClassPathTests.kt

diff --git a/OneSignalSDK/onesignal/notifications/src/main/AndroidManifest.xml b/OneSignalSDK/onesignal/notifications/src/main/AndroidManifest.xml
index 6dfef5465c..188ad2e211 100644
--- a/OneSignalSDK/onesignal/notifications/src/main/AndroidManifest.xml
+++ b/OneSignalSDK/onesignal/notifications/src/main/AndroidManifest.xml
@@ -65,8 +65,9 @@
             </intent-filter>
         </service>
 
+        <!-- CAUTION: OneSignal backend includes the activity name in the payload, modifying the name without sync may result in notification click not firing -->
         <activity
-            android:name="com.onesignal.notifications.activities.NotificationOpenedActivityHMS"
+            android:name="com.onesignal.NotificationOpenedActivityHMS"
             android:noHistory="true"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true">
diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/activities/NotificationOpenedActivityHMS.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/NotificationOpenedActivityHMS.kt
similarity index 96%
rename from OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/activities/NotificationOpenedActivityHMS.kt
rename to OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/NotificationOpenedActivityHMS.kt
index f00ee068e2..22fb65b536 100644
--- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/activities/NotificationOpenedActivityHMS.kt
+++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/NotificationOpenedActivityHMS.kt
@@ -24,12 +24,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.onesignal.notifications.activities
+package com.onesignal
+// OneSignal backend includes the activity name in the payload, modifying the namespace may result in notification click not firing
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import com.onesignal.OneSignal
 import com.onesignal.common.threading.suspendifyBlocking
 import com.onesignal.notifications.internal.open.INotificationOpenedProcessorHMS
 
diff --git a/OneSignalSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/ClassPathTests.kt b/OneSignalSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/ClassPathTests.kt
new file mode 100644
index 0000000000..ced088809b
--- /dev/null
+++ b/OneSignalSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/ClassPathTests.kt
@@ -0,0 +1,15 @@
+package com.onesignal.notifications
+
+import io.kotest.core.spec.style.FunSpec
+import org.junit.jupiter.api.assertDoesNotThrow
+
+class ClassPathTests : FunSpec({
+    test("ensure the class path for NotificationOpenedActivityHMS.kt is in consistent with that returned by the backend service") {
+        // The test will fail if the classpath is changed by accident.
+        // If the change is intentional and corresponds with the backend update, modify or remove this test accordingly.
+        val fullClassName = "com.onesignal.NotificationOpenedActivityHMS"
+        assertDoesNotThrow {
+            Class.forName(fullClassName)
+        }
+    }
+})