diff --git a/build.gradle b/build.gradle index 23dfc1e976272296d22feaf33b5dde0e48dca640..08b39ff8afa79b87131140bddba4c83dd31058c8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.3' // NOTE: Do not place your application dependencies here; they belong diff --git a/mobile/src/main/java/de/tudresden/inf/st/sensorsharing/MainActivity.java b/mobile/src/main/java/de/tudresden/inf/st/sensorsharing/MainActivity.java index e86a3a3a2a4ab94da74ea9d19be9c79c7848beb8..00a36e8c2de4773b8e5b1f1ed32ccbe834d6f5d6 100644 --- a/mobile/src/main/java/de/tudresden/inf/st/sensorsharing/MainActivity.java +++ b/mobile/src/main/java/de/tudresden/inf/st/sensorsharing/MainActivity.java @@ -175,7 +175,7 @@ public class MainActivity extends AppCompatActivity implements } catch (MqttException e) { Toast.makeText(MainActivity.this, "Could not disconnect from running broker. Continue.", - Toast.LENGTH_LONG).show(); + Toast.LENGTH_SHORT).show(); } } @@ -183,14 +183,14 @@ public class MainActivity extends AppCompatActivity implements EditText valueServerURI = findViewById(R.id.value_server_uri); final String serverURI = valueServerURI.getText().toString(); Toast.makeText(MainActivity.this, "Connecting to " + serverURI, - Toast.LENGTH_LONG).show(); + Toast.LENGTH_SHORT).show(); mqttAndroidClient = new MqttAndroidClient(this, serverURI, "SensorSharing-mobile"); mqttAndroidClient.setCallback(new MqttCallback() { @Override public void connectionLost(Throwable cause) { Toast.makeText(MainActivity.this, "Connection to MQTT broker lost", - Toast.LENGTH_LONG).show(); + Toast.LENGTH_SHORT).show(); } @Override @@ -203,7 +203,7 @@ public class MainActivity extends AppCompatActivity implements } }); - MqttConnectOptions options = new MqttConnectOptions(); + final MqttConnectOptions options = new MqttConnectOptions(); options.setCleanSession(false); options.setAutomaticReconnect(true); options.setConnectionTimeout(5); @@ -218,12 +218,15 @@ public class MainActivity extends AppCompatActivity implements @Override public void onFailure(IMqttToken asyncActionToken, Throwable exception) { Log.e(TAG, "Connection to " + serverURI + " failed", exception); + Toast.makeText(MainActivity.this, "Connection to " + serverURI + " failed", + Toast.LENGTH_SHORT).show(); + options.setAutomaticReconnect(false); } }); } catch (MqttException e) { Toast.makeText(this, "Connection to " + serverURI + " failed", - Toast.LENGTH_LONG).show(); + Toast.LENGTH_SHORT).show(); } }