Improve messages to user when connection fails

Author: Samba89

app/src/main/java/uk/co/digitme/machinemonitoring/MainActivity.java

@@ -49,6 +49,7 @@ public class MainActivity extends AppCompatActivity {
     Button mRetryButton;
     Button mSetAddressButton;
     Button mFindServerButton;
+    TextView mAddressText;
 
     DbHelper dbHelper;
     SharedPreferences prefs = null;
@@ -68,12 +69,16 @@ protected void onCreate(Bundle savedInstanceState) {
         mStatusText = findViewById(R.id.main_activity_status);
         mRetryButton = findViewById(R.id.retry_button);
         mFindServerButton = findViewById(R.id.find_server_button);
+        mAddressText = findViewById(R.id.main_activity_address_tv);
+
+        mAddressText.setText(dbHelper.getServerAddress());
 
         // The retry button attempts to contact the server again.
         mRetryButton.setOnClickListener(new OnOneOffClickListener() {
             @Override
             public void onSingleClick(View v) {
                 try {
+                    mStatusText.setText("Connecting...");
                     checkState();
                 } catch (Exception e) {
                     showError(e.getMessage());
@@ -107,13 +112,15 @@ protected void onResume() {
             mRetryButton.setVisibility(View.INVISIBLE);
             mFindServerButton.setVisibility(View.VISIBLE);
             mSetAddressButton.setVisibility(View.VISIBLE);
+            mAddressText.setVisibility(View.VISIBLE);
             prefs.edit().putBoolean("firstrun", false).apply();
         } else {
             // Hide the buttons by default. This stops them showing during transitions between activities
             mStatusText.setVisibility(View.INVISIBLE);
             mRetryButton.setVisibility(View.INVISIBLE);
             mSetAddressButton.setVisibility(View.INVISIBLE);
             mFindServerButton.setVisibility(View.INVISIBLE);
+            mAddressText.setVisibility(View.INVISIBLE);
             // When arriving at this page, immediately contact the server to see which screen the app
             // should be on, and start that activity
             try {
@@ -151,6 +158,7 @@ private void showError(String errorText) {
         mRetryButton.setVisibility(View.VISIBLE);
         mFindServerButton.setVisibility(View.VISIBLE);
         mSetAddressButton.setVisibility(View.VISIBLE);
+        mAddressText.setVisibility(View.VISIBLE);
     }
 
     /**
@@ -172,10 +180,9 @@ private void checkState() {
                 }, error -> {
             // Show a different error message depending on the error
             if (error instanceof TimeoutError || error instanceof NoConnectionError) {
-                showError("Could not connect to network");
+                showError("Could not connect");
             } else if (error instanceof ServerError) {
                 showError("Could not connect to server");
-                showError(error.getMessage());
             }
             Log.v("ErrorListener", String.valueOf(error));
         });

app/src/main/res/layout/activity_main.xml

@@ -43,5 +43,13 @@
         app:layout_constraintTop_toBottomOf="@+id/find_server_button"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>
+    <TextView
+        android:id="@+id/main_activity_address_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        app:layout_constraintTop_toBottomOf="@+id/set_address_button"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -43,7 +43,8 @@
     <string name="main_activity_status_text">Connecting to server</string>
     <string name="find_server_button_text">Find Server</string>
     <string name="retry_button_text">Retry</string>
-    <string name="set_address_button_text">Enter Server Address</string>
+    <string name="set_address_button_text">Enter Manually</string>
+
 
     <string name="server_address_textview">Enter the full address to your server e.g. http://192.168.0.1:8000</string>
     <string name="server_address_hint"> Address e.g. http://192.168.0.1:8000</string>