Fixes #258: Server connection Error shows custom messages.

Author: saketkumar

app/src/main/java/com/zulip/android/activities/LoginActivity.java

@@ -5,6 +5,8 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -15,6 +17,7 @@
 import android.util.Patterns;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
+import android.webkit.URLUtil;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
@@ -197,6 +200,13 @@ private void showBackends(String httpScheme, String serverURL) {
             serverURL = serverURL + "/";
         }
 
+        boolean isValid = URLUtil.isValidUrl(String.valueOf(serverURL));
+
+        if (!isValid){
+            Toast.makeText(LoginActivity.this, R.string.invalid_url , Toast.LENGTH_SHORT).show();
+            return;
+        }
+
         Uri serverUri = Uri.parse(serverURL);
 
         serverUri = serverUri.buildUpon().scheme(httpScheme).build();
@@ -251,12 +261,28 @@ public void onError(Call<ZulipBackendResponse> call, Response<ZulipBackendRespon
                     @Override
                     public void onFailure(Call<ZulipBackendResponse> call, Throwable t) {
                         super.onFailure(call, t);
-                        Toast.makeText(LoginActivity.this, R.string.toast_login_failed_fetching_backends, Toast.LENGTH_SHORT).show();
+                        if (!isNetworkAvailable())
+                        {
+                            Toast.makeText(LoginActivity.this, R.string.toast_no_internet_connection, Toast.LENGTH_SHORT).show();
+                        }
+                        else
+                        {
+                            Toast.makeText(LoginActivity.this, R.string.invalid_url, Toast.LENGTH_SHORT).show();
+                        }
                     }
                 });
 
     }
 
+    private boolean isNetworkAvailable() {
+        ConnectivityManager connectivityManager
+                = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
+        return activeNetworkInfo != null && activeNetworkInfo.isConnected();
+    }
+
+
+
     private void showHTTPDialog(final String serverURL) {
         new AlertDialog.Builder(this)
                 .setTitle(R.string.http_or_https)
@@ -353,7 +379,15 @@ public void onConnectionFailed(ConnectionResult result) {
                 }
             } else {
                 connectionProgressDialog.dismiss();
-                Toast.makeText(LoginActivity.this, R.string.google_app_login_failed, Toast.LENGTH_SHORT).show();
+                if (!isNetworkAvailable())
+                {
+                    Toast.makeText(LoginActivity.this,R.string.toast_no_internet_connection, Toast.LENGTH_SHORT).show();
+                }
+                else
+                {
+                    Toast.makeText(LoginActivity.this, R.string.google_app_login_failed, Toast.LENGTH_SHORT).show();
+                }
+
             }
         }
     }
@@ -422,15 +456,30 @@ public void onError(Call<LoginResponse> call, Response<LoginResponse> response)
                                         Toast.makeText(LoginActivity.this, R.string.login_activity_toast_login_error, Toast.LENGTH_LONG).show();
                                     }
                                 } else {
-                                    Toast.makeText(LoginActivity.this, R.string.login_activity_toast_login_error, Toast.LENGTH_LONG).show();
+                                    if (!isNetworkAvailable())
+                                    {
+                                        Toast.makeText(LoginActivity.this, R.string.toast_no_internet_connection, Toast.LENGTH_LONG).show();
+                                    }
+                                    else
+                                    {
+                                        Toast.makeText(LoginActivity.this, R.string.login_activity_toast_login_error, Toast.LENGTH_LONG).show();
+                                    }
+
                                 }
                             }
 
                             @Override
                             public void onFailure(Call<LoginResponse> call, Throwable t) {
                                 super.onFailure(call, t);
                                 connectionProgressDialog.dismiss();
-                                Toast.makeText(LoginActivity.this, R.string.login_activity_toast_login_error, Toast.LENGTH_LONG).show();
+                                if (!isNetworkAvailable())
+                                {
+                                    Toast.makeText(LoginActivity.this, R.string.toast_no_internet_connection, Toast.LENGTH_LONG).show();
+                                }
+                                else
+                                {
+                                    Toast.makeText(LoginActivity.this, R.string.login_activity_toast_login_error, Toast.LENGTH_LONG).show();
+                                }
                             }
                         });
 

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

@@ -29,6 +29,9 @@
     <string name="copy_message">Copy message</string>
     <string name="stream_txt">Stream</string>
     <string name="arrow">❯</string>
+    <string name="toast_no_internet_connection">No internet connection</string>
+    <string name="toast_could_not_connect_to_server">Couldn\'t connect to this server</string>
+    <string name="invalid_url">Invalid URL</string>
     <string name="subject">Topic</string>
     <string name="reply_to_sender">Reply to sender</string>
     <string name="google_app_login_failed">Google Apps login failed for unknown reasons, please contact your distributor.</string>