From 0d2d084d8ee7db4f14e6d0dd55b38def79296512 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 9 Apr 2023 21:50:38 +0200 Subject: [PATCH] Refactoring --- .../eu/faircode/email/FragmentDialogSwipes.java | 15 ++++++++------- .../java/eu/faircode/email/FragmentGmail.java | 2 +- .../java/eu/faircode/email/FragmentOAuth.java | 2 +- .../eu/faircode/email/FragmentQuickSetup.java | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSwipes.java b/app/src/main/java/eu/faircode/email/FragmentDialogSwipes.java index 8ac6302a60..e32eda7332 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogSwipes.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogSwipes.java @@ -97,7 +97,7 @@ public class FragmentDialogSwipes extends FragmentDialogBase { List accounts = db.account().getAccounts(); for (EntityAccount account : accounts) if (account.protocol == EntityAccount.TYPE_IMAP) - setDefaultFolderActions(context, account.id); + setDefaultFolderActions(context, account); db.setTransactionSuccessful(); } finally { @@ -123,19 +123,20 @@ public class FragmentDialogSwipes extends FragmentDialogBase { .create(); } - static void setDefaultFolderActions(Context context, long account) { + static void setDefaultFolderActions(Context context, @NonNull EntityAccount account) { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - int leftPos = prefs.getInt("swipe_left_default", 2); // Trash - int rightPos = prefs.getInt("swipe_right_default", 1); // Archive + final int leftPos = prefs.getInt("swipe_left_default", 2); // Trash + final int rightPos = prefs.getInt("swipe_right_default", 1); // Archive List actions = getFolderActions(context); EntityFolder left = (leftPos < 0 || leftPos >= actions.size() ? null : actions.get(leftPos)); EntityFolder right = (rightPos < 0 || rightPos >= actions.size() ? null : actions.get(rightPos)); + account.swipe_left = getAction(context, left == null ? 0 : left.id, account.id); + account.swipe_right = getAction(context, right == null ? 0 : right.id, account.id); + DB db = DB.getInstance(context); - db.account().setAccountSwipes(account, - getAction(context, left == null ? 0 : left.id, account), - getAction(context, right == null ? 0 : right.id, account)); + db.account().setAccountSwipes(account.id, account.swipe_left, account.swipe_right); } static List getFolderActions(Context context) { diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java index 9fc23be352..098187e09c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentGmail.java +++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java @@ -558,7 +558,7 @@ public class FragmentGmail extends FragmentBase { account.swipe_left = EntityMessage.SWIPE_ACTION_DELETE; account.swipe_right = EntityMessage.SWIPE_ACTION_SEEN; } else - FragmentDialogSwipes.setDefaultFolderActions(context, account.id); + FragmentDialogSwipes.setDefaultFolderActions(context, account); db.account().updateAccount(account); diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java index bfac4c0bfd..d410f5b275 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java +++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java @@ -944,7 +944,7 @@ public class FragmentOAuth extends FragmentBase { account.swipe_left = EntityMessage.SWIPE_ACTION_DELETE; account.swipe_right = EntityMessage.SWIPE_ACTION_SEEN; } else - FragmentDialogSwipes.setDefaultFolderActions(context, account.id); + FragmentDialogSwipes.setDefaultFolderActions(context, account); db.account().updateAccount(account); diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java index 9811aada47..93904a3bb4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java @@ -622,7 +622,7 @@ public class FragmentQuickSetup extends FragmentBase { } // Set swipe left/right folder - FragmentDialogSwipes.setDefaultFolderActions(context, account.id); + FragmentDialogSwipes.setDefaultFolderActions(context, account); // Create identity EntityIdentity identity = new EntityIdentity();