1 files changed, 30 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 3f2308e1..b745afec 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -128,8 +128,12 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected void replaceToast(String msg) {
+		replaceToast(msg, true);
+	}
+
+	protected void replaceToast(String msg, boolean showlong) {
 		hideToast();
-		mToast = Toast.makeText(this, msg ,Toast.LENGTH_LONG);
+		mToast = Toast.makeText(this, msg ,showlong ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
 		mToast.show();
 	}
 
@@ -806,6 +810,7 @@ public abstract class XmppActivity extends Activity {
 				return true;
 			}
 		};
+		boolean active = true;
 		view.setOnLongClickListener(purge);
 		key.setOnLongClickListener(purge);
 		keyType.setOnLongClickListener(purge);
@@ -836,6 +841,7 @@ public abstract class XmppActivity extends Activity {
 				trustToggle.setEnabled(false);
 				key.setTextColor(getTertiaryTextColor());
 				keyType.setTextColor(getTertiaryTextColor());
+				active = false;
 				break;
 			case INACTIVE_TRUSTED:
 			case INACTIVE_TRUSTED_X509:
@@ -844,6 +850,7 @@ public abstract class XmppActivity extends Activity {
 				trustToggle.setEnabled(false);
 				key.setTextColor(getTertiaryTextColor());
 				keyType.setTextColor(getTertiaryTextColor());
+				active = false;
 				break;
 		}
 
@@ -860,6 +867,28 @@ public abstract class XmppActivity extends Activity {
 		}
 
 		key.setText(CryptoHelper.prettifyFingerprint(fingerprint.substring(2)));
+
+		final View.OnClickListener toast;
+		if (!active) {
+			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);
+		} else {
+			toast = new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					hideToast();
+				}
+			};
+		}
+		view.setOnClickListener(toast);
+		key.setOnClickListener(toast);
+		keyType.setOnClickListener(toast);
+
 		keys.addView(view);
 		return true;
 	}