From d99e0c893fe9d9a52f6f71edb930910f214c3471 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 2 Nov 2020 08:09:34 +0100 Subject: [PATCH] Check decrypted json --- app/src/main/java/eu/faircode/email/ActivitySetup.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 4108e2c69c..57b84205f8 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -738,8 +738,12 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac data.append(line); } + String json = data.toString(); + if (!json.startsWith("{") || !json.endsWith("}")) + throw new BadPaddingException("JSON"); + Log.i("Importing data"); - JSONObject jimport = new JSONObject(data.toString()); + JSONObject jimport = new JSONObject(json); DB db = DB.getInstance(context); NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);