refactor omemo fingerprint UI code

4 files changed, 94 insertions, 276 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
index c3992c179..51b9b33ec 100644
--- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
@@ -27,20 +27,18 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.wefika.flowlayout.FlowLayout;
 
 import org.openintents.openpgp.util.OpenPgpUtils;
 
-import java.security.cert.X509Certificate;
 import java.util.List;
 
 import de.pixart.messenger.Config;
+import de.pixart.messenger.OmemoActivity;
 import de.pixart.messenger.R;
 import de.pixart.messenger.crypto.PgpEngine;
 import de.pixart.messenger.crypto.axolotl.AxolotlService;
-import de.pixart.messenger.crypto.axolotl.FingerprintStatus;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Contact;
 import de.pixart.messenger.entities.Conversation;
@@ -55,7 +53,7 @@ import de.pixart.messenger.xmpp.XmppConnection;
 import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
 
-public class ContactDetailsActivity extends XmppActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist, OnKeyStatusUpdated {
+public class ContactDetailsActivity extends OmemoActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist, OnKeyStatusUpdated {
 	public static final String ACTION_VIEW_CONTACT = "view_contact";
 
 	private Conversation mConversation;
@@ -462,12 +460,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		if (Config.supportOmemo()) {
 			for (final String fingerprint : contact.getAccount().getAxolotlService().getFingerprintsForContact(contact)) {
 				boolean highlight = fingerprint.equals(messageFingerprint);
-				hasKeys |= addFingerprintRow(keys, contact.getAccount(), fingerprint, highlight, new OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						onOmemoKeyClicked(contact.getAccount(), fingerprint);
-					}
-				});
+				hasKeys |= addFingerprintRow(keys, contact.getAccount(), fingerprint, highlight);
 			}
 		}
 		if (Config.supportOpenPgp() && contact.getPgpKeyId() != 0) {
@@ -523,40 +516,6 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		}
 	}
 
-	private void onOmemoKeyClicked(Account account, String fingerprint) {
-		FingerprintStatus status = account.getAxolotlService().getFingerprintTrust(fingerprint);
-		if (Config.X509_VERIFICATION && status != null && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509) {
-			X509Certificate x509Certificate = account.getAxolotlService().getFingerprintCertificate(fingerprint);
-			if (x509Certificate != null) {
-				showCertificateInformationDialog(CryptoHelper.extractCertificateInformation(x509Certificate));
-			} else {
-				Toast.makeText(this,R.string.certificate_not_found, Toast.LENGTH_SHORT).show();
-			}
-		}
-	}
-
-	private void showCertificateInformationDialog(Bundle bundle) {
-		View view = getLayoutInflater().inflate(R.layout.certificate_information, null);
-		final String not_available = getString(R.string.certicate_info_not_available);
-		TextView subject_cn = (TextView) view.findViewById(R.id.subject_cn);
-		TextView subject_o = (TextView) view.findViewById(R.id.subject_o);
-		TextView issuer_cn = (TextView) view.findViewById(R.id.issuer_cn);
-		TextView issuer_o = (TextView) view.findViewById(R.id.issuer_o);
-		TextView sha1 = (TextView) view.findViewById(R.id.sha1);
-
-		subject_cn.setText(bundle.getString("subject_cn", not_available));
-		subject_o.setText(bundle.getString("subject_o", not_available));
-		issuer_cn.setText(bundle.getString("issuer_cn", not_available));
-		issuer_o.setText(bundle.getString("issuer_o", not_available));
-		sha1.setText(bundle.getString("sha1", not_available));
-
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.certificate_information);
-		builder.setView(view);
-		builder.setPositiveButton(R.string.ok, null);
-		builder.create().show();
-	}
-
 	protected void confirmToDeleteFingerprint(final String fingerprint) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setTitle(R.string.delete_fingerprint);
@@ -577,7 +536,6 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		builder.create().show();
 	}
 
-	@Override
 	public void onBackendConnected() {
 		if ((accountJid != null) && (contactJid != null)) {
 			Account account = xmppConnectionService
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index e82bc0c5c..b5e3c8a1c 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -41,6 +41,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import de.pixart.messenger.Config;
+import de.pixart.messenger.OmemoActivity;
 import de.pixart.messenger.R;
 import de.pixart.messenger.crypto.axolotl.AxolotlService;
 import de.pixart.messenger.entities.Account;
@@ -59,19 +60,19 @@ import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
 import de.pixart.messenger.xmpp.pep.Avatar;
 
-public class EditAccountActivity extends XmppActivity implements OnAccountUpdate,
+public class EditAccountActivity extends OmemoActivity implements OnAccountUpdate,
 		OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnMamPreferencesFetched {
 
-    private static final int REQUEST_DATA_SAVER = 0x37af244;
-    private AutoCompleteTextView mAccountJid;
+	private static final int REQUEST_DATA_SAVER = 0x37af244;
+	private AutoCompleteTextView mAccountJid;
 	private EditText mPassword;
 	private EditText mPasswordConfirm;
 	private CheckBox mRegisterNew;
 	private Button mCancelButton;
 	private Button mSaveButton;
-    private Button mDisableOsOptimizationsButton;
-    private TextView mDisableOsOptimizationsHeadline;
-    private TextView getmDisableOsOptimizationsBody;
+	private Button mDisableOsOptimizationsButton;
+	private TextView mDisableOsOptimizationsHeadline;
+	private TextView getmDisableOsOptimizationsBody;
 	private TableLayout mMoreTable;
 
 	private LinearLayout mStats;
@@ -190,9 +191,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				return;
 			}
 			if (registerNewAccount) {
-                if (XmppConnection.errorMessage != null) {
-                    Toast.makeText(EditAccountActivity.this,XmppConnection.errorMessage,Toast.LENGTH_LONG).show();
-                }
+				if (XmppConnection.errorMessage != null) {
+					Toast.makeText(EditAccountActivity.this,XmppConnection.errorMessage,Toast.LENGTH_LONG).show();
+				}
 				if (!password.equals(passwordConfirm)) {
 					mPasswordConfirm.setError(getString(R.string.passwords_do_not_match));
 					mPasswordConfirm.requestFocus();
@@ -206,11 +207,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				mAccount.setJid(jid);
 				mAccount.setPort(numericPort);
 				mAccount.setHostname(hostname);
-                if (XmppConnection.errorMessage != null) {
-                    mAccountJid.setError(XmppConnection.errorMessage);
-                } else {
-                    mAccountJid.setError(null);
-                }
+				if (XmppConnection.errorMessage != null) {
+					mAccountJid.setError(XmppConnection.errorMessage);
+				} else {
+					mAccountJid.setError(null);
+				}
 				mPasswordConfirm.setError(null);
 				mAccount.setPassword(password);
 				mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
@@ -480,10 +481,10 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		this.mAvatar.setOnClickListener(this.mAvatarClickListener);
 		this.mRegisterNew = (CheckBox) findViewById(R.id.account_register_new);
 		this.mStats = (LinearLayout) findViewById(R.id.stats);
-        this.mOsOptimizations = (RelativeLayout) findViewById(R.id.os_optimization);
-        this.mDisableOsOptimizationsButton = (Button) findViewById(R.id.os_optimization_disable);
-        this.mDisableOsOptimizationsHeadline = (TextView) findViewById(R.id.os_optimization_headline);
-        this.getmDisableOsOptimizationsBody = (TextView) findViewById(R.id.os_optimization_body);
+		this.mOsOptimizations = (RelativeLayout) findViewById(R.id.os_optimization);
+		this.mDisableOsOptimizationsButton = (Button) findViewById(R.id.os_optimization_disable);
+		this.mDisableOsOptimizationsHeadline = (TextView) findViewById(R.id.os_optimization_headline);
+		this.getmDisableOsOptimizationsBody = (TextView) findViewById(R.id.os_optimization_body);
 		this.mSessionEst = (TextView) findViewById(R.id.session_est);
 		this.mServerInfoRosterVersion = (TextView) findViewById(R.id.server_info_roster_version);
 		this.mServerInfoCarbons = (TextView) findViewById(R.id.server_info_carbons);
@@ -516,9 +517,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener);
 		this.mCancelButton.setOnClickListener(this.mCancelButtonClickListener);
 		this.mMoreTable = (TableLayout) findViewById(R.id.server_info_more);
-        if (savedInstanceState != null && savedInstanceState.getBoolean("showMoreTable")) {
-           	changeMoreTableVisibility(true);
-        }
+		if (savedInstanceState != null && savedInstanceState.getBoolean("showMoreTable")) {
+			changeMoreTableVisibility(true);
+		}
 		final OnCheckedChangeListener OnCheckedShowConfirmPassword = new OnCheckedChangeListener() {
 			@Override
 			public void onCheckedChanged(final CompoundButton buttonView,
@@ -584,22 +585,22 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		return super.onCreateOptionsMenu(menu);
 	}
 
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        final MenuItem showMoreInfo = menu.findItem(R.id.action_server_info_show_more);
-        if (showMoreInfo.isVisible()) {
-       		showMoreInfo.setChecked(mMoreTable.getVisibility() == View.VISIBLE);
-       	}
-       	return super.onPrepareOptionsMenu(menu);
-    }
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		final MenuItem showMoreInfo = menu.findItem(R.id.action_server_info_show_more);
+		if (showMoreInfo.isVisible()) {
+			showMoreInfo.setChecked(mMoreTable.getVisibility() == View.VISIBLE);
+		}
+		return super.onPrepareOptionsMenu(menu);
+	}
 
 	@Override
 	protected void onStart() {
 		super.onStart();
-        final int theme = findTheme();
-        if (this.mTheme != theme) {
-            recreate();
-        } else if (getIntent() != null) {
+		final int theme = findTheme();
+		if (this.mTheme != theme) {
+			recreate();
+		} else if (getIntent() != null) {
 			try {
 				this.jidToEdit = Jid.fromString(getIntent().getStringExtra("jid"));
 			} catch (final InvalidJidException | NullPointerException ignored) {
@@ -637,12 +638,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		if (mAccount != null) {
 			savedInstanceState.putString("account", mAccount.getJid().toBareJid().toString());
 			savedInstanceState.putBoolean("initMode", mInitMode);
-            savedInstanceState.putBoolean("showMoreTable", mMoreTable.getVisibility() == View.VISIBLE);
+			savedInstanceState.putBoolean("showMoreTable", mMoreTable.getVisibility() == View.VISIBLE);
 		}
 		super.onSaveInstanceState(savedInstanceState);
 	}
 
-	@Override
 	protected void onBackendConnected() {
 		boolean init = true;
 		if (mSavedInstanceAccount != null) {
@@ -714,7 +714,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				startActivity(showBlocklistIntent);
 				break;
 			case R.id.action_server_info_show_more:
-                changeMoreTableVisibility(!item.isChecked());
+				changeMoreTableVisibility(!item.isChecked());
 				break;
 			case R.id.action_change_password_on_server:
 				gotoChangePassword(null);
@@ -738,9 +738,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		return super.onOptionsItemSelected(item);
 	}
 
-    private void changeMoreTableVisibility(boolean visible) {
-        mMoreTable.setVisibility(visible ? View.VISIBLE : View.GONE);
-    }
+	private void changeMoreTableVisibility(boolean visible) {
+		mMoreTable.setVisibility(visible ? View.VISIBLE : View.GONE);
+	}
 
 	private void gotoChangePassword(String newPassword) {
 		final Intent changePasswordIntent = new Intent(this, ChangePasswordActivity.class);
@@ -803,9 +803,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) {
 			Features features = this.mAccount.getXmppConnection().getFeatures();
 			this.mStats.setVisibility(View.VISIBLE);
-            boolean showBatteryWarning = !xmppConnectionService.getPushManagementService().available(mAccount) && isOptimizingBattery();
-            boolean showDataSaverWarning = isAffectedByDataSaver();
-            showOsOptimizationWarning(showBatteryWarning,showDataSaverWarning);
+			boolean showBatteryWarning = !xmppConnectionService.getPushManagementService().available(mAccount) && isOptimizingBattery();
+			boolean showDataSaverWarning = isAffectedByDataSaver();
+			showOsOptimizationWarning(showBatteryWarning,showDataSaverWarning);
 			this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection()
 					.getLastSessionEstablished()));
 			if (features.rosterVersioning()) {
@@ -901,13 +901,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 							@Override
 							public void onClick(final View v) {
-
-								if (copyTextToClipboard(ownAxolotlFingerprint.substring(2), R.string.omemo_fingerprint)) {
-									Toast.makeText(
-											EditAccountActivity.this,
-											R.string.toast_message_omemo_fingerprint,
-											Toast.LENGTH_SHORT).show();
-								}
+								copyOmemoFingerprint(ownAxolotlFingerprint);
 							}
 						});
 				if (Config.SHOW_REGENERATE_AXOLOTL_KEYS_BUTTON) {
@@ -932,7 +926,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 					continue;
 				}
 				boolean highlight = fingerprint.equals(messageFingerprint);
-				hasKeys |= addFingerprintRow(keys, mAccount, fingerprint, highlight, null);
+				hasKeys |= addFingerprintRow(keys, mAccount, fingerprint, highlight);
 			}
 			if (hasKeys && Config.supportOmemo()) {
 				keysCard.setVisibility(View.VISIBLE);
@@ -964,47 +958,47 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		}
 	}
 
-    private void showOsOptimizationWarning(boolean showBatteryWarning, boolean showDataSaverWarning) {
-        this.mOsOptimizations.setVisibility(showBatteryWarning || showDataSaverWarning ? View.VISIBLE : View.GONE);
-        if (showDataSaverWarning) {
-            this.mDisableOsOptimizationsHeadline.setText(R.string.data_saver_enabled);
-            this.getmDisableOsOptimizationsBody.setText(R.string.data_saver_enabled_explained);
-            this.mDisableOsOptimizationsButton.setText(R.string.allow);
-            this.mDisableOsOptimizationsButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent intent = new Intent(Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS);
-                    Uri uri = Uri.parse("package:" + getPackageName());
-                    intent.setData(uri);
-                    try {
-                        startActivityForResult(intent, REQUEST_DATA_SAVER);
-                    } catch (ActivityNotFoundException e) {
-                        Toast.makeText(EditAccountActivity.this, R.string.device_does_not_support_data_saver, Toast.LENGTH_SHORT).show();
-                    }
-                }
-            });
-        } else if (showBatteryWarning) {
-            this.mDisableOsOptimizationsButton.setText(R.string.disable);
-            this.mDisableOsOptimizationsHeadline.setText(R.string.battery_optimizations_enabled);
-            this.getmDisableOsOptimizationsBody.setText(R.string.battery_optimizations_enabled_explained);
-            this.mDisableOsOptimizationsButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                    Uri uri = Uri.parse("package:" + getPackageName());
-                    intent.setData(uri);
-                    try {
-                        startActivityForResult(intent, REQUEST_BATTERY_OP);
-                    } catch (ActivityNotFoundException e) {
-                        Toast.makeText(EditAccountActivity.this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
-                    }
-                }
-            });
-        }
-    }
-
-
-    public void showRegenerateAxolotlKeyDialog() {
+	private void showOsOptimizationWarning(boolean showBatteryWarning, boolean showDataSaverWarning) {
+		this.mOsOptimizations.setVisibility(showBatteryWarning || showDataSaverWarning ? View.VISIBLE : View.GONE);
+		if (showDataSaverWarning) {
+			this.mDisableOsOptimizationsHeadline.setText(R.string.data_saver_enabled);
+			this.getmDisableOsOptimizationsBody.setText(R.string.data_saver_enabled_explained);
+			this.mDisableOsOptimizationsButton.setText(R.string.allow);
+			this.mDisableOsOptimizationsButton.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					Intent intent = new Intent(Settings.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS);
+					Uri uri = Uri.parse("package:" + getPackageName());
+					intent.setData(uri);
+					try {
+						startActivityForResult(intent, REQUEST_DATA_SAVER);
+					} catch (ActivityNotFoundException e) {
+						Toast.makeText(EditAccountActivity.this, R.string.device_does_not_support_data_saver, Toast.LENGTH_SHORT).show();
+					}
+				}
+			});
+		} else if (showBatteryWarning) {
+			this.mDisableOsOptimizationsButton.setText(R.string.disable);
+			this.mDisableOsOptimizationsHeadline.setText(R.string.battery_optimizations_enabled);
+			this.getmDisableOsOptimizationsBody.setText(R.string.battery_optimizations_enabled_explained);
+			this.mDisableOsOptimizationsButton.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+					Uri uri = Uri.parse("package:" + getPackageName());
+					intent.setData(uri);
+					try {
+						startActivityForResult(intent, REQUEST_BATTERY_OP);
+					} catch (ActivityNotFoundException e) {
+						Toast.makeText(EditAccountActivity.this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
+					}
+				}
+			});
+		}
+	}
+
+
+	public void showRegenerateAxolotlKeyDialog() {
 		Builder builder = new Builder(this);
 		builder.setTitle("Regenerate Key");
 		builder.setIconAttribute(android.R.attr.alertDialogIcon);
diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
index b737e17f1..dd499433a 100644
--- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import de.pixart.messenger.OmemoActivity;
 import de.pixart.messenger.R;
 import de.pixart.messenger.crypto.axolotl.AxolotlService;
 import de.pixart.messenger.crypto.axolotl.FingerprintStatus;
@@ -27,7 +28,7 @@ import de.pixart.messenger.xmpp.OnKeyStatusUpdated;
 import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
 
-public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdated {
+public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdated {
 	private List<Jid> contactJids;
 
 	private Account mAccount;
@@ -108,16 +109,14 @@ public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdate
 		for(final String fingerprint : ownKeysToTrust.keySet()) {
 			hasOwnKeys = true;
 			addFingerprintRowWithListeners(ownKeys, mAccount, fingerprint, false,
-					FingerprintStatus.createActive(ownKeysToTrust.get(fingerprint)), false,
+					FingerprintStatus.createActive(ownKeysToTrust.get(fingerprint)), false, false,
 					new CompoundButton.OnCheckedChangeListener() {
 						@Override
 						public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 							ownKeysToTrust.put(fingerprint, isChecked);
 							// own fingerprints have no impact on locked status.
 						}
-					},
-					null,
-					null
+					}
 			);
 		}
 
@@ -133,16 +132,14 @@ public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdate
 				final Map<String, Boolean> fingerprints = entry.getValue();
 				for (final String fingerprint : fingerprints.keySet()) {
 					addFingerprintRowWithListeners(keysContainer, mAccount, fingerprint, false,
-							FingerprintStatus.createActive(fingerprints.get(fingerprint)), false,
+							FingerprintStatus.createActive(fingerprints.get(fingerprint)), false, false,
 							new CompoundButton.OnCheckedChangeListener() {
 								@Override
 								public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 									fingerprints.put(fingerprint, isChecked);
 									lockOrUnlockAsNeeded();
 								}
-							},
-							null,
-							null
+							}
 					);
 				}
 				if (fingerprints.size() == 0) {
@@ -211,7 +208,6 @@ public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdate
 		return ownKeysSet.size() + foreignKeysToTrust.size() > 0;
 	}
 
-	@Override
 	public void onBackendConnected() {
 		Intent intent = getIntent();
 		this.mAccount = extractAccount(intent);
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 95dc62d7d..b9c62e516 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -48,11 +48,8 @@ import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.zxing.BarcodeFormat;
@@ -76,7 +73,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
-import de.pixart.messenger.crypto.axolotl.FingerprintStatus;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Contact;
 import de.pixart.messenger.entities.Conversation;
@@ -86,7 +82,6 @@ import de.pixart.messenger.entities.Presences;
 import de.pixart.messenger.services.AvatarService;
 import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.services.XmppConnectionService.XmppConnectionBinder;
-import de.pixart.messenger.ui.widget.Switch;
 import de.pixart.messenger.utils.CryptoHelper;
 import de.pixart.messenger.utils.ExceptionHelper;
 import de.pixart.messenger.utils.UIHelper;
@@ -775,131 +770,6 @@ public abstract class XmppActivity extends Activity {
 		builder.create().show();
 	}
 
-	protected boolean addFingerprintRow(LinearLayout keys, final Account account, final String fingerprint, boolean highlight, View.OnClickListener onKeyClickedListener) {
-		final FingerprintStatus status = account.getAxolotlService().getFingerprintTrust(fingerprint);
-		if (status == null) {
-			return false;
-		}
-		return addFingerprintRowWithListeners(keys, account, fingerprint, highlight, status, true,
-				new CompoundButton.OnCheckedChangeListener() {
-					@Override
-					public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-						account.getAxolotlService().setFingerprintTrust(fingerprint,FingerprintStatus.createActive(isChecked));
-					}
-				},
-				new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						account.getAxolotlService().setFingerprintTrust(fingerprint,FingerprintStatus.createActive(false));
-						v.setEnabled(true);
-					}
-				},
-				onKeyClickedListener
-
-		);
-	}
-
-	protected boolean addFingerprintRowWithListeners(LinearLayout keys, final Account account,
-													 final String fingerprint,
-													 boolean highlight,
-													 FingerprintStatus status,
-													 boolean showTag,
-													 CompoundButton.OnCheckedChangeListener
-															 onCheckedChangeListener,
-													 View.OnClickListener onClickListener,
-													 View.OnClickListener onKeyClickedListener) {
-		if (status.isCompromised()) {
-			return false;
-		}
-		View view = getLayoutInflater().inflate(R.layout.contact_key, keys, false);
-		TextView key = (TextView) view.findViewById(R.id.key);
-		key.setOnClickListener(onKeyClickedListener);
-		TextView keyType = (TextView) view.findViewById(R.id.key_type);
-		keyType.setOnClickListener(onKeyClickedListener);
-		Switch trustToggle = (Switch) view.findViewById(R.id.tgl_trust);
-		trustToggle.setVisibility(View.VISIBLE);
-		final View.OnLongClickListener purge = new View.OnLongClickListener() {
-			@Override
-			public boolean onLongClick(View v) {
-				showPurgeKeyDialog(account, fingerprint);
-				return true;
-			}
-		};
-		view.setOnLongClickListener(purge);
-		key.setOnLongClickListener(purge);
-		keyType.setOnLongClickListener(purge);
-		boolean x509 = Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509;
-		final View.OnClickListener toast;
-		trustToggle.setChecked(status.isTrusted(), false);
-		if (status.isActive()) {
-			key.setTextColor(getPrimaryTextColor());
-			keyType.setTextColor(getSecondaryTextColor());
-			trustToggle.setOnCheckedChangeListener(onCheckedChangeListener);
-			if (status.getTrust() == FingerprintStatus.Trust.UNDECIDED) {
-				trustToggle.setOnClickListener(onClickListener);
-				trustToggle.setEnabled(false);
-			} else {
-				trustToggle.setOnClickListener(null);
-				trustToggle.setEnabled(true);
-			}
-			toast = new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					hideToast();
-				}
-			};
-		} else {
-			key.setTextColor(getTertiaryTextColor());
-			keyType.setTextColor(getTertiaryTextColor());
-			trustToggle.setOnClickListener(null);
-			trustToggle.setEnabled(false);
-			toast = new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					replaceToast(getString(R.string.this_device_is_no_longer_in_use), false);
-				}
-			};
-			trustToggle.setOnClickListener(toast);
-		}
-		view.setOnClickListener(toast);
-		key.setOnClickListener(toast);
-		keyType.setOnClickListener(toast);
-		if (showTag) {
-			keyType.setText(getString(x509 ? R.string.omemo_fingerprint_x509 : R.string.omemo_fingerprint));
-		} else {
-			keyType.setVisibility(View.GONE);
-		}
-		if (highlight) {
-			keyType.setTextColor(getResources().getColor(R.color.accent));
-			keyType.setText(getString(x509 ? R.string.omemo_fingerprint_x509_selected_message : R.string.omemo_fingerprint_selected_message));
-		} else {
-			keyType.setText(getString(x509 ? R.string.omemo_fingerprint_x509 : R.string.omemo_fingerprint));
-		}
-
-		key.setText(CryptoHelper.prettifyFingerprint(fingerprint.substring(2)));
-		keys.addView(view);
-		return true;
-	}
-
-	public void showPurgeKeyDialog(final Account account, final String fingerprint) {
-		Builder builder = new Builder(this);
-		builder.setTitle(getString(R.string.purge_key));
-		builder.setIconAttribute(android.R.attr.alertDialogIcon);
-		builder.setMessage(getString(R.string.purge_key_desc_part1)
-				+ "\n\n" + CryptoHelper.prettifyFingerprint(fingerprint.substring(2))
-				+ "\n\n" + getString(R.string.purge_key_desc_part2));
-		builder.setNegativeButton(getString(R.string.cancel), null);
-		builder.setPositiveButton(getString(R.string.purge_key),
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						account.getAxolotlService().purgeKey(fingerprint);
-						refreshUi();
-					}
-				});
-		builder.create().show();
-	}
-
 	public boolean hasStoragePermission(int requestCode) {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {