Merge branch 'release/candidate' into ANR-when-recording-an-audio

wireapp · Jun 24, 2024 · a9122f9 · a9122f9
2 parents 3d797ca + 1ca3341
commit a9122f9
Show file tree

Hide file tree

Showing 11 changed files with 119 additions and 89 deletions.
diff --git a/.github/workflows/cherry-pick-pr-to-newer-release-cycle.yml b/.github/workflows/cherry-pick-pr-to-newer-release-cycle.yml
@@ -31,7 +31,7 @@ jobs:
         if: github.event.pull_request.merged == true
 
         env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            GITHUB_TOKEN: ${{ secrets.ANDROID_BOB_GH_TOKEN }}
 
         steps:
             - name: Checkout

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -44,11 +44,10 @@ repositories {
     google()
 }
 
-fun isFossSourceSet(): Boolean {
-    return (Variants_gradle.Default.explicitBuildFlavor() ?: gradle.startParameter.taskRequests.toString())
-        .lowercase()
-        .contains("fdroid")
-}
+val nonFreeFlavors = setOf("prod", "internal", "staging", "beta", "dev")
+val fossFlavors = setOf("fdroid")
+val allFlavors = nonFreeFlavors + fossFlavors
+
 android {
     // Most of the configuration is done in the build-logic
     // through the Wire Application convention plugin
@@ -64,21 +63,17 @@ android {
     }
     android.buildFeatures.buildConfig = true
 
-    val fdroidBuild = isFossSourceSet()
-
     sourceSets {
-        // Add the "foss" sourceSets for the fdroid flavor
-        if (fdroidBuild) {
-            getByName("fdroid") {
-                java.srcDirs("src/foss/kotlin", "src/prod/kotlin")
-                res.srcDirs("src/prod/res")
-                println("Building with FOSS sourceSets")
-            }
-            // For all other flavors use the "nonfree" sourceSets
-        } else {
-            getByName("main") {
-                java.srcDirs("src/nonfree/kotlin")
-                println("Building with non-free sourceSets")
+        allFlavors.forEach { flavor ->
+            getByName(flavor) {
+                if (flavor in fossFlavors) {
+                    java.srcDirs("src/foss/kotlin", "src/prod/kotlin")
+                    res.srcDirs("src/prod/res")
+                    println("Adding FOSS sourceSets to '$flavor' flavor")
+                } else {
+                    java.srcDirs("src/nonfree/kotlin")
+                    println("Adding non-free sourceSets to '$flavor' flavor")
+                }
             }
         }
     }
@@ -181,15 +176,15 @@ dependencies {
     implementation(libs.resaca.hilt)
     implementation(libs.bundlizer.core)
 
-    var fdroidBuild = isFossSourceSet()
-
-    if (!fdroidBuild) {
-        // firebase
-        implementation(platform(libs.firebase.bom))
-        implementation(libs.firebase.fcm)
-        implementation(libs.googleGms.location)
-    } else {
-        println("Excluding FireBase for FDroid build")
+    allFlavors.forEach { flavor ->
+        if (flavor in nonFreeFlavors) {
+            println("Adding nonfree libraries to '$flavor' flavor")
+            add("${flavor}Implementation", platform(libs.firebase.bom))
+            add("${flavor}Implementation", libs.firebase.fcm)
+            add("${flavor}Implementation", libs.googleGms.location)
+        } else {
+            println("Skipping nonfree libraries for '$flavor' flavor")
+        }
     }
     implementation(libs.androidx.work)
 

diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/devices/DeviceItem.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/devices/DeviceItem.kt
@@ -183,13 +183,15 @@ private fun DeviceItemTexts(
         )
         if (shouldShowVerifyLabel) {
             if (shouldShowE2EIInfo) {
-                MLSVerificationIcon(device.e2eiCertificateStatus)
+                MLSVerificationIcon(device.e2eiCertificate?.status)
             }
             Spacer(modifier = Modifier.width(MaterialTheme.wireDimensions.spacing8x))
-            if (device.isVerifiedProteus && !isCurrentClient) ProteusVerifiedIcon(
-                Modifier
-                    .wrapContentWidth()
-                    .align(Alignment.CenterVertically))
+            if (device.isVerifiedProteus && !isCurrentClient) {
+                ProteusVerifiedIcon(
+                    Modifier
+                        .wrapContentWidth()
+                        .align(Alignment.CenterVertically))
+            }
         }
     }
 
@@ -206,15 +208,15 @@ private fun DeviceItemTexts(
 
     Spacer(modifier = Modifier.height(MaterialTheme.wireDimensions.removeDeviceItemTitleVerticalPadding))
 
-    device.mlsPublicKeys?.values?.firstOrNull()?.let { mlsThumbprint ->
+    device.e2eiCertificate?.let { certificate ->
         Text(
             style = MaterialTheme.wireTypography.subline01,
             color = MaterialTheme.wireColorScheme.labelText,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
             text = stringResource(
                 R.string.remove_device_mls_thumbprint_label,
-                mlsThumbprint.formatAsFingerPrint()
+                certificate.thumbprint.formatAsFingerPrint()
             ),
             modifier = Modifier
                 .fillMaxWidth()

diff --git a/app/src/main/kotlin/com/wire/android/ui/authentication/devices/model/Device.kt b/app/src/main/kotlin/com/wire/android/ui/authentication/devices/model/Device.kt
@@ -26,7 +26,7 @@ import com.wire.android.R
 import com.wire.android.util.ui.UIText
 import com.wire.kalium.logic.data.client.Client
 import com.wire.kalium.logic.data.conversation.ClientId
-import com.wire.kalium.logic.feature.e2ei.CertificateStatus
+import com.wire.kalium.logic.feature.e2ei.E2eiCertificate
 import com.wire.kalium.logic.util.inWholeWeeks
 import com.wire.kalium.util.DateTimeUtil.toIsoDateTimeString
 import kotlinx.datetime.Clock
@@ -38,18 +38,16 @@ data class Device(
     val lastActiveInWholeWeeks: Int? = null,
     val isValid: Boolean = true,
     val isVerifiedProteus: Boolean = false,
-    val mlsPublicKeys: Map<String, String>? = null,
-    val e2eiCertificateStatus: CertificateStatus? = null
+    val e2eiCertificate: E2eiCertificate? = null
 ) {
-    constructor(client: Client, e2eiCertificateStatus: CertificateStatus? = null) : this(
+    constructor(client: Client, e2eiCertificate: E2eiCertificate? = null) : this(
         name = client.displayName(),
         clientId = client.id,
         registrationTime = client.registrationTime?.toIsoDateTimeString(),
         lastActiveInWholeWeeks = client.lastActiveInWholeWeeks(),
         isValid = client.isValid,
         isVerifiedProteus = client.isVerified,
-        mlsPublicKeys = client.mlsPublicKeys,
-        e2eiCertificateStatus = e2eiCertificateStatus
+        e2eiCertificate = e2eiCertificate
     )
 
     fun updateFromClient(client: Client): Device = copy(
@@ -59,11 +57,11 @@ data class Device(
         lastActiveInWholeWeeks = client.lastActiveInWholeWeeks(),
         isValid = client.isValid,
         isVerifiedProteus = client.isVerified,
-        mlsPublicKeys = client.mlsPublicKeys,
+        e2eiCertificate = null,
     )
 
-    fun updateE2EICertificateStatus(e2eiCertificateStatus: CertificateStatus): Device = copy(
-        e2eiCertificateStatus = e2eiCertificateStatus
+    fun updateE2EICertificate(e2eiCertificate: E2eiCertificate): Device = copy(
+        e2eiCertificate = e2eiCertificate
     )
 }
 

diff --git a/...rc/main/kotlin/com/wire/android/ui/home/conversations/messages/item/RegularMessageItem.kt b/...rc/main/kotlin/com/wire/android/ui/home/conversations/messages/item/RegularMessageItem.kt
@@ -301,34 +301,8 @@ private fun SwipableToReplyBox(
     var didVibrateOnCurrentDrag by remember { mutableStateOf(false) }
 
     // Finish the animation in the first 25% of the drag
-    val progressUntilAnimationCompletion = 0.33f
+    val progressUntilAnimationCompletion = 0.25f
     val dragWidth = screenWidth * progressUntilAnimationCompletion
-    val dragState = remember {
-        AnchoredDraggableState(
-            initialValue = SwipeAnchor.CENTERED,
-            positionalThreshold = { dragWidth },
-            velocityThreshold = { screenWidth },
-            snapAnimationSpec = tween(),
-            decayAnimationSpec = splineBasedDecay(density),
-            confirmValueChange = { changedValue ->
-                if (changedValue == SwipeAnchor.START_TO_END) {
-                    // Attempt to finish dismiss, notify reply intention
-                    onSwipedToReply()
-                }
-                if (changedValue == SwipeAnchor.CENTERED) {
-                    // Reset the haptic feedback when drag is stopped
-                    didVibrateOnCurrentDrag = false
-                }
-                // Reject state change, only allow returning back to rest position
-                changedValue == SwipeAnchor.CENTERED
-            },
-            anchors = DraggableAnchors {
-                SwipeAnchor.CENTERED at 0f
-                SwipeAnchor.START_TO_END at screenWidth
-            }
-        )
-    }
-    val primaryColor = colorsScheme().primary
 
     val currentViewConfiguration = LocalViewConfiguration.current
     val scopedViewConfiguration = object : ViewConfiguration by currentViewConfiguration {
@@ -337,6 +311,33 @@ private fun SwipableToReplyBox(
             get() = currentViewConfiguration.touchSlop * 3f
     }
     CompositionLocalProvider(LocalViewConfiguration provides scopedViewConfiguration) {
+        val dragState = remember {
+            AnchoredDraggableState(
+                initialValue = SwipeAnchor.CENTERED,
+                positionalThreshold = { dragWidth },
+                velocityThreshold = { screenWidth },
+                snapAnimationSpec = tween(),
+                decayAnimationSpec = splineBasedDecay(density),
+                confirmValueChange = { changedValue ->
+                    if (changedValue == SwipeAnchor.START_TO_END) {
+                        // Attempt to finish dismiss, notify reply intention
+                        onSwipedToReply()
+                    }
+                    if (changedValue == SwipeAnchor.CENTERED) {
+                        // Reset the haptic feedback when drag is stopped
+                        didVibrateOnCurrentDrag = false
+                    }
+                    // Reject state change, only allow returning back to rest position
+                    changedValue == SwipeAnchor.CENTERED
+                },
+                anchors = DraggableAnchors {
+                    SwipeAnchor.CENTERED at 0f
+                    SwipeAnchor.START_TO_END at screenWidth
+                }
+            )
+        }
+        val primaryColor = colorsScheme().primary
+
         Box(
             modifier = modifier.fillMaxSize(),
         ) {

diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt
@@ -90,8 +90,11 @@ import com.wire.android.util.deviceDateTimeFormat
 import com.wire.android.util.ui.UIText
 import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.data.conversation.ClientId
+import com.wire.kalium.logic.feature.e2ei.CertificateStatus
+import com.wire.kalium.logic.feature.e2ei.E2eiCertificate
 import com.wire.kalium.logic.feature.e2ei.usecase.E2EIEnrollmentResult
 import com.wire.kalium.logic.functional.Either
+import kotlinx.datetime.Instant
 
 @RootNavGraph
 @Destination(
@@ -126,6 +129,7 @@ fun DeviceDetailsScreen(
     }
 }
 
+@Suppress("ComplexMethod")
 @Composable
 fun DeviceDetailsContent(
     state: DeviceDetailsState,
@@ -185,9 +189,9 @@ fun DeviceDetailsContent(
                 .background(MaterialTheme.wireColorScheme.surface)
         ) {
 
-            state.device.mlsPublicKeys?.forEach { (mlsProtocolType, mlsThumbprint) ->
+            state.device.e2eiCertificate?.let { certificate ->
                 item {
-                    DeviceMLSSignatureItem(mlsThumbprint, mlsProtocolType, screenState::copyMessage)
+                    DeviceMLSSignatureItem(certificate.thumbprint, screenState::copyMessage)
                     HorizontalDivider(color = MaterialTheme.wireColorScheme.background)
                 }
             }
@@ -321,7 +325,7 @@ private fun DeviceDetailsTopBar(
                 )
 
                 if (shouldShowE2EIInfo) {
-                    MLSVerificationIcon(device.e2eiCertificateStatus)
+                    MLSVerificationIcon(device.e2eiCertificate?.status)
                 }
 
                 if (!isCurrentDevice && device.isVerifiedProteus) {
@@ -371,17 +375,9 @@ fun DeviceKeyFingerprintItem(
 @Composable
 fun DeviceMLSSignatureItem(
     mlsThumbprint: String,
-    mlsProtocolType: String,
     onCopy: (String) -> Unit
 ) {
 
-    FolderHeader(
-        name = stringResource(id = R.string.label_mls_signature, mlsProtocolType).uppercase(),
-        modifier = Modifier
-            .background(MaterialTheme.wireColorScheme.background)
-            .fillMaxWidth()
-    )
-
     DeviceDetailSectionContent(
         stringResource(id = R.string.label_mls_thumbprint),
         sectionText = mlsThumbprint.formatAsFingerPrint(),
@@ -576,7 +572,14 @@ fun PreviewDeviceDetailsScreen() {
                 clientId = ClientId(""),
                 name = UIText.DynamicString("My Device"),
                 registrationTime = "2022-03-24T18:02:30.360Z",
-                mlsPublicKeys = mapOf("Ed25519" to "lekvmrlkgvnrelkmvrlgkvlknrgb0348gi34t09gj34v034ithjoievw")
+                e2eiCertificate = E2eiCertificate(
+                    "handler",
+                    CertificateStatus.VALID,
+                    "serial",
+                    "Details",
+                    "Thumbprint",
+                    Instant.DISTANT_FUTURE
+                )
             ),
             isCurrentDevice = false
         ),

diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt
@@ -119,7 +119,7 @@ class DeviceDetailsViewModel @Inject constructor(
                     isE2eiCertificateActivated = true,
                     e2eiCertificate = certificate.certificate,
                     isLoadingCertificate = false,
-                    device = state.device.updateE2EICertificateStatus(certificate.certificate.status)
+                    device = state.device.updateE2EICertificate(certificate.certificate)
                 )
             } else {
                 state.copy(isE2eiCertificateActivated = false, isLoadingCertificate = false)

diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/SelfDevicesViewModel.kt
@@ -70,10 +70,10 @@ class SelfDevicesViewModel @Inject constructor(
                             isLoadingClientsList = false,
                             currentDevice = result.clients
                                 .firstOrNull { it.id == currentClientId }
-                                ?.let { Device(it, e2eiCertificates[it.id.value]?.status) },
+                                ?.let { Device(it, e2eiCertificates[it.id.value]) },
                             deviceList = result.clients
                                 .filter { it.id != currentClientId }
-                                .map { Device(it, e2eiCertificates[it.id.value]?.status) }
+                                .map { Device(it, e2eiCertificates[it.id.value]) }
                         )
                     }
                 }

diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserDevicesScreen.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserDevicesScreen.kt
@@ -124,7 +124,7 @@ private fun OtherUserDevicesContent(
                     onClickAction = onDeviceClick,
                     icon = Icons.Filled.ChevronRight.Icon(),
                     shouldShowVerifyLabel = true,
-                    shouldShowE2EIInfo = item.e2eiCertificateStatus != null
+                    shouldShowE2EIInfo = item.e2eiCertificate != null
                 )
                 if (index < otherUserDevices.lastIndex) WireDivider()
             }

diff --git a/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreenViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreenViewModel.kt
@@ -167,7 +167,7 @@ class OtherUserProfileScreenViewModel @Inject constructor(
 
                         is ObserveClientsByUserIdUseCase.Result.Success -> {
                             state = state.copy(otherUserDevices = it.clients.map { item ->
-                                Device(item, e2eiCertificates[item.id.value]?.status)
+                                Device(item, e2eiCertificates[item.id.value])
                             })
                         }
                     }