Fix issue when encryption settings rotated

pull/898/head
Alex Baker 4 years ago
parent 3f9736b869
commit ad39228a2c

@ -19,7 +19,6 @@ import com.etesync.journalmanager.Crypto;
import com.etesync.journalmanager.Crypto.CryptoManager;
import com.etesync.journalmanager.Exceptions.IntegrityException;
import com.etesync.journalmanager.Exceptions.VersionTooNewException;
import com.etesync.journalmanager.GsonHelper;
import com.etesync.journalmanager.UserInfoManager.UserInfo;
import com.google.android.material.snackbar.Snackbar;
import java.net.ConnectException;

@ -50,9 +50,24 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct
addAccountViewModel = ViewModelProviders.of(this).get(AddEteSyncAccountViewModel.class);
updateAccountViewModel = ViewModelProviders.of(this).get(UpdateEteSyncAccountViewModel.class);
}
@Override
protected void onResume() {
super.onResume();
if (!isFinishing()) {
addAccountViewModel.observe(this, this::addAccount, this::requestFailed);
updateAccountViewModel.observe(this, this::updateAccount, this::requestFailed);
}
}
@Override
protected void onPause() {
super.onPause();
addAccountViewModel.observe(this, this::addAccount, this::requestFailed);
updateAccountViewModel.observe(this, this::updateAccount, this::requestFailed);
addAccountViewModel.removeObserver(this);
updateAccountViewModel.removeObserver(this);
}
@Override

@ -50,4 +50,9 @@ public abstract class CompletableViewModel<T> extends ViewModel {
protected void onCleared() {
disposables.dispose();
}
public void removeObserver(LifecycleOwner owner) {
data.removeObservers(owner);
error.removeObservers(owner);
}
}

Loading…
Cancel
Save