Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-18 23:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Cleanup""

Browse Source 
This reverts commit b24e2dc756.
This commit is contained in:
M66B
2018-11-16 18:24:16 +01:00
parent b24e2dc756
commit e0b3123cdf
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@@ -454,22 +454,22 @@ public class FragmentSetup extends FragmentEx {
String password1 = etPassword1.getText().toString();
String password2 = etPassword2.getText().toString();
if (password1.equals(password2))
if (TextUtils.isEmpty(password1))
Snackbar.make(view, R.string.title_canceled, Snackbar.LENGTH_LONG).show();
else {
if (TextUtils.isEmpty(password1))
Snackbar.make(view, R.string.title_setup_password_missing, Snackbar.LENGTH_LONG).show();
else {
if (password1.equals(password2)) {
if (requestCode == ActivitySetup.REQUEST_EXPORT)
handleExport(data, password1);
else
handleImport(data, password1);
}
else
Snackbar.make(view, R.string.title_setup_password_different, Snackbar.LENGTH_LONG).show();
} else
Snackbar.make(view, R.string.title_setup_password_different, Snackbar.LENGTH_LONG).show();
}
}
})
.show();
} else
Snackbar.make(view, R.string.title_canceled, Snackbar.LENGTH_LONG).show();
}
}
private void onMenuPrivacy() {