Skip to content

Commit

Permalink
Merge branch 'develop' into chore/file-access-crashes-cherry-pick
Browse files Browse the repository at this point in the history
  • Loading branch information
@Garzas
Garzas authored May 14, 2024
2 parents 56aebba + 08879d3 commit d5d0a84
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 2 deletions.
6 changes: 6 additions & 0 deletions app/src/main/kotlin/com/wire/android/mapper/MessagePreviewContentMapper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,12 @@ fun MessagePreview.uiLastMessageContent(): UILastMessageContent {
else R.string.last_message_other_user_shared_location
)
)

is WithUser.Deleted -> UILastMessageContent.SenderWithMessage(
sender = userUIText,
message = UIText.StringResource(R.string.deleted_message_text),
separator = ":${MarkdownConstants.NON_BREAKING_SPACE}"
)
}
}

Expand Down
29 changes: 29 additions & 0 deletions .../main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationItemFactory.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ import com.wire.android.ui.home.conversationslist.model.BlockingState
import com.wire.android.ui.home.conversationslist.model.ConversationInfo
import com.wire.android.ui.home.conversationslist.model.ConversationItem
import com.wire.android.ui.home.conversationslist.model.toUserInfoLabel
import com.wire.android.ui.markdown.MarkdownConstants
import com.wire.android.util.permission.PermissionDenialType
import com.wire.android.util.ui.UIText
import com.wire.android.util.ui.toUIText
import com.wire.kalium.logic.data.conversation.Conversation
import com.wire.kalium.logic.data.conversation.MutedConversationStatus
import com.wire.kalium.logic.data.id.ConversationId
Expand Down Expand Up @@ -284,6 +286,33 @@ fun PreviewGroupConversationItemWithNoBadges() {
)
}

@Preview
@Composable
fun PreviewGroupConversationItemWithLastDeletedMessage() {
ConversationItemFactory(
conversation = ConversationItem.GroupConversation(
"groupName looooooooooooooooooooooooooooooooooooong",
conversationId = QualifiedID("value", "domain"),
mutedStatus = MutedConversationStatus.AllAllowed,
lastMessageContent = UILastMessageContent.SenderWithMessage(
"John".toUIText(),
UIText.StringResource(R.string.deleted_message_text),
":${MarkdownConstants.NON_BREAKING_SPACE}"
),
badgeEventType = BadgeEventType.None,
selfMemberRole = null,
teamId = null,
isArchived = false,
mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED
),
searchQuery = "",
isSelectableItem = false,
isChecked = false,
{}, {}, {}, {}, {}, {},
)
}

@Preview
@Composable
fun PreviewGroupConversationItemWithMutedBadgeAndUnreadMentionBadge() {
Expand Down
14 changes: 14 additions & 0 deletions app/src/test/kotlin/com/wire/android/mapper/MessagePreviewContentMapperTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,4 +372,18 @@ class MessagePreviewContentMapperTest {
previewString.count shouldBeEqualTo otherRemovedUsers.size
previewString.resId shouldBeEqualTo R.plurals.last_message_other_removed_other_users
}

@Test
fun givenLastMessageIsDeleted_whenMappingToUILastMessageContent_thenCorrectContentShouldBeReturned() =
runTest {
val messagePreview = TestMessage.PREVIEW.copy(
content = MessagePreviewContent.WithUser.Deleted("admin"),
isSelfMessage = false
)

val senderWithMessage = messagePreview.uiLastMessageContent().shouldBeInstanceOf<UILastMessageContent.SenderWithMessage>()
val result = senderWithMessage.message.shouldBeInstanceOf<UIText.StringResource>()

result.resId shouldBeEqualTo R.string.deleted_message_text
}
}
2 changes: 1 addition & 1 deletion features/sketch/src/main/java/com/wire/android/feature/sketch/DrawingCanvasViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class DrawingCanvasViewModel : ViewModel() {
Bitmap.Config.ARGB_8888
)
val canvas = Canvas(bitmap).apply { drawPaint(Paint().apply { color = Color.White.toArgb() }) }
context.contentResolver.openFileDescriptor(tempSketchFile, "rw")?.use { fileDescriptor ->
context.contentResolver.openFileDescriptor(tempSketchFile, "rwt")?.use { fileDescriptor ->
FileOutputStream(fileDescriptor.fileDescriptor).use { fileOutputStream ->
paths.forEach { path -> path.drawNative(canvas) }
bitmap.compress(Bitmap.CompressFormat.JPEG, QUALITY, fileOutputStream)
Expand Down
2 changes: 1 addition & 1 deletion kalium
Submodule kalium updated 75 files
+55 −0 .github/workflows/benchmarks-check.yml
+50 −0 .github/workflows/cherry-pick-pr-to-newer-release-cycle.yml
+0 −158 .github/workflows/cherry-pick-rc-to-develop.yml
+18 −0 benchmarks/README.md
+52 −0 benchmarks/build.gradle.kts
+80 −0 benchmarks/src/commonMain/kotlin/com/wire/kalium/benchmarks/persistence/DBTestSetup.kt
+163 −0 benchmarks/src/commonMain/kotlin/com/wire/kalium/benchmarks/persistence/MessagesNoPragmaTuneBenchmark.kt
+0 −0 benchmarks/src/jvmMain/kotlin/com/wire/kalium/benchmarks/.gitkeep
+1,374 −2,595 detekt/baseline.xml
+10 −1 gradle/libs.versions.toml
+14 −6 logic/src/androidMain/kotlin/com/wire/kalium/logic/CoreLogic.kt
+3 −3 logic/src/androidMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+3 −3 logic/src/androidMain/kotlin/com/wire/kalium/logic/feature/UserSessionScopeProviderImpl.kt
+22 −10 logic/src/appleMain/kotlin/com/wire/kalium/logic/CoreLogic.kt
+3 −2 logic/src/appleMain/kotlin/com/wire/kalium/logic/di/PlatformUserStorageProvider.kt
+3 −3 logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+3 −3 logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/UserSessionScopeProviderImpl.kt
+4 −4 logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreLogic.kt
+2 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/GlobalKaliumScope.kt
+3 −5 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt
+21 −10 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/e2ei/RevocationListChecker.kt
+1 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt
+1 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
+10 −13 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+3 −3 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/appVersioning/ObserveIfAppUpdateRequiredUseCase.kt
+3 −3 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/AuthenticationScope.kt
+4 −4 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/CertificateRevocationListCheckWorker.kt
+3 −3 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/CheckCrlRevocationListUseCase.kt
+3 −3 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/user/UserScope.kt
+3 −3 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MLSWelcomeEventHandler.kt
+9 −9 logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt
+37 −24 logic/src/commonTest/kotlin/com/wire/kalium/logic/data/e2ei/RevocationListCheckerTest.kt
+4 −4 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/CertificateRevocationListCheckWorkerTest.kt
+5 −5 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/CheckCrlRevocationListUseCaseTest.kt
+5 −5 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MLSWelcomeEventHandlerTest.kt
+17 −4 logic/src/jvmMain/kotlin/com/wire/kalium/logic/CoreLogic.kt
+3 −3 logic/src/jvmMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+3 −3 logic/src/jvmMain/kotlin/com/wire/kalium/logic/feature/UserSessionScopeProviderImpl.kt
+1 −0 monkeys/.gitignore
+3 −0 monkeys/README.md
+2 −0 monkeys/docker/docker-compose.yml
+12 −4 persistence-test/src/androidMain/kotlin/com/wire/kalium/persistence/TestDatabaseManipulation.kt
+11 −3 persistence-test/src/appleMain/kotlin/com/wire/kalium/persistence/TestDatabaseManipulation.kt
+3 −3 persistence-test/src/commonMain/kotlin/com/wire/kalium/persistence/TestGlobalDatabase.kt
+2 −2 persistence-test/src/jsMain/kotlin/com/wire/kalium/persistence/TestDatabaseManipulation.kt
+12 −4 persistence-test/src/jvmMain/kotlin/com/wire/kalium/persistence/TestDatabaseManipulation.kt
+1 −0 persistence/build.gradle.kts
+10 −4 persistence/src/androidInstrumentedTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt
+47 −0 persistence/src/androidMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabase.kt
+0 −95 persistence/src/androidMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabaseProvider.kt
+63 −0 persistence/src/androidMain/kotlin/com/wire/kalium/persistence/db/PlatformDatabaseData.kt
+9 −30 persistence/src/androidMain/kotlin/com/wire/kalium/persistence/db/UserDatabase.kt
+2 −2 persistence/src/androidUnitTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt
+54 −0 persistence/src/appleMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabase.kt
+0 −91 persistence/src/appleMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabaseProvider.kt
+66 −0 persistence/src/appleMain/kotlin/com/wire/kalium/persistence/db/PlatformDatabaseData.kt
+36 −42 persistence/src/appleMain/kotlin/com/wire/kalium/persistence/db/UserDatabase.kt
+2 −1 persistence/src/appleTest/kotlin/com/wire/kalium/persistence/BaseDatabaseTest.kt
+9 −3 persistence/src/appleTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt
+1 −1 persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessagePreview.sq
+1 −0 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt
+8 −0 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
+8 −13 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/DriverConfigurationBuilder.kt
+48 −41 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabaseBuilder.kt
+25 −0 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/PlatformDatabaseData.kt
+0 −7 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/db/UserDatabaseBuilder.kt
+2 −2 persistence/src/commonTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt
+18 −18 persistence/src/commonTest/kotlin/com/wire/kalium/persistence/daokaliumdb/ServerConfigurationDAOTest.kt
+33 −33 persistence/src/commonTest/kotlin/com/wire/kalium/persistence/globalDB/AccountsDAOTest.kt
+11 −12 persistence/src/jsMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabase.kt
+2 −2 persistence/src/jsTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt
+73 −0 persistence/src/jvmMain/kotlin/com/wire/kalium/persistence/db/GlobalDatabase.kt
+41 −0 persistence/src/jvmMain/kotlin/com/wire/kalium/persistence/db/PlatformDatabaseData.kt
+12 −25 persistence/src/jvmMain/kotlin/com/wire/kalium/persistence/db/UserDatabase.kt
+17 −4 persistence/src/jvmTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt

0 comments on commit d5d0a84

Please sign in to comment.