mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 21:48:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Import and adapt Terms Of Service management: SDK and UI (compiling) - still fixing issue

Browse source
This commit is contained in:
Benoit Marty 2020-05-07 21:09:03 +02:00
parent e86460b578
commit 426171508e
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt
View file

@ -20,7 +20,6 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.lifecycle.Observer
import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.fragmentViewModel
import com.airbnb.mvrx.withState import com.airbnb.mvrx.withState
import im.vector.matrix.android.api.session.identity.ThreePid import im.vector.matrix.android.api.session.identity.ThreePid
@ -29,6 +28,7 @@ import im.vector.riotx.R
import im.vector.riotx.core.extensions.cleanup import im.vector.riotx.core.extensions.cleanup
import im.vector.riotx.core.extensions.configureWith import im.vector.riotx.core.extensions.configureWith
import im.vector.riotx.core.extensions.exhaustive import im.vector.riotx.core.extensions.exhaustive
import im.vector.riotx.core.extensions.observeEvent
import im.vector.riotx.core.platform.VectorBaseActivity import im.vector.riotx.core.platform.VectorBaseActivity
import im.vector.riotx.core.platform.VectorBaseFragment import im.vector.riotx.core.platform.VectorBaseFragment
import im.vector.riotx.features.discovery.change.SetIdentityServerFragment import im.vector.riotx.features.discovery.change.SetIdentityServerFragment
@ -56,11 +56,12 @@ class DiscoverySettingsFragment @Inject constructor(
controller.listener = this controller.listener = this
recyclerView.configureWith(controller) recyclerView.configureWith(controller)
sharedViewModel.navigateEvent.observe(viewLifecycleOwner, Observer { sharedViewModel.navigateEvent.observeEvent(this) {
if (it.peekContent().first == DiscoverySharedViewModel.NEW_IDENTITY_SERVER_SET_REQUEST) { when (it) {
viewModel.handle(DiscoverySettingsAction.ChangeIdentityServer(it.peekContent().second)) is DiscoverySharedViewModelAction.ChangeIdentityServer ->
} viewModel.handle(DiscoverySettingsAction.ChangeIdentityServer(it.newUrl))
}) }.exhaustive
}
viewModel.observeViewEvents { viewModel.observeViewEvents {
when (it) { when (it) {

17
vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModel.kt
View file

@ -17,19 +17,18 @@ package im.vector.riotx.features.discovery
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import im.vector.riotx.core.extensions.postLiveEvent
import im.vector.riotx.core.utils.LiveEvent import im.vector.riotx.core.utils.LiveEvent
import javax.inject.Inject import javax.inject.Inject
// TODO Rework this sealed class DiscoverySharedViewModelAction {
data class ChangeIdentityServer(val newUrl: String) : DiscoverySharedViewModelAction()
}
class DiscoverySharedViewModel @Inject constructor() : ViewModel() { class DiscoverySharedViewModel @Inject constructor() : ViewModel() {
var navigateEvent = MutableLiveData<LiveEvent<DiscoverySharedViewModelAction>>()
var navigateEvent = MutableLiveData<LiveEvent<Pair<String, String>>>() fun requestChangeToIdentityServer(serverUrl: String) {
navigateEvent.postLiveEvent(DiscoverySharedViewModelAction.ChangeIdentityServer(serverUrl))
companion object {
const val NEW_IDENTITY_SERVER_SET_REQUEST = "NEW_IDENTITY_SERVER_SET_REQUEST"
}
fun requestChangeToIdentityServer(server: String) {
navigateEvent.postValue(LiveEvent(NEW_IDENTITY_SERVER_SET_REQUEST to server))
} }
} }