wip

Author: luckyrat

lib/cubit/account_cubit.dart

@@ -392,7 +392,7 @@ class AccountCubit extends Cubit<AccountState> {
     return false;
   }
 
-  Future<void> changeEmailAddress(String password, String newEmailAddress) async {
+  Future<bool> changeEmailAddress(String password, String newEmailAddress) async {
     l.d('starting the changeEmailAddress procedure');
     User user = currentUser;
     try {
@@ -411,6 +411,7 @@ class AccountCubit extends Cubit<AccountState> {
       //TODO: verify that we can only get here if Vault is already locked. Throw exception earlier if we can detect that state?
       emit(AccountChosen(newUser));
       //await BlocProvider.of<AccountCubit>(context).forgetUser(vc.signout);
+      return true;
     } on KeeLoginFailedMITMException {
       rethrow;
     } on KeeLoginRequiredException {
@@ -448,7 +449,7 @@ class AccountCubit extends Cubit<AccountState> {
       // }
       // emit(AccountAuthenticationBypassed(user));
     }
-    return;
+    return false;
   }
 
   Future<void> signout() async {

lib/cubit/vault_cubit.dart

@@ -831,8 +831,8 @@ class VaultCubit extends Cubit<VaultState> {
     }
 
     if (currentVaultFile == null || (!currentVaultFile!.files.current.isDirty && !entryBeingEdited)) {
-      signout();
       _accountCubit.emailUnverified();
+      signout();
     } else {
       emitError(
           'Your email address has not yet been verified. Please check your emails and do that now. If you want us to resend the email, save your vault then sign out and back in again.',