Revert "Add additional warnings to OMEMO purge key function"

Daniel Gultsch created 10 years ago

This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03.

Change summary

src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 28 --------
src/main/res/values/strings.xml                           |  2 
2 files changed, 2 insertions(+), 28 deletions(-)

Detailed changes

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();

src/main/res/values/strings.xml

@@ -408,8 +408,6 @@
 	<string name="purge_key">Purge key</string>
 	<string name="purge_key_desc_part1">Are you sure you want to purge this key?</string>
 	<string name="purge_key_desc_part2">It will irreversibly be considered compromised, and you can never build a session with it again.</string>
-	<string name="purge_key_warning">Did you press purge because you are trying to fix some problem? If so, please cancel. This functionality will NOT fix your problem.</string>
-	<string name="purge_key_warning2">Are you sure? You CAN NOT undo this. You have been warned.</string>
 	<string name="error_no_keys_to_trust">There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones.</string>
 	<string name="error_trustkeys_title">Error</string>
 	<string name="fetching_history_from_server">Fetching history from server</string>