filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix test + lint

Browse Source
This commit is contained in:
Valere 2020-11-25 17:17:48 +01:00
parent a8b5a5227f
commit bcd86977d2
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
View File

@ -310,7 +310,10 @@ class UiAllScreensSanityTest {
clickOn(R.id.createChatRoomButton) clickOn(R.id.createChatRoomButton)
withIdlingResource(activityIdlingResource(CreateDirectRoomActivity::class.java)) { withIdlingResource(activityIdlingResource(CreateDirectRoomActivity::class.java)) {
assertDisplayed(R.id.addByMatrixId) onView(withId(R.id.userListRecyclerView))
.perform(waitForView(withText(R.string.qr_code)))
onView(withId(R.id.userListRecyclerView))
.perform(waitForView(withText(R.string.invite_friends)))
} }
closeSoftKeyboard() closeSoftKeyboard()

1
vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
View File

@ -47,7 +47,6 @@ class UserCodeSharedViewModel @AssistedInject constructor(
companion object : MvRxViewModelFactory<UserCodeSharedViewModel, UserCodeState> { companion object : MvRxViewModelFactory<UserCodeSharedViewModel, UserCodeState> {
override fun create(viewModelContext: ViewModelContext, state: UserCodeState): UserCodeSharedViewModel? { override fun create(viewModelContext: ViewModelContext, state: UserCodeState): UserCodeSharedViewModel? {
val args = viewModelContext.args<UserCodeActivity.Args>()
val factory = when (viewModelContext) { val factory = when (viewModelContext) {
is FragmentViewModelContext -> viewModelContext.fragment as? Factory is FragmentViewModelContext -> viewModelContext.fragment as? Factory
is ActivityViewModelContext -> viewModelContext.activity as? Factory is ActivityViewModelContext -> viewModelContext.activity as? Factory

1
vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
View File

@ -63,7 +63,6 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
is FragmentViewModelContext -> viewModelContext.fragment as? Factory is FragmentViewModelContext -> viewModelContext.fragment as? Factory
is ActivityViewModelContext -> viewModelContext.activity as? Factory is ActivityViewModelContext -> viewModelContext.activity as? Factory
} }
val args = viewModelContext.args<UserListFragmentArgs>()
return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface") return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
} }
} }