Merge pull request #584 from RocketChat/fix/crash

Fix connect timeout crash

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 53
-        versionName "1.0.30"
+        versionCode 54
+        versionName "1.0.31"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true

app/src/main/java/chat/rocket/android/RocketChatApplication.java

@@ -7,8 +7,8 @@ import android.support.v7.app.AppCompatDelegate;
 import com.crashlytics.android.Crashlytics;
 
 import java.util.List;
-import java.util.concurrent.TimeoutException;
 
+import chat.rocket.android.helper.Logger;
 import chat.rocket.android.helper.OkHttpHelper;
 import chat.rocket.android.service.ConnectivityManager;
 import chat.rocket.android.widget.RocketChatWidgets;
@@ -54,13 +54,10 @@ public class RocketChatApplication extends MultiDexApplication {
             if (e instanceof UndeliverableException) {
                 e = e.getCause();
             }
-            if (e instanceof TimeoutException) {
-                // Some work timed-out after a server change is most probable.
-                return;
+            if (BuildConfig.DEBUG) {
+                e.printStackTrace();
             }
-
-            Thread.currentThread().getUncaughtExceptionHandler()
-                    .uncaughtException(Thread.currentThread(), e);
+            Logger.report(e);
         });
 
         instance = this;

app/src/main/java/chat/rocket/android/api/MethodCallHelper.java

@@ -114,6 +114,8 @@ public class MethodCallHelper {
           return Task.forError(new Exception(errMessage));
         } else if (exception instanceof DDPClientCallback.RPC.Timeout) {
           return Task.forError(new MethodCall.Timeout());
+        } else if (exception instanceof DDPClientCallback.Closed) {
+          return Task.forError(new Exception("Oops, your connection seems off..."));
         } else {
           return Task.forError(exception);
         }