diff --git a/app/src/main/kotlin/com/wire/android/ui/analytics/AnalyticsUsageViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/analytics/AnalyticsUsageViewModel.kt index 25d3dc17ff..d42c464e10 100644 --- a/app/src/main/kotlin/com/wire/android/ui/analytics/AnalyticsUsageViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/analytics/AnalyticsUsageViewModel.kt @@ -44,14 +44,14 @@ class AnalyticsUsageViewModel @Inject constructor( val isDialogSeen = dataStore.isAnalyticsDialogSeen().first() val isAnalyticsUsageEnabled = dataStore.isAnonymousUsageDataEnabled().first() val isAnalyticsConfigurationEnabled = analyticsEnabled is AnalyticsConfiguration.Enabled - val isProdBackend = when (val serverConfig = selfServerConfig()) { + val isValidBackend = when (val serverConfig = selfServerConfig()) { is SelfServerConfigUseCase.Result.Success -> serverConfig.serverLinks.links.api == ServerConfig.PRODUCTION.api || serverConfig.serverLinks.links.api == ServerConfig.STAGING.api is SelfServerConfigUseCase.Result.Failure -> false } - val shouldShowDialog = isProdBackend && !isAnalyticsUsageEnabled && isAnalyticsConfigurationEnabled && !isDialogSeen + val shouldShowDialog = isValidBackend && !isAnalyticsUsageEnabled && isAnalyticsConfigurationEnabled && !isDialogSeen state = state.copy( shouldDisplayDialog = shouldShowDialog diff --git a/app/src/main/kotlin/com/wire/android/ui/home/HomeDialogs.kt b/app/src/main/kotlin/com/wire/android/ui/home/HomeDialogs.kt index e369d241cf..8c6e2d2622 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/HomeDialogs.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/HomeDialogs.kt @@ -86,7 +86,7 @@ fun AnalyticsUsageDialog( type = WireDialogButtonType.Secondary ), buttonsHorizontalAlignment = false, - onDismiss = declineOption + onDismiss = {} ) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f310a1e03..cca81b0c5c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1012,7 +1012,7 @@ In group conversations, the group admin can overwrite this setting. When this is on, you see when other people are writing a message, and others notice when you are typing. This setting applies to all conversations on this device. Lock with passcode Send anonymous usage data - Usage data allows Wire to understand how the app is being used and how it can be improved. The data is anonymous and does not include the content of your communications (such as messages, files, locations, or calls). + Help to improve the app by sharing usage data with Wire. The data is anonymous and doesn\'t include any content of your communication (such as messages, files, location, or calls). Set app lock passcode The app will lock itself after %1$s of inactivity. To unlock the app you need to enter this passcode or use biometric authentication.\n\nMake sure to remember this passcode as there is no way to recover it. @@ -1164,7 +1164,7 @@ In group conversations, the group admin can overwrite this setting. Are you sure you want to cancel? Consent to share user data - Help to improve Wire by sharing your usage data via a pseudonymous ID.\n\nThe data is neither linked to your personal information nor shared with third parties besides Zeta Project Germany GmbH. It includes, for example, when you use a feature, your app version, device type, or your operating system. The ID will be deleted at the latest from your device after [28] days after the last activity.\n\nFind further details in our Privacy Policy (link). You can revoke your consent at any time. + Help to improve Wire by sharing your usage data via a pseudonymous ID. The data is neither linked to your personal information nor shared with third parties besides Zeta Project Germany GmbH. It includes, for example, when you use a feature, your app version, device type, or your operating system. The ID will be deleted at the latest from your device after 365 days after the last activity.Find further details in our\n\nPrivacy Policy (link). You can revoke your consent at any time. Agree Decline Privacy Policy