Merge pull request #2243 from OneSignal/huawei-incorrect-notification…

…-intent-path Fix: incorrect activity path for NotificationOpenedActivityHMS
OneSignal · Jan 21, 2025 · 821bf86 · 821bf86
2 parents 9c01a40 + 3456a69
commit 821bf86
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git 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/...tivities/NotificationOpenedActivityHMS.kt → ...nesignal/NotificationOpenedActivityHMS.kt b/...tivities/NotificationOpenedActivityHMS.kt → ...nesignal/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/...alSDK/onesignal/notifications/src/test/java/com/onesignal/notifications/ClassPathTests.kt b/...alSDK/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)
+        }
+    }
+})