From f185a71f468e533a1d287570b52367bc882c6f0f Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 16 Nov 2020 10:00:47 +0100 Subject: [PATCH] Improved error message --- app/src/main/java/eu/faircode/email/ActivitySetup.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 57b84205f8..ef77e78882 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -739,8 +739,10 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac } String json = data.toString(); - if (!json.startsWith("{") || !json.endsWith("}")) - throw new BadPaddingException("JSON"); + if (!json.startsWith("{") || !json.endsWith("}")) { + Log.i("Invalid JSON"); + throw new IllegalArgumentException(context.getString(R.string.title_setup_password_invalid)); + } Log.i("Importing data"); JSONObject jimport = new JSONObject(json);