mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 15:11:03 +00:00
Code Issues Releases Wiki Activity

Check for empty password

Browse source
This commit is contained in:
M66B 2018-11-14 20:07:06 +01:00
parent c3394e3bbe
commit 7c6a283af4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/FragmentSetup.java
View file

@ -36,6 +36,7 @@ import android.os.Bundle;
import android.os.PowerManager; import android.os.PowerManager;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@ -454,10 +455,14 @@ public class FragmentSetup extends FragmentEx {
String password1 = etPassword1.getText().toString(); String password1 = etPassword1.getText().toString();
String password2 = etPassword2.getText().toString(); String password2 = etPassword2.getText().toString();
if (password1.equals(password2)) if (password1.equals(password2))
if (requestCode == ActivitySetup.REQUEST_EXPORT) if (TextUtils.isEmpty(password1))
handleExport(data, password1); Snackbar.make(view, R.string.title_canceled, Snackbar.LENGTH_LONG).show();
else else {
handleImport(data, password1); if (requestCode == ActivitySetup.REQUEST_EXPORT)
handleExport(data, password1);
else
handleImport(data, password1);
}
else else
Snackbar.make(view, R.string.title_setup_password_different, Snackbar.LENGTH_LONG).show(); Snackbar.make(view, R.string.title_setup_password_different, Snackbar.LENGTH_LONG).show();
} }