From 9bb2b6bd142b55e738ee5c339bf2651dbadc6528 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 15 Nov 2019 08:22:57 +0100
Subject: [PATCH] Added identity menu item to clear sign key

---
 .../eu/faircode/email/AdapterIdentity.java    | 31 ++++++++++++++++++-
 .../eu/faircode/email/EntityIdentity.java     |  2 +-
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index 62e7d49832..18629f2bc4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -168,7 +168,10 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
             popupMenu.getMenu().add(Menu.NONE, R.string.title_enabled, 1, R.string.title_enabled)
                     .setCheckable(true).setChecked(identity.synchronize);
 
-            popupMenu.getMenu().add(Menu.NONE, R.string.title_copy, 2, R.string.title_copy);
+            if (identity.sign_key != null)
+                popupMenu.getMenu().add(Menu.NONE, R.string.title_reset_sign_key, 2, R.string.title_reset_sign_key);
+
+            popupMenu.getMenu().add(Menu.NONE, R.string.title_copy, 3, R.string.title_copy);
 
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
@@ -178,6 +181,10 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
                             onActionSync(!item.isChecked());
                             return true;
 
+                        case R.string.title_reset_sign_key:
+                            onActionClearSignKey();
+                            return true;
+
                         case R.string.title_copy:
                             onActionCopy();
                             return true;
@@ -213,6 +220,28 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
                     }.execute(context, owner, args, "identitty:enable");
                 }
 
+                private void onActionClearSignKey() {
+                    Bundle args = new Bundle();
+                    args.putLong("id", identity.id);
+
+                    new SimpleTask<Boolean>() {
+                        @Override
+                        protected Boolean onExecute(Context context, Bundle args) {
+                            long id = args.getLong("id");
+
+                            DB db = DB.getInstance(context);
+                            db.identity().setIdentitySignKey(id, null);
+
+                            return null;
+                        }
+
+                        @Override
+                        protected void onException(Bundle args, Throwable ex) {
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
+                        }
+                    }.execute(context, owner, args, "identitty:clear_sign_key");
+                }
+
                 private void onActionCopy() {
                     LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
                     lbm.sendBroadcast(
diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index d75eff3627..0d6bf89f5e 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -256,7 +256,7 @@ public class EntityIdentity {
                     Objects.equals(this.sender_extra_regex, other.sender_extra_regex) &&
                     Objects.equals(this.replyto, other.replyto) &&
                     Objects.equals(this.bcc, other.bcc) &&
-                    this.encrypt.equals(other.encrypt) &&
+                    Objects.equals(this.sign_key, other.sign_key) &&
                     Objects.equals(this.tbd, other.tbd) &&
                     Objects.equals(this.state, other.state) &&
                     Objects.equals(this.error, other.error) &&
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 42940fd238..6f8fb5e8d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -690,6 +690,7 @@
     <string name="title_resync">Resync</string>
     <string name="title_no_openpgp">OpenKeychain not found</string>
     <string name="title_not_encrypted">Message is not encrypted</string>
+    <string name="title_reset_sign_key">Reset sign key</string>
 
     <string name="title_signature_none">Message not signed</string>
     <string name="title_signature_valid">Message signature valid</string>