filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix after rebase

This commit is contained in:
Maxime NATUREL 2022-10-11 14:28:03 +02:00
parent 3adc5ca430
commit 4aca1dcb24
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionInfoView.kt
View File

@ -184,6 +184,7 @@ class SessionInfoView @JvmOverloads constructor(
} }
views.sessionInfoLastIPAddressTextView.setTextOrHide(deviceInfo.lastSeenIp?.takeIf { isLastSeenDetailsVisible }) views.sessionInfoLastIPAddressTextView.setTextOrHide(deviceInfo.lastSeenIp?.takeIf { isLastSeenDetailsVisible })
views.sessionInfoLastIPAddressTextView.text = "XX.XXX.XXX.XX"
} }
private fun renderDetailsButton(isDetailsButtonVisible: Boolean) { private fun renderDetailsButton(isDetailsButtonVisible: Boolean) {

9
vector/src/test/java/im/vector/app/test/fakes/FakePushersService.kt
View File

@ -20,6 +20,7 @@ import androidx.lifecycle.liveData
import io.mockk.Ordering import io.mockk.Ordering
import io.mockk.coVerify import io.mockk.coVerify
import io.mockk.every import io.mockk.every
import io.mockk.justRun
import io.mockk.mockk import io.mockk.mockk
import io.mockk.slot import io.mockk.slot
import io.mockk.verify import io.mockk.verify
@ -45,4 +46,12 @@ class FakePushersService : PushersService by mockk(relaxed = true) {
verify { enqueueAddHttpPusher(capture(httpPusherSlot)) } verify { enqueueAddHttpPusher(capture(httpPusherSlot)) }
return httpPusherSlot.captured return httpPusherSlot.captured
} }
fun givenRefreshPushersSucceeds() {
justRun { refreshPushers() }
}
fun verifyRefreshPushers() {
verify { refreshPushers() }
}
} }

2
vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
View File

@ -45,7 +45,6 @@ class FakeSession(
private val fakeEventService: FakeEventService = FakeEventService(), private val fakeEventService: FakeEventService = FakeEventService(),
val fakeSessionAccountDataService: FakeSessionAccountDataService = FakeSessionAccountDataService(), val fakeSessionAccountDataService: FakeSessionAccountDataService = FakeSessionAccountDataService(),
val fakeFilterService: FakeFilterService = FakeFilterService(), val fakeFilterService: FakeFilterService = FakeFilterService(),
val fakePushersService: FakePushersService = FakePushersService(),
) : Session by mockk(relaxed = true) { ) : Session by mockk(relaxed = true) {
init { init {
@ -65,7 +64,6 @@ class FakeSession(
override fun pushersService() = fakePushersService override fun pushersService() = fakePushersService
override fun accountDataService() = fakeSessionAccountDataService override fun accountDataService() = fakeSessionAccountDataService
override fun filterService() = fakeFilterService override fun filterService() = fakeFilterService
override fun pushersService() = fakePushersService
fun givenVectorStore(vectorSessionStore: VectorSessionStore) { fun givenVectorStore(vectorSessionStore: VectorSessionStore) {
coEvery { coEvery {