From efba726dc863e8703a43d7d7e78e613f12feaf1d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 13 Aug 2019 12:07:30 +0200
Subject: [PATCH] Added account/identity copy

---
 FAQ.md                                        |  2 +-
 .../eu/faircode/email/AdapterAccount.java     | 14 +++++
 .../eu/faircode/email/AdapterIdentity.java    | 15 ++++++
 .../eu/faircode/email/FragmentAccount.java    | 54 ++++++++++---------
 .../eu/faircode/email/FragmentIdentity.java   | 10 ++--
 5 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index b2c9157594..d8303739eb 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -49,7 +49,7 @@ For authorizing:
 * ~~[Autocrypt Setup Message](https://autocrypt.org/autocrypt-spec-1.0.0.pdf) (section 4.4)~~ (IMO it is not a good idea to let an email client handle sensitive encryption keys for an exceptional use case while OpenKeychain can export keys too)
 * ~~Generic unified folders~~
 * ~~New message notification schedules per account~~ (implemented by added a time condition to rules, so messages can be snoozed in selected periods)
-* Copy accounts and identities
+* ~~Copy accounts and identities~~
 
 Anything on this list is in random order and *might* be added in the near future.
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 0e69015be4..5e7df21932 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -214,6 +214,8 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                     popupMenu.getMenu().add(Menu.NONE, R.string.title_edit_channel, 2, R.string.title_edit_channel);
             }
 
+            popupMenu.getMenu().add(Menu.NONE, R.string.title_copy, 3, R.string.title_copy);
+
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
                 public boolean onMenuItemClick(MenuItem item) {
@@ -226,6 +228,10 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                             onActionEditChannel();
                             return true;
 
+                        case R.string.title_copy:
+                            onActionCopy();
+                            return true;
+
                         default:
                             return false;
                     }
@@ -271,6 +277,14 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                             .putExtra(Settings.EXTRA_CHANNEL_ID, EntityAccount.getNotificationChannelId(account.id));
                     context.startActivity(intent);
                 }
+
+                private void onActionCopy() {
+                    LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
+                    lbm.sendBroadcast(
+                            new Intent(settings ? ActivitySetup.ACTION_EDIT_ACCOUNT : ActivityView.ACTION_VIEW_FOLDERS)
+                                    .putExtra("id", account.id)
+                                    .putExtra("copy", true));
+                }
             });
 
             popupMenu.show();
diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index 18e1c5cbff..f15fe97460 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -167,6 +167,8 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
             popupMenu.getMenu().add(Menu.NONE, R.string.title_synchronize_enabled, 1, R.string.title_synchronize_enabled)
                     .setCheckable(true).setChecked(identity.synchronize);
 
+            popupMenu.getMenu().add(Menu.NONE, R.string.title_copy, 2, R.string.title_copy);
+
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
                 public boolean onMenuItemClick(MenuItem item) {
@@ -174,6 +176,11 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
                         case R.string.title_synchronize_enabled:
                             onActionSync(!item.isChecked());
                             return true;
+
+                        case R.string.title_copy:
+                            onActionCopy();
+                            return true;
+
                         default:
                             return false;
                     }
@@ -204,6 +211,14 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
                         }
                     }.execute(context, owner, args, "identitty:enable");
                 }
+
+                private void onActionCopy() {
+                    LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
+                    lbm.sendBroadcast(
+                            new Intent(ActivitySetup.ACTION_EDIT_IDENTITY)
+                                    .putExtra("id", identity.id)
+                                    .putExtra("copy", true));
+                }
             });
 
             popupMenu.show();
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index c580d12f06..0b8f5ecd8a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -135,6 +135,7 @@ public class FragmentAccount extends FragmentBase {
     private Group grpFolders;
 
     private long id = -1;
+    private long copy = -1;
     private boolean saving = false;
     private int color = Color.TRANSPARENT;
 
@@ -151,7 +152,10 @@ public class FragmentAccount extends FragmentBase {
 
         // Get arguments
         Bundle args = getArguments();
-        id = args.getLong("id", -1);
+        if (args.getBoolean("copy"))
+            copy = args.getLong("id", -1);
+        else
+            id = args.getLong("id", -1);
     }
 
     @Override
@@ -1114,7 +1118,7 @@ public class FragmentAccount extends FragmentBase {
         super.onActivityCreated(savedInstanceState);
 
         Bundle args = new Bundle();
-        args.putLong("id", id);
+        args.putLong("id", copy < 0 ? id : copy);
 
         new SimpleTask<EntityAccount>() {
             @Override
@@ -1213,34 +1217,36 @@ public class FragmentAccount extends FragmentBase {
                 // Consider previous check/save/delete as cancelled
                 pbWait.setVisibility(View.GONE);
 
-                args.putLong("account", account == null ? -1 : account.id);
+                if (copy < 0) {
+                    args.putLong("account", account == null ? -1 : account.id);
 
-                new SimpleTask<List<EntityFolder>>() {
-                    @Override
-                    protected List<EntityFolder> onExecute(Context context, Bundle args) {
-                        long account = args.getLong("account");
+                    new SimpleTask<List<EntityFolder>>() {
+                        @Override
+                        protected List<EntityFolder> onExecute(Context context, Bundle args) {
+                            long account = args.getLong("account");
 
-                        DB db = DB.getInstance(context);
-                        List<EntityFolder> folders = db.folder().getFolders(account, false, true);
+                            DB db = DB.getInstance(context);
+                            List<EntityFolder> folders = db.folder().getFolders(account, false, true);
 
-                        if (folders != null && folders.size() > 0)
-                            Collections.sort(folders, folders.get(0).getComparator(null));
+                            if (folders != null && folders.size() > 0)
+                                Collections.sort(folders, folders.get(0).getComparator(null));
 
-                        return folders;
-                    }
+                            return folders;
+                        }
 
-                    @Override
-                    protected void onExecuted(Bundle args, List<EntityFolder> folders) {
-                        if (folders == null)
-                            folders = new ArrayList<>();
-                        setFolders(folders, account);
-                    }
+                        @Override
+                        protected void onExecuted(Bundle args, List<EntityFolder> folders) {
+                            if (folders == null)
+                                folders = new ArrayList<>();
+                            setFolders(folders, account);
+                        }
 
-                    @Override
-                    protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
-                    }
-                }.execute(FragmentAccount.this, args, "account:folders");
+                        @Override
+                        protected void onException(Bundle args, Throwable ex) {
+                            Helper.unexpectedError(getFragmentManager(), ex);
+                        }
+                    }.execute(FragmentAccount.this, args, "account:folders");
+                }
             }
 
             @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 9a95d61635..da2f4d74a6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -124,6 +124,7 @@ public class FragmentIdentity extends FragmentBase {
     private Group grpAdvanced;
 
     private long id = -1;
+    private long copy = -1;
     private boolean saving = false;
     private int color = Color.TRANSPARENT;
 
@@ -138,7 +139,10 @@ public class FragmentIdentity extends FragmentBase {
 
         // Get arguments
         Bundle args = getArguments();
-        id = args.getLong("id", -1);
+        if (args.getBoolean("copy"))
+            copy = args.getLong("id", -1);
+        else
+            id = args.getLong("id", -1);
     }
 
     @Override
@@ -826,7 +830,7 @@ public class FragmentIdentity extends FragmentBase {
         super.onActivityCreated(savedInstanceState);
 
         Bundle args = new Bundle();
-        args.putLong("id", id);
+        args.putLong("id", copy < 0 ? id : copy);
 
         new SimpleTask<EntityIdentity>() {
             @Override
@@ -867,7 +871,7 @@ public class FragmentIdentity extends FragmentBase {
 
                     color = (identity == null || identity.color == null ? Color.TRANSPARENT : identity.color);
 
-                    if (identity == null)
+                    if (identity == null || copy > 0)
                         new SimpleTask<Integer>() {
                             @Override
                             protected Integer onExecute(Context context, Bundle args) {