chore: show button to register FCM push token in debug tools

Author: MohamadJaara

app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptions.kt

@@ -215,19 +215,19 @@ fun DebugDataOptionsContent(
                     onCopyText = onCopyText
                 )
             }
-
-            DebugToolsOptions(
-                isEventProcessingEnabled = state.isEventProcessingDisabled,
-                onDisableEventProcessingChange = onDisableEventProcessingChange,
-                onRestartSlowSyncForRecovery = onRestartSlowSyncForRecovery,
-                onForceUpdateApiVersions = onForceUpdateApiVersions,
-                checkCrlRevocationList = checkCrlRevocationList,
-                onResendFCMToken = onResendFCMToken,
-                isAsyncNotificationsEnabled = state.isAsyncNotificationsEnabled,
-                onEnableAsyncNotificationsChange = onEnableAsyncNotificationsChange
-            )
         }
 
+        DebugToolsOptions(
+            isEventProcessingEnabled = state.isEventProcessingDisabled,
+            onDisableEventProcessingChange = onDisableEventProcessingChange,
+            onRestartSlowSyncForRecovery = onRestartSlowSyncForRecovery,
+            onForceUpdateApiVersions = onForceUpdateApiVersions,
+            checkCrlRevocationList = checkCrlRevocationList,
+            onResendFCMToken = onResendFCMToken,
+            isAsyncNotificationsEnabled = state.isAsyncNotificationsEnabled,
+            onEnableAsyncNotificationsChange = onEnableAsyncNotificationsChange
+        )
+
         if (state.startGettingE2EICertificate) {
             GetE2EICertificateUI(
                 enrollmentResultHandler = { handleE2EIEnrollmentResult(it) },
@@ -368,95 +368,78 @@ private fun DebugToolsOptions(
 ) {
     SectionHeader(stringResource(R.string.label_debug_tools_title))
     Column {
-        DisableEventProcessingSwitch(
-            isEnabled = isEventProcessingEnabled,
-            onCheckedChange = onDisableEventProcessingChange
-        )
-        RowItemTemplate(
-            modifier = Modifier.wrapContentWidth(),
-            title = {
-                Text(
-                    style = MaterialTheme.wireTypography.body01,
-                    color = MaterialTheme.wireColorScheme.onBackground,
-                    text = stringResource(R.string.label_restart_slowsync_for_recovery),
-                    modifier = Modifier.padding(start = dimensions().spacing8x)
-                )
-            },
-            actions = {
-                WirePrimaryButton(
-                    minSize = MaterialTheme.wireDimensions.buttonMediumMinSize,
-                    minClickableSize = MaterialTheme.wireDimensions.buttonMinClickableSize,
-                    onClick = onRestartSlowSyncForRecovery,
-                    text = stringResource(R.string.restart_slowsync_for_recovery_button),
-                    fillMaxWidth = false
-                )
-            }
-        )
+        if (BuildConfig.PRIVATE_BUILD) {
 
-        // checkCrlRevocationList
-        RowItemTemplate(
-            modifier = Modifier.wrapContentWidth(),
-            title = {
-                Text(
-                    style = MaterialTheme.wireTypography.body01,
-                    color = MaterialTheme.wireColorScheme.onBackground,
-                    text = "CRL revocation check",
-                    modifier = Modifier.padding(start = dimensions().spacing8x)
-                )
-            },
-            actions = {
-                WirePrimaryButton(
-                    minSize = MaterialTheme.wireDimensions.buttonMediumMinSize,
-                    minClickableSize = MaterialTheme.wireDimensions.buttonMinClickableSize,
-                    onClick = checkCrlRevocationList,
-                    text = stringResource(R.string.debug_settings_force_api_versioning_update_button_text),
-                    fillMaxWidth = false
-                )
-            }
-        )
+            DisableEventProcessingSwitch(
+                isEnabled = isEventProcessingEnabled,
+                onCheckedChange = onDisableEventProcessingChange
+            )
+            RowItemTemplate(
+                modifier = Modifier.wrapContentWidth(),
+                title = {
+                    Text(
+                        style = MaterialTheme.wireTypography.body01,
+                        color = MaterialTheme.wireColorScheme.onBackground,
+                        text = stringResource(R.string.label_restart_slowsync_for_recovery),
+                        modifier = Modifier.padding(start = dimensions().spacing8x)
+                    )
+                },
+                actions = {
+                    WirePrimaryButton(
+                        minSize = MaterialTheme.wireDimensions.buttonMediumMinSize,
+                        minClickableSize = MaterialTheme.wireDimensions.buttonMinClickableSize,
+                        onClick = onRestartSlowSyncForRecovery,
+                        text = stringResource(R.string.restart_slowsync_for_recovery_button),
+                        fillMaxWidth = false
+                    )
+                }
+            )
 
-        RowItemTemplate(
-            modifier = Modifier.wrapContentWidth(),
-            title = {
-                Text(
-                    style = MaterialTheme.wireTypography.body01,
-                    color = MaterialTheme.wireColorScheme.onBackground,
-                    text = stringResource(R.string.debug_settings_force_api_versioning_update),
-                    modifier = Modifier.padding(start = dimensions().spacing8x)
-                )
-            },
-            actions = {
-                WirePrimaryButton(
-                    minSize = MaterialTheme.wireDimensions.buttonMediumMinSize,
-                    minClickableSize = MaterialTheme.wireDimensions.buttonMinClickableSize,
-                    onClick = onForceUpdateApiVersions,
-                    text = stringResource(R.string.debug_settings_force_api_versioning_update_button_text),
-                    fillMaxWidth = false
-                )
-            }
-        )
+            // checkCrlRevocationList
+            RowItemTemplate(
+                modifier = Modifier.wrapContentWidth(),
+                title = {
+                    Text(
+                        style = MaterialTheme.wireTypography.body01,
+                        color = MaterialTheme.wireColorScheme.onBackground,
+                        text = "CRL revocation check",
+                        modifier = Modifier.padding(start = dimensions().spacing8x)
+                    )
+                },
+                actions = {
+                    WirePrimaryButton(
+                        minSize = MaterialTheme.wireDimensions.buttonMediumMinSize,
+                        minClickableSize = MaterialTheme.wireDimensions.buttonMinClickableSize,
+                        onClick = checkCrlRevocationList,
+                        text = stringResource(R.string.debug_settings_force_api_versioning_update_button_text),
+                        fillMaxWidth = false
+                    )
+                }
+            )
 
-        if (BuildConfig.PRIVATE_BUILD) {
             RowItemTemplate(
                 modifier = Modifier.wrapContentWidth(),
                 title = {
                     Text(
                         style = MaterialTheme.wireTypography.body01,
                         color = MaterialTheme.wireColorScheme.onBackground,
-                        text = stringResource(R.string.debug_settings_register_fcm_push_token),
+                        text = stringResource(R.string.debug_settings_force_api_versioning_update),
                         modifier = Modifier.padding(start = dimensions().spacing8x)
                     )
                 },
                 actions = {
                     WirePrimaryButton(
                         minSize = MaterialTheme.wireDimensions.buttonMediumMinSize,
                         minClickableSize = MaterialTheme.wireDimensions.buttonMinClickableSize,
-                        onClick = onResendFCMToken,
+                        onClick = onForceUpdateApiVersions,
                         text = stringResource(R.string.debug_settings_force_api_versioning_update_button_text),
                         fillMaxWidth = false
                     )
                 }
             )
+        }
+        RegisterFCMPushTokenButton(onClick = onResendFCMToken)
+        if (BuildConfig.PRIVATE_BUILD) {
             EnableAsyncNotifications(isAsyncNotificationsEnabled, onEnableAsyncNotificationsChange)
         }
     }
@@ -491,6 +474,32 @@ private fun DisableEventProcessingSwitch(
     )
 }
 
+@Composable
+private fun RegisterFCMPushTokenButton(
+    onClick: () -> Unit,
+) {
+    RowItemTemplate(
+        modifier = Modifier.wrapContentWidth(),
+        title = {
+            Text(
+                style = MaterialTheme.wireTypography.body01,
+                color = MaterialTheme.wireColorScheme.onBackground,
+                text = stringResource(R.string.debug_settings_register_fcm_push_token),
+                modifier = Modifier.padding(start = dimensions().spacing8x)
+            )
+        },
+        actions = {
+            WirePrimaryButton(
+                minSize = MaterialTheme.wireDimensions.buttonMediumMinSize,
+                minClickableSize = MaterialTheme.wireDimensions.buttonMinClickableSize,
+                onClick = onClick,
+                text = stringResource(R.string.debug_settings_force_api_versioning_update_button_text),
+                fillMaxWidth = false
+            )
+        }
+    )
+}
+
 @Composable
 private fun EnableAsyncNotifications(
     isEnabled: Boolean = false,