From f0dbcce58fecd294efdc2d049f85b8bd794aad3e Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 28 Sep 2016 12:24:50 +0200 Subject: [PATCH] expert 'setting' to remove omemo identity. fixes #2038 --- .../persistance/DatabaseBackend.java | 3 - .../conversations/ui/SettingsActivity.java | 62 ++++++++++++++++++- src/main/res/values/strings.xml | 3 + src/main/res/xml/preferences.xml | 4 ++ 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java index 484b7b152..d8b6b4e1b 100644 --- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java @@ -1184,9 +1184,6 @@ public class DatabaseBackend extends SQLiteOpenHelper { storeIdentityKey(account, account.getJid().toBareJid().toString(), true, identityKeyPair.getPublicKey().getFingerprint().replaceAll("\\s", ""), Base64.encodeToString(identityKeyPair.serialize(), Base64.DEFAULT), XmppAxolotlSession.Trust.TRUSTED); } - public void recreateAxolotlDb() { - recreateAxolotlDb(getWritableDatabase()); - } public void recreateAxolotlDb(SQLiteDatabase db) { Log.d(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + ">>> (RE)CREATING AXOLOTL DATABASE <<<"); diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index 17ade7024..fd81c6210 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -29,6 +29,8 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.services.ExportLogsService; import eu.siacs.conversations.xmpp.XmppConnection; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; public class SettingsActivity extends XmppActivity implements OnSharedPreferenceChangeListener { @@ -91,7 +93,7 @@ public class SettingsActivity extends XmppActivity implements displayToast(getString(R.string.toast_no_trusted_certs)); return true; } - final ArrayList selectedItems = new ArrayList(); + final ArrayList selectedItems = new ArrayList<>(); final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(SettingsActivity.this); dialogBuilder.setTitle(getResources().getString(R.string.dialog_manage_certs_title)); dialogBuilder.setMultiChoiceItems(aliases.toArray(new CharSequence[aliases.size()]), null, @@ -151,6 +153,64 @@ public class SettingsActivity extends XmppActivity implements return true; } }); + + final Preference deleteOmemoPreference = mSettingsFragment.findPreference("delete_omemo_identities"); + deleteOmemoPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + deleteOmemoIdentities(); + return true; + } + }); + } + + private void deleteOmemoIdentities() { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.pref_delete_omemo_identities); + final List accounts = new ArrayList<>(); + for(Account account : xmppConnectionService.getAccounts()) { + if (!account.isOptionSet(Account.OPTION_DISABLED)) { + accounts.add(account.getJid().toBareJid().toString()); + } + } + final boolean[] checkedItems = new boolean[accounts.size()]; + builder.setMultiChoiceItems(accounts.toArray(new CharSequence[accounts.size()]), checkedItems, new DialogInterface.OnMultiChoiceClickListener() { + @Override + public void onClick(DialogInterface dialog, int which, boolean isChecked) { + checkedItems[which] = isChecked; + final AlertDialog alertDialog = (AlertDialog) dialog; + for(boolean item : checkedItems) { + if (item) { + alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(true); + return; + } + } + alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false); + } + }); + builder.setNegativeButton(R.string.cancel,null); + builder.setPositiveButton(R.string.delete_selected_keys, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + for(int i = 0; i < checkedItems.length; ++i) { + if (checkedItems[i]) { + try { + Jid jid = Jid.fromString(accounts.get(i).toString()); + Account account = xmppConnectionService.findAccountByJid(jid); + if (account != null) { + account.getAxolotlService().regenerateKeys(true); + } + } catch (InvalidJidException e) { + // + } + + } + } + } + }); + AlertDialog dialog = builder.create(); + dialog.show(); + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); } @Override diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e53742e90..6d5476d20 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -687,4 +687,7 @@ This is not a private, non-anonymous conference. There are no members in this conference. Report this JID as sending unwanted messages. + Delete OMEMO identities + Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort. + Delete selected keys diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 68b2f73a8..b01faa6b8 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -183,6 +183,10 @@ android:key="allow_message_correction" android:title="@string/pref_allow_message_correction" android:summary="@string/pref_allow_message_correction_summary"/> +