Merge branch 'release/candidate' into chore/add-fdroid-screen-shots-a…

…nd-description
wireapp · Aug 27, 2024 · 3b40cbd · 3b40cbd
2 parents 28ad832 + 7f72679
commit 3b40cbd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/build-prod-app.yml b/.github/workflows/build-prod-app.yml
@@ -117,5 +117,5 @@ jobs:
         uses: softprops/[email protected]
         with:
           files: |
-            app/build/outputs/apk/prodCompatrelease/*.apk
+            app/build/outputs/apk/prod/compatrelease/*.apk
             app/version.txt
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsScreen.kt
@@ -26,7 +26,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.ramcosta.composedestinations.annotation.RootNavGraph
-import com.wire.android.BuildConfig
 import com.wire.android.R
 import com.wire.android.navigation.Navigator
 import com.wire.android.ui.common.colorsScheme
@@ -51,6 +50,7 @@ fun PrivacySettingsConfigScreen(
     with(viewModel) {
         PrivacySettingsScreenContent(
             isAnonymousUsageDataEnabled = state.isAnalyticsUsageEnabled,
+            shouldShowAnalyticsUsage = state.shouldShowAnalyticsUsage,
             areReadReceiptsEnabled = state.areReadReceiptsEnabled,
             setReadReceiptsState = ::setReadReceiptsState,
             isTypingIndicatorEnabled = state.isTypingIndicatorEnabled,
@@ -66,6 +66,7 @@ fun PrivacySettingsConfigScreen(
 @Composable
 fun PrivacySettingsScreenContent(
     isAnonymousUsageDataEnabled: Boolean,
+    shouldShowAnalyticsUsage: Boolean,
     areReadReceiptsEnabled: Boolean,
     setReadReceiptsState: (Boolean) -> Unit,
     isTypingIndicatorEnabled: Boolean,
@@ -91,7 +92,7 @@ fun PrivacySettingsScreenContent(
                 .fillMaxSize()
                 .padding(internalPadding)
         ) {
-            if (BuildConfig.ANALYTICS_ENABLED) {
+            if (shouldShowAnalyticsUsage) {
                 GroupConversationOptionsItem(
                     title = stringResource(id = R.string.settings_send_anonymous_usage_data_title),
                     switchState = SwitchState.Enabled(value = isAnonymousUsageDataEnabled, onCheckedChange = setAnonymousUsageDataEnabled),
@@ -143,6 +144,7 @@ fun PrivacySettingsScreenContent(
 fun PreviewSendReadReceipts() = WireTheme {
     PrivacySettingsScreenContent(
         isAnonymousUsageDataEnabled = true,
+        shouldShowAnalyticsUsage = true,
         areReadReceiptsEnabled = true,
         setReadReceiptsState = {},
         isTypingIndicatorEnabled = true,

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsViewModel.kt
@@ -90,6 +90,7 @@ class PrivacySettingsViewModel @Inject constructor(
         }
 
         viewModelScope.launch {
+            // TODO(Analytics): To be changed with UseCase
             val isAnalyticsConfigurationEnabled = analyticsEnabled is AnalyticsConfiguration.Enabled
             val isValidBackend = when (val serverConfig = selfServerConfig()) {
                 is SelfServerConfigUseCase.Result.Success ->

diff --git a/build-logic/plugins/src/main/kotlin/AppVersionPlugin.kt b/build-logic/plugins/src/main/kotlin/AppVersionPlugin.kt
@@ -41,7 +41,7 @@ class AppVersionPlugin : Plugin<Project> {
                 // git commit hash code
                 val gitRevision = "git rev-parse --short HEAD".execute().text.trim()
                 println("VersionCode: $versionCode")
-                println("VersionName: $versionName")
+                println("VersionName: $versionName-fdroid")
                 println("Revision: $gitRevision")
                 println("Buildtime: $buildTime")
                 println("Application-name: $appName")

diff --git a/default.json b/default.json
@@ -9,7 +9,8 @@
             "mls_support_enabled": false,
             "analytics_enabled": false,
             "analytics_app_key": "4483f7a58ae3e70b3780319c4ccb5c88a037be49",
-            "analytics_server_url": "https://countly.wire.com/"
+            "analytics_server_url": "https://countly.wire.com/",
+            "is_password_protected_guest_link_enabled": false
         },
         "dev": {
             "application_id": "com.waz.zclient.dev",
@@ -88,7 +89,8 @@
             "mls_support_enabled": false,
             "analytics_enabled": false,
             "analytics_app_key": "",
-            "analytics_server_url": ""
+            "analytics_server_url": "",
+            "is_password_protected_guest_link_enabled": false
         }
     },
     "application_name": "Wire",