From 6890f83810dba3783d4971feb1cdb112b40e37c2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 24 Sep 2019 10:47:29 +0200 Subject: [PATCH] Cleanup dead code --- .../riotx/features/home/HomeActivity.kt | 15 ----------- .../features/home/HomeActivityViewModel.kt | 25 +------------------ 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt index 2a43ca705a..c3636cde7a 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt @@ -16,7 +16,6 @@ package im.vector.riotx.features.home -import android.app.ProgressDialog import android.content.Context import android.content.Intent import android.os.Bundle @@ -66,8 +65,6 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable { @Inject lateinit var pushManager: PushersManager @Inject lateinit var notificationDrawerManager: NotificationDrawerManager - private var progress: ProgressDialog? = null - private val drawerListener = object : DrawerLayout.SimpleDrawerListener() { override fun onDrawerStateChanged(newState: Int) { hideKeyboard() @@ -93,18 +90,6 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable { replaceFragment(homeDrawerFragment, R.id.homeDrawerFragmentContainer) } - homeActivityViewModel.isLoading.observe(this, Observer { - // TODO better UI - if (it) { - progress?.dismiss() - progress = ProgressDialog(this) - progress?.setMessage(getString(R.string.room_recents_create_room)) - progress?.show() - } else { - progress?.dismiss() - } - }) - navigationViewModel.navigateTo.observeEvent(this) { navigation -> when (navigation) { is Navigation.OpenDrawer -> drawerLayout.openDrawer(GravityCompat.START) diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt index 36d5725561..f8c1eca19e 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt @@ -16,8 +16,6 @@ package im.vector.riotx.features.home -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData import arrow.core.Option import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.MvRxState @@ -25,11 +23,9 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject -import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.rx.rx import im.vector.riotx.core.platform.VectorViewModel import im.vector.riotx.features.home.group.ALL_COMMUNITIES_GROUP_ID @@ -61,10 +57,6 @@ class HomeActivityViewModel @AssistedInject constructor(@Assisted initialState: } - private val _isLoading = MutableLiveData() - val isLoading: LiveData - get() = _isLoading - init { session.addListener(this) observeRoomAndGroup() @@ -93,7 +85,7 @@ class HomeActivityViewModel @AssistedInject constructor(@Assisted initialState: .filter { !it.isDirect } .filter { selectedGroup?.groupId == ALL_COMMUNITIES_GROUP_ID - || selectedGroup?.roomIds?.contains(it.roomId) ?: true + || selectedGroup?.roomIds?.contains(it.roomId) ?: true } filteredDirectRooms + filteredGroupRooms } @@ -104,21 +96,6 @@ class HomeActivityViewModel @AssistedInject constructor(@Assisted initialState: .disposeOnClear() } - fun createRoom(createRoomParams: CreateRoomParams = CreateRoomParams()) { - _isLoading.value = true - - session.createRoom(createRoomParams, object : MatrixCallback { - override fun onSuccess(data: String) { - _isLoading.value = false - } - - override fun onFailure(failure: Throwable) { - _isLoading.value = false - super.onFailure(failure) - } - }) - } - override fun onCleared() { super.onCleared()