Merge branch 'develop'

app/build.gradle

@@ -53,8 +53,8 @@ android {
 		applicationId "me.tagavari.airmessage"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionName "3.1.8"
-		versionCode 114
+		versionName "3.1.9"
+		versionCode 115
 
 		resConfigs "en", "fr", "ja"
 

app/src/main/java/me/tagavari/airmessage/connection/ConnectionManager.java

@@ -337,7 +337,7 @@ public void onClose(@ConnectionErrorCode int errorCode) {
 
 						result = scheduleImmediateReconnect(true);
 
-						emitStateConnecting();
+						if(result) emitStateConnecting();
 					} else {
 						result = scheduleImmediateReconnect(false);
 					}
@@ -967,20 +967,23 @@ private void stopCurrentMode() {
 	 * @return Whether the communications manager was started
 	 */
 	private boolean connectFromList(Context context, int index) {
-		//Updating the connection state
-		connState = ConnectionState.connecting;
-
-		//Recording the index
-		currentCommunicationsIndex = index;
-
 		//Getting the parameters
 		int proxyType = connectionOverride == null ? SharedPreferencesManager.getProxyType(context) : connectionOverride.getProxyType();
 		Object overrideValue = connectionOverride == null ? null : connectionOverride.getValue();
 
-		//Creating and starting the communications manager
+		//Creating and checking the communications manager
 		communicationsManager = communicationsPriorityList.get(index).create(communicationsManagerListener, proxyType);
 		if(!communicationsManager.isProxySupported(proxyType)) return false;
+
+		//Updating the connection state
+		connState = ConnectionState.connecting;
+
+		//Recording the index
+		currentCommunicationsIndex = index;
+
+		//Starting the communications manager
 		communicationsManager.connect(context, overrideValue);
+
 		return true;
 	}