From e4d3ecea7f6c8bf50ea5cf4a1b8845c79c6cc92b Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 5 Jan 2017 21:18:18 +0100
Subject: get rid of unecessary config debug paramater that has been replaced
 by exepert setting

---
 src/main/java/de/pixart/messenger/Config.java      |  2 --
 .../pixart/messenger/ui/EditAccountActivity.java   | 31 ----------------------
 2 files changed, 33 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index 37657de32..d980f0cfa 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -111,8 +111,6 @@ public final class Config {
 
     public static final boolean REPORT_WRONG_FILESIZE_IN_OTR_JINGLE = true;
 
-    public static final boolean SHOW_REGENERATE_AXOLOTL_KEYS_BUTTON = false;
-
     public static final boolean X509_VERIFICATION = false; //use x509 certificates to verify OMEMO keys
 
     public static final boolean IGNORE_ID_REWRITE_IN_MUC = true;
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index 57c2ec806..eea15a577 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -99,7 +99,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
     private RelativeLayout mAxolotlFingerprintBox;
     private ImageButton mOtrFingerprintToClipboardButton;
     private ImageButton mAxolotlFingerprintToClipboardButton;
-    private ImageButton mRegenerateAxolotlKeyButton;
     private LinearLayout keys;
     private LinearLayout keysCard;
     private LinearLayout mNamePort;
@@ -517,7 +516,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
         this.mAxolotlFingerprint = (TextView) findViewById(R.id.axolotl_fingerprint);
         this.mAxolotlFingerprintBox = (RelativeLayout) findViewById(R.id.axolotl_fingerprint_box);
         this.mAxolotlFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_axolotl_to_clipboard);
-        this.mRegenerateAxolotlKeyButton = (ImageButton) findViewById(R.id.action_regenerate_omemo_key);
         this.mOwnFingerprintDesc = (TextView) findViewById(R.id.own_fingerprint_desc);
         this.keysCard = (LinearLayout) findViewById(R.id.other_device_keys_card);
         this.keys = (LinearLayout) findViewById(R.id.other_device_keys);
@@ -953,18 +951,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
                                 copyOmemoFingerprint(ownAxolotlFingerprint);
                             }
                         });
-                if (Config.SHOW_REGENERATE_AXOLOTL_KEYS_BUTTON) {
-                    this.mRegenerateAxolotlKeyButton
-                            .setVisibility(View.VISIBLE);
-                    this.mRegenerateAxolotlKeyButton
-                            .setOnClickListener(new View.OnClickListener() {
-
-                                @Override
-                                public void onClick(final View v) {
-                                    showRegenerateAxolotlKeyDialog();
-                                }
-                            });
-                }
             } else {
                 this.mAxolotlFingerprintBox.setVisibility(View.GONE);
             }
@@ -1052,23 +1038,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
         }
     }
 
-
-    public void showRegenerateAxolotlKeyDialog() {
-        Builder builder = new Builder(this);
-        builder.setTitle("Regenerate Key");
-        builder.setIconAttribute(android.R.attr.alertDialogIcon);
-        builder.setMessage("Are you sure you want to regenerate your Identity Key? (This will also wipe all established sessions and contact Identity Keys)");
-        builder.setNegativeButton(getString(R.string.cancel), null);
-        builder.setPositiveButton("Yes",
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        mAccount.getAxolotlService().regenerateKeys(false);
-                    }
-                });
-        builder.create().show();
-    }
-
     public void showWipePepDialog() {
         Builder builder = new Builder(this);
         builder.setTitle(getString(R.string.clear_other_devices));
-- 
cgit v1.2.3