From 935d2f0e609727e3ea98ad9b33e2c832daf98691 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 23 Jun 2019 10:28:33 +0200 Subject: [PATCH] Simplifications --- app/src/main/java/eu/faircode/email/Core.java | 10 +++++----- .../main/java/eu/faircode/email/EntityOperation.java | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 8be207e4cf..87764ec653 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -460,8 +460,8 @@ class Core { DB db = DB.getInstance(context); // Get arguments - long target = (jargs.length() > 0 ? jargs.getLong(0) : folder.id); - boolean autoread = (jargs.length() > 1 && jargs.getBoolean(1)); + long target = jargs.optLong(0, folder.id); + boolean autoread = jargs.optBoolean(1, false); if (target != folder.id) throw new IllegalArgumentException("Invalid folder"); @@ -582,7 +582,7 @@ class Core { // Get arguments long id = jargs.getLong(0); - boolean autoread = (jargs.length() > 1 && jargs.getBoolean(1)); + boolean autoread = jargs.optBoolean(1, false); // Get source message Message imessage = ifolder.getMessageByUID(message.uid); @@ -947,8 +947,8 @@ class Core { int sync_days = jargs.getInt(0); int keep_days = jargs.getInt(1); - boolean download = (jargs.length() > 2 && jargs.getBoolean(2)); - boolean auto_delete = (jargs.length() > 3 && jargs.getBoolean(3)); + boolean download = jargs.optBoolean(2, false); + boolean auto_delete = jargs.optBoolean(3, false); if (keep_days == sync_days) keep_days++; diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java index 4362775916..8250ce957d 100644 --- a/app/src/main/java/eu/faircode/email/EntityOperation.java +++ b/app/src/main/java/eu/faircode/email/EntityOperation.java @@ -123,8 +123,7 @@ public class EntityOperation { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); boolean autoread = prefs.getBoolean("autoread", false); - if (jargs.length() > 1) - autoread = (autoread && jargs.getBoolean(1)); + autoread = (autoread && jargs.optBoolean(1, true)); jargs.put(1, autoread); EntityFolder source = db.folder().getFolder(message.folder);