1 files changed, 43 insertions, 7 deletions

diff --git a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 7c13c518..8de2ce80 100644
--- a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -23,6 +23,7 @@ import android.view.View.OnClickListener;
 import android.widget.CheckBox;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.CompoundButton;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
@@ -111,7 +112,8 @@ public class ContactDetailsActivity extends XmppActivity {
 		public void onCheckedChanged(CompoundButton buttonView,
 				boolean isChecked) {
 			if (isChecked) {
-				if (contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
+				if (contact
+						.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
 					xmppConnectionService.sendPresencePacket(contact
 							.getAccount(),
 							xmppConnectionService.getPresenceGenerator()
@@ -146,7 +148,7 @@ public class ContactDetailsActivity extends XmppActivity {
 	};
 
 	private OnAccountUpdate accountUpdate = new OnAccountUpdate() {
-		
+
 		@Override
 		public void onAccountUpdate() {
 			runOnUiThread(new Runnable() {
@@ -269,7 +271,7 @@ public class ContactDetailsActivity extends XmppActivity {
 
 		send.setOnCheckedChangeListener(this.mOnSendCheckedChange);
 		receive.setOnCheckedChangeListener(this.mOnReceiveCheckedChange);
-		
+
 		lastseen.setText(UIHelper.lastseen(getApplicationContext(),
 				contact.lastseen.time));
 
@@ -322,16 +324,28 @@ public class ContactDetailsActivity extends XmppActivity {
 		LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 		for (Iterator<String> iterator = contact.getOtrFingerprints()
 				.iterator(); iterator.hasNext();) {
-			String otrFingerprint = iterator.next();
-			View view = (View) inflater.inflate(R.layout.contact_key, null);
+			final String otrFingerprint = iterator.next();
+			View view = (View) inflater.inflate(R.layout.contact_key, keys,
+					false);
 			TextView key = (TextView) view.findViewById(R.id.key);
 			TextView keyType = (TextView) view.findViewById(R.id.key_type);
+			ImageButton remove = (ImageButton) view
+					.findViewById(R.id.button_remove);
+			remove.setVisibility(View.VISIBLE);
 			keyType.setText("OTR Fingerprint");
 			key.setText(otrFingerprint);
 			keys.addView(view);
+			remove.setOnClickListener(new OnClickListener() {
+
+				@Override
+				public void onClick(View v) {
+					confirmToDeleteFingerprint(otrFingerprint);
+				}
+			});
 		}
 		if (contact.getPgpKeyId() != 0) {
-			View view = (View) inflater.inflate(R.layout.contact_key, null);
+			View view = (View) inflater.inflate(R.layout.contact_key, keys,
+					false);
 			TextView key = (TextView) view.findViewById(R.id.key);
 			TextView keyType = (TextView) view.findViewById(R.id.key_type);
 			keyType.setText("PGP Key ID");
@@ -360,10 +374,32 @@ public class ContactDetailsActivity extends XmppActivity {
 		}
 	}
 
+	protected void confirmToDeleteFingerprint(final String fingerprint) {
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setTitle(R.string.delete_fingerprint);
+		builder.setMessage(R.string.sure_delete_fingerprint);
+		builder.setNegativeButton(R.string.cancel, null);
+		builder.setPositiveButton(R.string.delete,
+				new android.content.DialogInterface.OnClickListener() {
+
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						if (contact.deleteOtrFingerprint(fingerprint)) {
+							populateView();
+							xmppConnectionService.syncRosterToDisk(contact
+									.getAccount());
+						}
+					}
+
+				});
+		builder.create().show();
+	}
+
 	@Override
 	public void onBackendConnected() {
 		xmppConnectionService.setOnRosterUpdateListener(this.rosterUpdate);
-		xmppConnectionService.setOnAccountListChangedListener(this.accountUpdate );
+		xmppConnectionService
+				.setOnAccountListChangedListener(this.accountUpdate);
 		if ((accountJid != null) && (contactJid != null)) {
 			Account account = xmppConnectionService
 					.findAccountByJid(accountJid);