TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-31 07:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: broken tests and unnecessary ConversationUiState value for hosted open group

Browse Source
This commit is contained in:
0x330a
2022-10-26 14:49:46 +11:00
parent d5cf8e739f
commit 220c76cfee
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
View File

@@ -182,7 +182,6 @@ class ConversationViewModel(
data class UiMessage(val id: Long, val message: String)
data class ConversationUiState(
val isOxenHostedOpenGroup: Boolean = false,
val uiMessages: List<UiMessage> = emptyList(),
val isMessageRequestAccepted: Boolean? = null
)

7
app/src/test/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModelTest.kt
View File

@@ -5,7 +5,6 @@ import kotlinx.coroutines.flow.first
import org.hamcrest.CoreMatchers.endsWith
import org.hamcrest.CoreMatchers.equalTo
import org.hamcrest.MatcherAssert.assertThat
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.mockito.Mockito.anyLong
@@ -37,15 +36,9 @@ class ConversationViewModelTest: BaseViewModelTest() {
@Before
fun setUp() {
recipient = mock(Recipient::class.java)
whenever(repository.isOxenHostedOpenGroup(anyLong())).thenReturn(true)
whenever(repository.maybeGetRecipientForThreadId(anyLong())).thenReturn(recipient)
}
@Test
fun `should emit group type on init`() = runBlockingTest {
assertTrue(viewModel.uiState.first().isOxenHostedOpenGroup)
}
@Test
fun `should save draft message`() {
val draft = "Hi there"

2
app/src/test/java/org/thoughtcrime/securesms/util/OpenGroupMigrationTests.kt
View File

@@ -117,6 +117,7 @@ class OpenGroupMigrationTests {
fun `test migration thread DB calls legacy and returns if no legacy official groups`() {
val mockedThreadDb = mock<ThreadDatabase> {
on { legacyOxenOpenGroups } doReturn emptyList()
on { httpOxenOpenGroups } doReturn emptyList()
}
val mockedDbComponent = mock<DatabaseComponent> {
on { threadDatabase() } doReturn mockedThreadDb
@@ -126,6 +127,7 @@ class OpenGroupMigrationTests {
verify(mockedDbComponent).threadDatabase()
verify(mockedThreadDb).legacyOxenOpenGroups
verify(mockedThreadDb).httpOxenOpenGroups
verifyNoMoreInteractions(mockedThreadDb)
}

9
libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
View File

@@ -6,10 +6,10 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey
import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.protos.SignalServiceProtos.DataMessage
import org.session.libsignal.utilities.removingIdPrefixIfNeeded
import org.session.libsignal.utilities.toHexString
import org.session.libsignal.utilities.Hex
import org.session.libsignal.utilities.Log
import org.session.libsignal.utilities.removingIdPrefixIfNeeded
import org.session.libsignal.utilities.toHexString
class ClosedGroupControlMessage() : ControlMessage() {
var kind: Kind? = null
@@ -113,6 +113,11 @@ class ClosedGroupControlMessage() : ControlMessage() {
DataMessage.ClosedGroupControlMessage.Type.MEMBER_LEFT -> {
kind = Kind.MemberLeft()
}
DataMessage.ClosedGroupControlMessage.Type.INVITE -> TODO()
DataMessage.ClosedGroupControlMessage.Type.PROMOTE -> TODO()
DataMessage.ClosedGroupControlMessage.Type.DELETE_GROUP -> TODO()
DataMessage.ClosedGroupControlMessage.Type.DELETE_MESSAGES -> TODO()
DataMessage.ClosedGroupControlMessage.Type.DELETE_ATTACHMENTS -> TODO()
}
return ClosedGroupControlMessage(kind)
}