improved OTR verification part one

1 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 39dfd4db..c3b47d76 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -204,13 +204,7 @@ public class ConversationFragment extends Fragment {
 
 		@Override
 		public void onClick(View v) {
-			if (conversation.getOtrFingerprint() != null) {
-				Intent intent = new Intent(getActivity(), VerifyOTRActivity.class);
-				intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
-				intent.putExtra("contact", conversation.getContact().getJid().toBareJid().toString());
-				intent.putExtra("account", conversation.getAccount().getJid().toBareJid().toString());
-				startActivity(intent);
-			}
+			activity.verifyOtrSessionDialog(conversation,v);
 		}
 	};
 	private ConcurrentLinkedQueue<Message> mEncryptedMessages = new ConcurrentLinkedQueue<>();
@@ -796,7 +790,17 @@ public class ConversationFragment extends Fragment {
 
 	protected void makeFingerprintWarning() {
 		if (conversation.smpRequested()) {
-			showSnackbar(R.string.smp_requested, R.string.verify, clickToVerify);
+			showSnackbar(R.string.smp_requested, R.string.verify, new OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					Intent intent = new Intent(activity, VerifyOTRActivity.class);
+					intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
+					intent.putExtra("contact", conversation.getContact().getJid().toBareJid().toString());
+					intent.putExtra("account", conversation.getAccount().getJid().toBareJid().toString());
+					intent.putExtra("mode",VerifyOTRActivity.MODE_ANSWER_QUESTION);
+					startActivity(intent);
+				}
+			});
 		} else if (conversation.hasValidOtrSession() && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED)
 				&& (!conversation.isOtrFingerprintVerified())) {
 			showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, clickToVerify);