offer a more convienient way to disable omemo from trust keys dialog

src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java

@@ -77,6 +77,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 	private final Map<Jid, Set<Integer>> deviceIds;
 	private final Map<String, XmppAxolotlMessage> messageCache;
 	private final FetchStatusMap fetchStatusMap;
+	private final Map<Jid, Boolean> fetchDeviceListStatus = new HashMap<>();
 	private final HashMap<Jid, List<OnDeviceIdsFetched>> fetchDeviceIdsMap = new HashMap<>();
 	private final SerialSingleThreadExecutor executor;
 	private int numPublishTriesOnEmptyPep = 0;
@@ -97,6 +98,20 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 		}
 	}
 
+	private boolean hasErrorFetchingDeviceList(Jid jid) {
+		Boolean status = fetchDeviceListStatus.get(jid);
+		return status != null && !status;
+	}
+
+	public boolean hasErrorFetchingDeviceList(List<Jid> jids) {
+		for(Jid jid : jids) {
+			if (hasErrorFetchingDeviceList(jid)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public boolean fetchMapHasErrors(List<Jid> jids) {
 		for (Jid jid : jids) {
 			if (deviceIds.get(jid) != null) {
@@ -361,6 +376,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 
 	public void clearErrorsInFetchStatusMap(Jid jid) {
 		fetchStatusMap.clearErrorFor(jid);
+		fetchDeviceListStatus.remove(jid);
 	}
 
 	public void regenerateKeys(boolean wipeOther) {
@@ -368,6 +384,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 		sessions.clear();
 		fetchStatusMap.clear();
 		fetchDeviceIdsMap.clear();
+		fetchDeviceListStatus.clear();
 		publishBundlesIfNeeded(true, wipeOther);
 	}
 
@@ -960,26 +977,29 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 				this.fetchDeviceIdsMap.put(jid, callbacks);
 				Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": fetching device ids for " + jid);
 				IqPacket packet = mXmppConnectionService.getIqGenerator().retrieveDeviceIds(jid);
-				mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
+				mXmppConnectionService.sendIqPacket(account, packet, (account, response) -> {
-					@Override
-					public void onIqPacketReceived(Account account, IqPacket packet) {
 					synchronized (fetchDeviceIdsMap) {
-							List<OnDeviceIdsFetched> callbacks = fetchDeviceIdsMap.remove(jid);
+						List<OnDeviceIdsFetched> callbacks1 = fetchDeviceIdsMap.remove(jid);
-							if (packet.getType() == IqPacket.TYPE.RESULT) {
+						if (response.getType() == IqPacket.TYPE.RESULT) {
-								Element item = mXmppConnectionService.getIqParser().getItem(packet);
+							fetchDeviceListStatus.put(jid, true);
+							Element item = mXmppConnectionService.getIqParser().getItem(response);
 							Set<Integer> deviceIds = mXmppConnectionService.getIqParser().deviceIds(item);
 							registerDevices(jid, deviceIds);
-								if (callbacks != null) {
+							if (callbacks1 != null) {
-									for (OnDeviceIdsFetched callback : callbacks) {
+								for (OnDeviceIdsFetched callback1 : callbacks1) {
-										callback.fetched(jid, deviceIds);
+									callback1.fetched(jid, deviceIds);
 								}
 							}
 						} else {
-								Log.d(Config.LOGTAG, packet.toString());
+							if (response.getType() == IqPacket.TYPE.TIMEOUT) {
-								if (callbacks != null) {
+								fetchDeviceListStatus.remove(jid);
-									for (OnDeviceIdsFetched callback : callbacks) {
+							} else {
-										callback.fetched(jid, null);
+								fetchDeviceListStatus.put(jid, false);
 							}
+							Log.d(Config.LOGTAG, response.toString());
+							if (callbacks1 != null) {
+								for (OnDeviceIdsFetched callback1 : callbacks1) {
+									callback1.fetched(jid, null);
 								}
 							}
 						}
@@ -993,16 +1013,13 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
 		final ArrayList<Jid> unfinishedJids = new ArrayList<>(jids);
 		synchronized (unfinishedJids) {
 			for (Jid jid : unfinishedJids) {
-				fetchDeviceIds(jid, new OnDeviceIdsFetched() {
+				fetchDeviceIds(jid, (j, deviceIds) -> {
-					@Override
-					public void fetched(Jid jid, Set<Integer> deviceIds) {
 					synchronized (unfinishedJids) {
-							unfinishedJids.remove(jid);
+						unfinishedJids.remove(j);
 						if (unfinishedJids.size() == 0 && callback != null) {
 							callback.fetched();
 						}
 					}
-					}
 				});
 			}
 		}

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -653,11 +653,11 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 				break;
 			case Message.ENCRYPTION_AXOLOTL:
 				if (!trustKeysIfNeeded(REQUEST_TRUST_KEYS_TEXT)) {
-					sendAxolotlMessage(message);
+					sendMessage(message);
 				}
 				break;
 			default:
-				sendPlainTextMessage(message);
+				sendMessage(message);
 		}
 	}
 
@@ -724,7 +724,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 			case REQUEST_TRUST_KEYS_TEXT:
 				final String body = this.binding.textinput.getText().toString();
 				Message message = new Message(conversation, body, conversation.getNextEncryption());
-				sendAxolotlMessage(message);
+				sendMessage(message);
 				break;
 			case REQUEST_TRUST_KEYS_MENU:
 				int choice = data.getIntExtra("choice", ATTACHMENT_CHOICE_INVALID);
@@ -2222,7 +2222,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 		this.binding.snackbar.setVisibility(View.GONE);
 	}
 
-	protected void sendPlainTextMessage(Message message) {
+	protected void sendMessage(Message message) {
 		activity.xmppConnectionService.sendMessage(message);
 		messageSent();
 	}
@@ -2339,11 +2339,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 		builder.create().show();
 	}
 
-	protected void sendAxolotlMessage(final Message message) {
-		activity.xmppConnectionService.sendMessage(message);
-		messageSent();
-	}
-
 	public void appendText(String text) {
 		if (text == null) {
 			return;

src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java

@@ -1,5 +1,6 @@
 package eu.siacs.conversations.ui;
 
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
@@ -10,7 +11,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.CompoundButton;
 import android.widget.Toast;
 
 import org.whispersystems.libsignal.IdentityKey;
@@ -29,7 +29,9 @@ import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
 import eu.siacs.conversations.databinding.ActivityTrustKeysBinding;
 import eu.siacs.conversations.databinding.KeysCardBinding;
 import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.utils.IrregularUnicodeDetector;
 import eu.siacs.conversations.utils.XmppUri;
@@ -38,33 +40,21 @@ import rocks.xmpp.addr.Jid;
 
 
 public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdated {
-	private List<Jid> contactJids;
-
-	private Account mAccount;
-	private Conversation mConversation;
-
-	private AtomicBoolean mUseCameraHintShown = new AtomicBoolean(false);
-
-	private AxolotlService.FetchStatus lastFetchReport = AxolotlService.FetchStatus.SUCCESS;
-
 	private final Map<String, Boolean> ownKeysToTrust = new HashMap<>();
 	private final Map<Jid, Map<String, Boolean>> foreignKeysToTrust = new HashMap<>();
-
+	private final OnClickListener mCancelButtonListener = v -> {
-	private final OnClickListener mSaveButtonListener = new OnClickListener() {
-		@Override
-		public void onClick(View v) {
-			commitTrusts();
-			finishOk();
-		}
-	};
-
-	private final OnClickListener mCancelButtonListener = new OnClickListener() {
-		@Override
-		public void onClick(View v) {
 		setResult(RESULT_CANCELED);
 		finish();
-		}
 	};
+	private List<Jid> contactJids;
+	private Account mAccount;
+	private Conversation mConversation;
+	private final OnClickListener mSaveButtonListener = v -> {
+		commitTrusts();
+		finishOk(false);
+	};
+	private AtomicBoolean mUseCameraHintShown = new AtomicBoolean(false);
+	private AxolotlService.FetchStatus lastFetchReport = AxolotlService.FetchStatus.SUCCESS;
 	private Toast mUseCameraHintToast = null;
 	private ActivityTrustKeysBinding binding;
 
@@ -155,7 +145,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
 			boolean keys = reloadFingerprints();
 			if (performedVerification && !keys && !hasNoOtherTrustedKeys() && !hasPendingKeyFetches()) {
 				Toast.makeText(this, R.string.all_omemo_keys_have_been_verified, Toast.LENGTH_SHORT).show();
-				finishOk();
+				finishOk(false);
 				return;
 			} else if (performedVerification) {
 				Toast.makeText(this, R.string.verified_fingerprints, Toast.LENGTH_SHORT).show();
@@ -178,13 +168,10 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
 			hasOwnKeys = true;
 			addFingerprintRowWithListeners(binding.ownKeysDetails, mAccount, fingerprint, false,
 					FingerprintStatus.createActive(ownKeysToTrust.get(fingerprint)), false, false,
-					new CompoundButton.OnCheckedChangeListener() {
+					(buttonView, isChecked) -> {
-						@Override
-						public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 						ownKeysToTrust.put(fingerprint, isChecked);
 						// own fingerprints have no impact on locked status.
 					}
-					}
 			);
 		}
 
@@ -236,17 +223,24 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
 		} else {
 			if (!hasForeignKeys && hasNoOtherTrustedKeys()) {
 				binding.keyErrorMessageCard.setVisibility(View.VISIBLE);
-				if (lastFetchReport == AxolotlService.FetchStatus.ERROR
+				boolean lastReportWasError = lastFetchReport == AxolotlService.FetchStatus.ERROR;
-						|| mAccount.getAxolotlService().fetchMapHasErrors(contactJids)) {
+				boolean errorFetchingBundle = mAccount.getAxolotlService().fetchMapHasErrors(contactJids);
-					if (anyWithoutMutualPresenceSubscription(contactJids)) {
+				boolean errorFetchingDeviceList = mAccount.getAxolotlService().hasErrorFetchingDeviceList(contactJids);
-						binding.keyErrorMessage.setText(R.string.error_no_keys_to_trust_presence);
+				boolean anyWithoutMutualPresenceSubscription = anyWithoutMutualPresenceSubscription(contactJids);
+				if (errorFetchingDeviceList) {
+					binding.keyErrorMessage.setVisibility(View.VISIBLE);
+					binding.keyErrorMessage.setText(R.string.error_trustkey_device_list);
+				} else if (errorFetchingBundle || lastReportWasError) {
+					binding.keyErrorMessage.setVisibility(View.VISIBLE);
+					binding.keyErrorMessage.setText(R.string.error_trustkey_bundle);
 				} else {
-						binding.keyErrorMessage.setText(R.string.error_no_keys_to_trust_server_error);
+					binding.keyErrorMessage.setVisibility(View.GONE);
-					}
-				} else {
-					binding.keyErrorMessage.setText(R.string.error_no_keys_to_trust);
 				}
+				this.binding.keyErrorHintMutual.setVisibility(anyWithoutMutualPresenceSubscription ? View.VISIBLE : View.GONE);
+				Contact contact = mAccount.getRoster().getContact(contactJids.get(0));
+				binding.keyErrorGeneral.setText(getString(R.string.error_trustkey_general, contact.getDisplayName()));
 				binding.ownKeysDetails.removeAllViews();
+				binding.disableButton.setOnClickListener(this::disableEncryptionDialog);
 				binding.ownKeysCard.setVisibility(View.GONE);
 				binding.foreignKeys.removeAllViews();
 				binding.foreignKeys.setVisibility(View.GONE);
@@ -256,6 +250,19 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
 		}
 	}
 
+	private void disableEncryptionDialog(View view) {
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setTitle(R.string.disable_encryption);
+		builder.setMessage(R.string.disable_encryption_message);
+		builder.setPositiveButton(R.string.disable_now, (dialog, which) -> {
+			mConversation.setNextEncryption(Message.ENCRYPTION_NONE);
+			xmppConnectionService.updateConversation(mConversation);
+			finishOk(true);
+		});
+		builder.setNegativeButton(R.string.cancel, null);
+		builder.create().show();
+	}
+
 	private boolean anyWithoutMutualPresenceSubscription(List<Jid> contactJids) {
 		for (Jid jid : contactJids) {
 			if (!mAccount.getRoster().getContact(jid).mutualPresenceSubscription()) {
@@ -277,7 +284,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
 	}
 
 	private boolean reloadFingerprints() {
-		List<Jid> acceptedTargets = mConversation == null ? new ArrayList<Jid>() : mConversation.getAcceptedCryptoTargets();
+		List<Jid> acceptedTargets = mConversation == null ? new ArrayList<>() : mConversation.getAcceptedCryptoTargets();
 		ownKeysToTrust.clear();
 		AxolotlService service = this.mAccount.getAxolotlService();
 		Set<IdentityKey> ownKeysSet = service.getKeysWithTrust(FingerprintStatus.createActiveUndecided());
@@ -344,9 +351,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
 		final boolean keysToTrust = reloadFingerprints();
 		if (report != null) {
 			lastFetchReport = report;
-			runOnUiThread(new Runnable() {
+			runOnUiThread(() -> {
-				@Override
-				public void run() {
 				if (mUseCameraHintToast != null && !keysToTrust) {
 					mUseCameraHintToast.cancel();
 				}
@@ -363,26 +368,21 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
 								Toast.LENGTH_LONG).show();
 						break;
 				}
-				}
 			});
 
 		}
 		if (keysToTrust || hasPendingKeyFetches() || hasNoOtherTrustedKeys()) {
 			refreshUi();
 		} else {
-			runOnUiThread(new Runnable() {
+			runOnUiThread(() -> finishOk(false));
-				@Override
-				public void run() {
-					finishOk();
-				}
-			});
 
 		}
 	}
 
-	private void finishOk() {
+	private void finishOk(boolean disabled) {
 		Intent data = new Intent();
 		data.putExtra("choice", getIntent().getIntExtra("choice", ConversationFragment.ATTACHMENT_CHOICE_INVALID));
+		data.putExtra("disabled", disabled);
 		setResult(RESULT_OK, data);
 		finish();
 	}

src/main/res/layout/activity_trust_keys.xml

@@ -27,6 +27,10 @@
                     android:layout_marginTop="@dimen/activity_vertical_margin"
                     android:visibility="gone">
 
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -38,14 +42,44 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/error_trustkeys_title"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                            android:layout_marginBottom="8sp"/>
 
                         <TextView
                             android:id="@+id/key_error_message"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:padding="8dp"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
-                            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+                        <TextView
+                            android:id="@+id/key_error_general"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
+                        <TextView
+                            android:layout_marginTop="8sp"
+                            android:id="@+id/key_error_hint_mutual"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"
+                            android:text="@string/error_trustkey_hint_mutual"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right"
+                        android:gravity="right">
+
+                        <Button
+                            android:id="@+id/disable_button"
+                            style="?android:attr/borderlessButtonStyle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:minWidth="0dp"
+                            android:paddingLeft="16dp"
+                            android:paddingRight="16dp"
+                            android:text="@string/disable_encryption"
+                            android:textColor="@color/accent"/>
+                    </LinearLayout>
                     </LinearLayout>
 
                 </android.support.v7.widget.CardView>

src/main/res/values/strings.xml

@@ -363,7 +363,7 @@
 	<string name="error_no_keys_to_trust_server_error">There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contact’s server.</string>
 	<string name="error_no_keys_to_trust_presence">There are no usable keys available for this contact.\nMake sure you have mutual presence subscription.</string>
 	<string name="error_no_keys_to_trust">There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones.</string>
-	<string name="error_trustkeys_title">Error</string>
+	<string name="error_trustkeys_title">Something went wrong</string>
 	<string name="fetching_history_from_server">Fetching history from server</string>
 	<string name="no_more_history_on_server">No more history on server</string>
 	<string name="updating">Updating…</string>
@@ -727,4 +727,11 @@
 	<string name="pref_scroll_to_bottom_summary">Scroll down after sending a message</string>
     <string name="edit_status_message_title">Edit Status Message</string>
 	<string name="edit_status_message">Edit status message</string>
+    <string name="disable_encryption">Disable encryption</string>
+	<string name="error_trustkey_general">Conversations is unable to send encrypted messages to %1$s. This may be due to your contact using an outdated server or client that can not handle OMEMO.</string>
+	<string name="error_trustkey_device_list">Unable to fetch device list</string>
+	<string name="error_trustkey_bundle">Unable to fetch device bundles</string>
+	<string name="error_trustkey_hint_mutual">Hint: In some cases this can be fixed by adding each other your contact lists.</string>
+	<string name="disable_encryption_message">Are you sure you want to disable OMEMO encryption for this conversation?\nThis will allow your server administrator to read your messages, but it might be the only way to communicate with people using outdated clients.</string>
+	<string name="disable_now">Disable now</string>
 </resources>