From cc223ef7a1f69cbce2dbf9a56ff018434dfef5f6 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 6 Dec 2019 16:01:36 +0100 Subject: [PATCH] Settings backward compatibility --- .../java/eu/faircode/email/ActivitySetup.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 91affb5c11..7a0e96269b 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -886,14 +886,16 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac db.account().updateAccount(account); } - JSONArray jcertificates = jimport.getJSONArray("certificates"); - for (int c = 0; c < jcertificates.length(); c++) { - JSONObject jcertificate = (JSONObject) jcertificates.get(c); - EntityCertificate certificate = EntityCertificate.fromJSON(jcertificate); - EntityCertificate record = db.certificate().getCertificate(certificate.fingerprint, certificate.email); - if (record == null) { - db.certificate().insertCertificate(certificate); - Log.i("Imported certificate=" + certificate.email); + if (jimport.has("certificates")) { + JSONArray jcertificates = jimport.getJSONArray("certificates"); + for (int c = 0; c < jcertificates.length(); c++) { + JSONObject jcertificate = (JSONObject) jcertificates.get(c); + EntityCertificate certificate = EntityCertificate.fromJSON(jcertificate); + EntityCertificate record = db.certificate().getCertificate(certificate.fingerprint, certificate.email); + if (record == null) { + db.certificate().insertCertificate(certificate); + Log.i("Imported certificate=" + certificate.email); + } } }