From 7c6a283af4dad634c4e76aacf213221941d3eef3 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 14 Nov 2018 20:07:06 +0100 Subject: [PATCH] Check for empty password --- .../main/java/eu/faircode/email/FragmentSetup.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 6c9fabedfe..1e8af30ce0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -36,6 +36,7 @@ import android.os.Bundle; import android.os.PowerManager; import android.preference.PreferenceManager; import android.provider.Settings; +import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -454,10 +455,14 @@ public class FragmentSetup extends FragmentEx { String password1 = etPassword1.getText().toString(); String password2 = etPassword2.getText().toString(); if (password1.equals(password2)) - if (requestCode == ActivitySetup.REQUEST_EXPORT) - handleExport(data, password1); - else - handleImport(data, password1); + if (TextUtils.isEmpty(password1)) + Snackbar.make(view, R.string.title_canceled, Snackbar.LENGTH_LONG).show(); + else { + 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(); }