From da6076028f722d7847cd2e49d69cd17bf0fa012a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 12 Jan 2016 09:48:49 +0100 Subject: Revert "Add additional warnings to OMEMO purge key function" This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03. --- .../eu/siacs/conversations/ui/XmppActivity.java | 28 ++-------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index a9d2bc85..36e82b2a 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -786,32 +786,8 @@ public abstract class XmppActivity extends Activity { new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - Builder builder = new Builder(XmppActivity.this); - builder.setTitle(getString(R.string.purge_key)); - builder.setIconAttribute(android.R.attr.alertDialogIcon); - builder.setMessage(getString(R.string.purge_key_warning)); - builder.setNegativeButton(getString(R.string.cancel), null); - builder.setPositiveButton(getString(R.string.accept), - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Builder builder = new Builder(XmppActivity.this); - builder.setTitle(getString(R.string.purge_key)); - builder.setIconAttribute(android.R.attr.alertDialogIcon); - builder.setMessage(getString(R.string.purge_key_warning2)); - builder.setNegativeButton(getString(R.string.cancel), null); - builder.setPositiveButton(getString(R.string.accept), - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - account.getAxolotlService().purgeKey(fingerprint); - refreshUi(); - } - }); - builder.create().show(); - } - }); - builder.create().show(); + account.getAxolotlService().purgeKey(fingerprint); + refreshUi(); } }); builder.create().show(); -- cgit v1.2.3