only invoke MTM in interactive mode after direct user input

fixes #1027
fixes #792
fixes #1439

2 files changed, 26 insertions, 11 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index ee0ccd4f7..fe5272b00 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -282,7 +282,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				}
 			} else if (account.getStatus() == Account.State.REGISTRATION_SUCCESSFUL) {
 				databaseBackend.updateAccount(account);
-				reconnectAccount(account, true);
+				reconnectAccount(account, true, false);
 			} else if ((account.getStatus() != Account.State.CONNECTING)
 					&& (account.getStatus() != Account.State.NO_INTERNET)) {
 				if (connection != null) {
@@ -442,6 +442,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		final String action = intent == null ? null : intent.getAction();
+		boolean interactive = false;
 		if (action != null) {
 			switch (action) {
 				case ConnectivityManager.CONNECTIVITY_ACTION:
@@ -468,6 +469,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					break;
 				case ACTION_TRY_AGAIN:
 					resetAllAttemptCounts(false);
+					interactive = true;
 					break;
 				case ACTION_DISABLE_ACCOUNT:
 					try {
@@ -508,7 +510,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						if (lastSent > lastReceived) {
 							if (pingTimeoutIn < 0) {
 								Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": ping timeout");
-								this.reconnectAccount(account, true);
+								this.reconnectAccount(account, true, interactive);
 							} else {
 								int secs = (int) (pingTimeoutIn / 1000);
 								this.scheduleWakeUpCall(secs,account.getUuid().hashCode());
@@ -521,18 +523,18 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 							this.scheduleWakeUpCall((int) (msToNextPing / 1000), account.getUuid().hashCode());
 						}
 					} else if (account.getStatus() == Account.State.OFFLINE) {
-						reconnectAccount(account,true);
+						reconnectAccount(account,true, interactive);
 					} else if (account.getStatus() == Account.State.CONNECTING) {
 						long timeout = Config.CONNECT_TIMEOUT - ((SystemClock.elapsedRealtime() - account.getXmppConnection().getLastConnect()) / 1000);
 						if (timeout < 0) {
 							Log.d(Config.LOGTAG, account.getJid() + ": time out during connect reconnecting");
-							reconnectAccount(account, true);
+							reconnectAccount(account, true, interactive);
 						} else {
 							scheduleWakeUpCall((int) timeout,account.getUuid().hashCode());
 						}
 					} else {
 						if (account.getXmppConnection().getTimeToNextAttempt() <= 0) {
-							reconnectAccount(account, true);
+							reconnectAccount(account, true, interactive);
 						}
 					}
 
@@ -1208,7 +1210,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void updateAccount(final Account account) {
 		this.statusListener.onStatusChanged(account);
 		databaseBackend.updateAccount(account);
-		reconnectAccount(account, false);
+		reconnectAccount(account, false, true);
 		updateAccountUi();
 		getNotificationService().updateErrorNotification();
 	}
@@ -2145,7 +2147,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		this.databaseBackend.updateConversation(conversation);
 	}
 
-	public void reconnectAccount(final Account account, final boolean force) {
+	private void reconnectAccount(final Account account, final boolean force, final boolean interactive) {
 		synchronized (account) {
 			if (account.getXmppConnection() != null) {
 				disconnect(account, force);
@@ -2165,6 +2167,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					account.setXmppConnection(createConnection(account));
 				}
 				Thread thread = new Thread(account.getXmppConnection());
+				account.getXmppConnection().setInteractive(interactive);
 				thread.start();
 				scheduleWakeUpCall(Config.CONNECT_TIMEOUT, account.getUuid().hashCode());
 			} else {
@@ -2178,7 +2181,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		new Thread(new Runnable() {
 			@Override
 			public void run() {
-				reconnectAccount(account,false);
+				reconnectAccount(account,false,true);
 			}
 		}).start();
 	}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index fd6465021..9527ee23d 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -42,6 +42,7 @@ import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
 
+import de.duenndns.ssl.MemorizingTrustManager;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.sasl.DigestMd5;
 import eu.siacs.conversations.crypto.sasl.Plain;
@@ -100,6 +101,7 @@ public class XmppConnection implements Runnable {
 	private long lastPingSent = 0;
 	private long lastConnect = 0;
 	private long lastSessionStarted = 0;
+	private boolean mInteractive = false;
 	private int attempt = 0;
 	private final Hashtable<String, Pair<IqPacket, OnIqPacketReceived>> packetCallbacks = new Hashtable<>();
 	private OnPresencePacketReceived presenceListener = null;
@@ -515,9 +517,15 @@ public class XmppConnection implements Runnable {
 		tagReader.readTag();
 		try {
 			final SSLContext sc = SSLContext.getInstance("TLS");
-			sc.init(null,new X509TrustManager[]{this.mXmppConnectionService.getMemorizingTrustManager()},mXmppConnectionService.getRNG());
+			MemorizingTrustManager trustManager = this.mXmppConnectionService.getMemorizingTrustManager();
+			sc.init(null,new X509TrustManager[]{mInteractive ? trustManager : trustManager.getNonInteractive()},mXmppConnectionService.getRNG());
 			final SSLSocketFactory factory = sc.getSocketFactory();
-			final HostnameVerifier verifier = this.mXmppConnectionService.getMemorizingTrustManager().wrapHostnameVerifier(new StrictHostnameVerifier());
+			final HostnameVerifier verifier;
+			if (mInteractive) {
+				verifier = trustManager.wrapHostnameVerifier(new StrictHostnameVerifier());
+			} else {
+				verifier = trustManager.wrapHostnameVerifierNonInteractive(new StrictHostnameVerifier());
+			}
 			final InetAddress address = socket == null ? null : socket.getInetAddress();
 
 			if (factory == null || address == null || verifier == null) {
@@ -839,7 +847,7 @@ public class XmppConnection implements Runnable {
 			sendEnableCarbons();
 		}
 		if (getFeatures().blocking() && !features.blockListRequested) {
-			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": Requesting block list");
+			Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": Requesting block list");
 			this.sendIqPacket(getIqGenerator().generateGetBlockList(), mXmppConnectionService.getIqParser());
 		}
 	}
@@ -1138,6 +1146,10 @@ public class XmppConnection implements Runnable {
 		this.lastConnect = 0;
 	}
 
+	public void setInteractive(boolean interactive) {
+		this.mInteractive = interactive;
+	}
+
 	private class Info {
 		public final ArrayList<String> features = new ArrayList<>();
 		public final ArrayList<Pair<String,String>> identities = new ArrayList<>();