fix(voip): localize phone-state OK button; gate FCM before busy check

Slice 1: Add Ok i18n key and use i18n.t for READ_PHONE_STATE rationale button.
Slice 2: Evaluate incoming push lifetime/expiry before hasActiveCall so stale
pushes do not call rejectBusyCall or showIncomingCall; extract pure dispatch
helper with JUnit tests; add junit test dependency.

Made-with: Cursor

Author: diegolmello

android/app/build.gradle

@@ -153,6 +153,8 @@ dependencies {
 
     // For SecureKeystore (EncryptedSharedPreferences)
     implementation 'androidx.security:security-crypto:1.1.0'
+
+    testImplementation 'junit:junit:4.13.2'
 }
 
 apply plugin: 'com.google.gms.google-services'

android/app/src/main/java/chat/rocket/reactnative/voip/VoipIncomingCallDispatch.kt

@@ -0,0 +1,25 @@
+package chat.rocket.reactnative.voip
+
+/**
+ * Pure routing for an incoming VoIP FCM push after [VoipPayload.isVoipIncomingCall] is true.
+ * Stale (invalid or expired lifetime) pushes must not reach busy vs show branching.
+ */
+internal enum class VoipIncomingPushAction {
+    STALE,
+    REJECT_BUSY,
+    SHOW_INCOMING
+}
+
+internal fun decideIncomingVoipPushAction(
+    isValidForIncomingHandling: Boolean,
+    hasActiveCall: Boolean
+): VoipIncomingPushAction {
+    if (!isValidForIncomingHandling) {
+        return VoipIncomingPushAction.STALE
+    }
+    return if (hasActiveCall) {
+        VoipIncomingPushAction.REJECT_BUSY
+    } else {
+        VoipIncomingPushAction.SHOW_INCOMING
+    }
+}

android/app/src/main/java/chat/rocket/reactnative/voip/VoipNotification.kt

@@ -682,10 +682,21 @@ class VoipNotification(private val context: Context) {
     fun onMessageReceived(voipPayload: VoipPayload) {
         when {
             voipPayload.isVoipIncomingCall() -> {
-                if (hasActiveCall(context)) {
-                    rejectBusyCall(context, voipPayload)
-                } else {
-                    showIncomingCall(voipPayload)
+                val isValidForIncoming =
+                    voipPayload.getRemainingLifetimeMs() != null && !voipPayload.isExpired()
+                when (decideIncomingVoipPushAction(isValidForIncoming, hasActiveCall(context))) {
+                    VoipIncomingPushAction.STALE -> {
+                        if (voipPayload.getRemainingLifetimeMs() == null) {
+                            Log.w(
+                                TAG,
+                                "Skipping incoming VoIP call without a valid createdAt timestamp - callId: ${voipPayload.callId}"
+                            )
+                        } else {
+                            Log.d(TAG, "Skipping expired incoming VoIP call - callId: ${voipPayload.callId}")
+                        }
+                    }
+                    VoipIncomingPushAction.REJECT_BUSY -> rejectBusyCall(context, voipPayload)
+                    VoipIncomingPushAction.SHOW_INCOMING -> showIncomingCall(voipPayload)
                 }
             }
             else -> Log.w(TAG, "Ignoring unsupported VoIP payload type: ${voipPayload.type}")

android/app/src/test/java/chat/rocket/reactnative/voip/VoipIncomingCallDispatchTest.kt

@@ -0,0 +1,39 @@
+package chat.rocket.reactnative.voip
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class VoipIncomingCallDispatchTest {
+
+    @Test
+    fun `stale push with active call does not route to reject busy`() {
+        assertEquals(
+            VoipIncomingPushAction.STALE,
+            decideIncomingVoipPushAction(isValidForIncomingHandling = false, hasActiveCall = true)
+        )
+    }
+
+    @Test
+    fun `stale push without active call does not route to show incoming`() {
+        assertEquals(
+            VoipIncomingPushAction.STALE,
+            decideIncomingVoipPushAction(isValidForIncomingHandling = false, hasActiveCall = false)
+        )
+    }
+
+    @Test
+    fun `valid push with active call rejects busy`() {
+        assertEquals(
+            VoipIncomingPushAction.REJECT_BUSY,
+            decideIncomingVoipPushAction(isValidForIncomingHandling = true, hasActiveCall = true)
+        )
+    }
+
+    @Test
+    fun `valid push without active call shows incoming`() {
+        assertEquals(
+            VoipIncomingPushAction.SHOW_INCOMING,
+            decideIncomingVoipPushAction(isValidForIncomingHandling = true, hasActiveCall = false)
+        )
+    }
+}

app/i18n/locales/en.json

@@ -644,6 +644,7 @@
   "Open_your_authentication_app_and_enter_the_code": "Open your authentication app and enter the code.",
   "OR": "OR",
   "OS": "OS",
+  "Ok": "Ok",
   "Overwrites_the_server_configuration_and_use_room_config": "Overwrites the workspace configuration and use room config",
   "Owner": "Owner",
   "Parent_channel_or_group": "Parent channel or group",

app/lib/methods/voipPhoneStatePermission.test.ts

@@ -21,9 +21,10 @@ describe('requestPhoneStatePermission', () => {
 
 	it('requests READ_PHONE_STATE on Android with i18n rationale keys', () => {
 		jest.resetModules();
+		const mockT = jest.fn((key: string) => key);
 		jest.doMock('../../i18n', () => ({
 			__esModule: true,
-			default: { t: (key: string) => key }
+			default: { t: mockT }
 		}));
 		jest.doMock('./helpers', () => ({
 			...jest.requireActual('./helpers'),
@@ -34,6 +35,9 @@ describe('requestPhoneStatePermission', () => {
 
 		requestPhoneStatePermission();
 
+		expect(mockT).toHaveBeenCalledWith('Ok');
+		expect(mockT).toHaveBeenCalledWith('Phone_state_permission_message');
+		expect(mockT).toHaveBeenCalledWith('Phone_state_permission_title');
 		expect(spy).toHaveBeenCalledWith(PermissionsAndroid.PERMISSIONS.READ_PHONE_STATE, {
 			buttonPositive: 'Ok',
 			message: 'Phone_state_permission_message',
@@ -45,7 +49,7 @@ describe('requestPhoneStatePermission', () => {
 		jest.resetModules();
 		jest.doMock('../../i18n', () => ({
 			__esModule: true,
-			default: { t: (key: string) => key }
+			default: { t: jest.fn((key: string) => key) }
 		}));
 		jest.doMock('./helpers', () => ({
 			...jest.requireActual('./helpers'),

app/lib/methods/voipPhoneStatePermission.ts

@@ -15,7 +15,7 @@ export const requestPhoneStatePermission = (): void => {
 	askedThisSession = true;
 
 	PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.READ_PHONE_STATE, {
-		buttonPositive: 'Ok',
+		buttonPositive: i18n.t('Ok'),
 		message: i18n.t('Phone_state_permission_message'),
 		title: i18n.t('Phone_state_permission_title')
 	});