diff --git a/app/src/main/java/org/mercury_im/messenger/ui/account/AndroidLoginViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/account/AndroidLoginViewModel.java index c7a592c..2ec530d 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/account/AndroidLoginViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/account/AndroidLoginViewModel.java @@ -37,7 +37,6 @@ public class AndroidLoginViewModel extends AndroidViewModel implements MercuryAn @Inject public AndroidLoginViewModel(Application application) { super(application); - reset(); } diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppAccountRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/XmppAccountRepository.java index 69e1134..0b250dc 100644 --- a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppAccountRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/XmppAccountRepository.java @@ -3,12 +3,11 @@ package org.mercury_im.messenger.data.repository; import org.mercury_im.messenger.data.mapping.AccountMapping; import org.mercury_im.messenger.data.model.AccountModel; import org.mercury_im.messenger.data.repository.dao.AccountDao; -import org.mercury_im.messenger.util.Optional; import org.mercury_im.messenger.entity.Account; +import org.mercury_im.messenger.util.Optional; import org.mercury_im.messenger.util.ThreadUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.UUID; diff --git a/domain/src/main/java/org/mercury_im/messenger/viewmodel/accounts/LoginViewModel.java b/domain/src/main/java/org/mercury_im/messenger/viewmodel/accounts/LoginViewModel.java index 22867d8..6675445 100644 --- a/domain/src/main/java/org/mercury_im/messenger/viewmodel/accounts/LoginViewModel.java +++ b/domain/src/main/java/org/mercury_im/messenger/viewmodel/accounts/LoginViewModel.java @@ -24,7 +24,6 @@ import javax.inject.Named; import io.reactivex.Observable; import io.reactivex.Scheduler; -import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; import io.reactivex.subjects.BehaviorSubject; @@ -55,6 +54,8 @@ public class LoginViewModel implements MercuryViewModel { this.accountRepository = accountRepository; this.ioScheduler = ioScheduler; this.uiScheduler = uiScheduler; + + reset(); } public void reset() {