Merge branch 'develop' into iss424

.github/CONTRIBUTING.md

-# Contributing to Rocket.Chat
-
-:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
-
-The following is a set of guidelines for contributing to Rocket.Chat and its packages, which are hosted in the [Rocket.Chat Organization](https://github.com/RocketChat) on GitHub.
-
-__Note:__ If there's a feature you'd like, there's a bug you'd like to fix, or you'd just like to get involved please raise an issue and start a conversation. We'll help as much as we can so you can get contributing - although we may not always be able to respond right away :)
-
-## Coding standards
-
-We are following / moving to [Google Java Style](https://google.github.io/styleguide/javaguide.html). There's a nice IntelliJ style file for the project in `config/quality/style-guide` for code formatting. (Note: We'll be hosting the style guide file until it's updated in the official repo)
-
-We are evaluating the Google's IntelliJ (and therefore Android Studio) [plugin](https://plugins.jetbrains.com/plugin/8527) for code formatting.
-
-We acknowledge all the code does not meet these standards but we are working to change this over time.
-
-### Syntax check
-
-Before submitting a PR you should get no errors on `checkstyle`.
-
-Just run:
-
-```
-./gradlew checkstyle
-```

.github/ISSUE_TEMPLATE.md

-Your Rocket.Chat.Android version: (make sure you are running the latest)
-<!-- Version can be found by opening the side menu and then clicking on the chevron alongside username -->
+Before writing an issue, please make sure you're talking about the native application and not the Cordova one. If you are looking to open an issue to the Cordova application, go to this URL: https://github.com/RocketChat/Rocket.Chat.Cordova.
 
-<!-- Found a bug? List all devices that reproduced it and all that doesn't -->
-Mobile device model and OS version: (e.g. "Nexus 7 - Android 6.0.1")
-<!-- Don't forget to list the steps to reproduce. Stack traces may help too :) -->
+- Your Rocket.Chat.Android app version: ####
+<!-- Make sure you are running the latest version (which can be found on the hostname screen or by opening the side menu and then clicking on the chevron alongside username -->
+- Your Rocket.Chat server version: ####
+- Device model (or emulator) you're running with: ####
+<!-- e.g. Nexus 7 - Android 6.0.1 -->
+- Steps to reproduce:
+<!-- Stack traces may help too. -->
+
+**The app isn't connecting to your server?**
+Make sure your server supports WebSocket. These are the minimum requirements for Apache 2.4 and Nginx 1.3 or greater.

CONTRIBUTING.md

+# Contributing Guidelines - Rocket.Chat.Android
+
+Great to have you here! Here are a few ways you can help make this project better!
+
+## Reporting an Issue
+
+[Github Issues](https://github.com/RocketChat/Rocket.Chat.Android/issues) are used to track todos, bugs, feature requests, and more.
+
+## Setting up a development environment
+In case you're interested in playing around with the code or giving something back, here are some instructions on how to set up your project:
+
+### Pre-requisites
+1. [Android Studio and SDK Tools](https://developer.android.com/studio/index.html).
+2. Clone this repo:
+```
+git clone https://github.com/RocketChat/Rocket.Chat.Android
+```
+3. Build the project.
+
+### Code style guide
+
+Before submitting a PR you should follow our [Coding Style](https://github.com/filipedelimabrito/Rocket.Chat.Android/blob/develop/CODING_STYLE.md).

android-ddp/src/main/java/chat/rocket/android_ddp/DDPClientImpl.java

@@ -174,7 +174,7 @@ public class DDPClientImpl {
                                   disposables.clear();
                                 }
                               },
-                              err -> task.setError(new DDPClientCallback.Ping.Timeout(client))
+                              err -> task.trySetError(new DDPClientCallback.Ping.Timeout(client))
                       )
       );
 
@@ -213,7 +213,7 @@ public class DDPClientImpl {
                         "error")) {
                       String _id = response.optString("id");
                       if (id.equals(_id)) {
-                        task.setError(new DDPSubscription.NoSub.Error(client, id,
+                        task.trySetError(new DDPSubscription.NoSub.Error(client, id,
                             response.optJSONObject("error")));
                         disposables.clear();
                       }
@@ -284,7 +284,7 @@ public class DDPClientImpl {
                       String _id = response.optString("id");
                       if (id.equals(_id)) {
                         if (!response.isNull("error")) {
-                          task.setError(new DDPClientCallback.RPC.Error(client, id,
+                          task.trySetError(new DDPClientCallback.RPC.Error(client, id,
                               response.optJSONObject("error")));
                         } else {
                           String result = response.optString("result");
@@ -296,7 +296,7 @@ public class DDPClientImpl {
                   },
                   err -> {
                     if (err instanceof TimeoutException) {
-                      task.setError(new DDPClientCallback.RPC.Timeout(client));
+                      task.trySetError(new DDPClientCallback.RPC.Timeout(client));
                     }
                   }
               )
@@ -427,7 +427,7 @@ public class DDPClientImpl {
               }
             },
             err -> {
-              task.trySetError(new Exception(err));
+              setTaskError(task, new Exception(err));
               disposables.clear();
             }
         )
@@ -442,7 +442,10 @@ public class DDPClientImpl {
     }
   }
 
-  private void setTaskError(TaskCompletionSource<? extends RxWebSocketCallback.Base> task, Throwable throwable) {
+  private void setTaskError(TaskCompletionSource task, Throwable throwable) {
+    if (task.getTask().isCompleted()) {
+      return;
+    }
     if (throwable instanceof Exception) {
       task.setError((Exception) throwable);
     } else {

app/build.gradle

@@ -46,8 +46,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 40
-        versionName "1.0.20"
+        versionCode 41
+        versionName "1.0.21"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true

app/src/debug/java/chat/rocket/android/RocketChatApplicationDebug.java

@@ -36,7 +36,7 @@ public class RocketChatApplicationDebug extends RocketChatApplication {
   private void enableStetho() {
     Stetho.initialize(Stetho.newInitializerBuilder(this)
         .enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
-        .enableWebKitInspector(RealmInspectorModulesProvider.builder(this).build())
+        .enableWebKitInspector(RealmInspectorModulesProvider.builder(this).withLimit(Long.MAX_VALUE).build())
         .build());
   }
-}
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/activity/MainActivity.java

@@ -121,14 +121,14 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
           }
         }
       });
-    }
 
-    if (toolbar != null) {
-      toolbar.setNavigationOnClickListener(view -> {
-        if (pane.isSlideable() && !pane.isOpen()) {
-          pane.openPane();
-        }
-      });
+      if (toolbar != null) {
+        toolbar.setNavigationOnClickListener(view -> {
+          if (pane.isSlideable() && !pane.isOpen()) {
+            pane.openPane();
+          }
+        });
+      }
     }
   }
 
@@ -251,12 +251,6 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
             R.string.server_config_activity_authenticating, Snackbar.LENGTH_INDEFINITE));
   }
 
-  public void showLogoutMessage() {
-    statusTicker.updateStatus(StatusTicker.STATUS_LOGGING_OUT,
-            Snackbar.make(findViewById(getLayoutContainerForFragment()),
-                    "Logging Out...", Snackbar.LENGTH_INDEFINITE));
-  }
-
   @Override
   public void showConnectionOk() {
     statusTicker.updateStatus(StatusTicker.STATUS_DISMISS, null);
@@ -314,11 +308,6 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
     }
   }
 
-  @DebugLog
-  public void hideLogoutMessage() {
-    statusTicker.updateStatus(StatusTicker.STATUS_DISMISS, null);
-  }
-
   @DebugLog
   public void onLogout() {
     if (new RocketChatCache(getApplicationContext()).getSelectedServerHostname() == null) {

app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java

@@ -34,6 +34,7 @@ import chat.rocket.android.fragment.sidebar.SidebarMainFragment;
 import chat.rocket.android.helper.AbsoluteUrlHelper;
 import chat.rocket.android.helper.FileUploadHelper;
 import chat.rocket.android.helper.LoadMoreScrollListener;
+import chat.rocket.android.helper.Logger;
 import chat.rocket.android.helper.OnBackPressListener;
 import chat.rocket.android.helper.RecyclerViewAutoScrollManager;
 import chat.rocket.android.helper.RecyclerViewScrolledToBottomListener;
@@ -49,6 +50,7 @@ import chat.rocket.android.layouthelper.extra_action.upload.AbstractUploadAction
 import chat.rocket.android.layouthelper.extra_action.upload.AudioUploadActionItem;
 import chat.rocket.android.layouthelper.extra_action.upload.ImageUploadActionItem;
 import chat.rocket.android.layouthelper.extra_action.upload.VideoUploadActionItem;
+import chat.rocket.android.log.RCLog;
 import chat.rocket.android.renderer.RocketChatUserStatusProvider;
 import chat.rocket.android.service.ConnectivityManager;
 import chat.rocket.android.service.temp.DeafultTempSpotlightRoomCaller;
@@ -340,28 +342,30 @@ public class RoomFragment extends AbstractChatRoomFragment implements
         SlidingPaneLayout subPane = getActivity().findViewById(R.id.sub_sliding_pane);
         sidebarFragment = (SidebarMainFragment) getActivity().getSupportFragmentManager().findFragmentById(R.id.sidebar_fragment_container);
 
-        pane.setPanelSlideListener(new SlidingPaneLayout.PanelSlideListener() {
-            @Override
-            public void onPanelSlide(View view, float v) {
-                messageFormManager.enableComposingText(false);
-                sidebarFragment.clearSearchViewFocus();
-                //Ref: ActionBarDrawerToggle#setProgress
-                toolbar.setNavigationIconProgress(v);
-            }
+        if (pane != null) {
+            pane.setPanelSlideListener(new SlidingPaneLayout.PanelSlideListener() {
+                @Override
+                public void onPanelSlide(View view, float v) {
+                    messageFormManager.enableComposingText(false);
+                    sidebarFragment.clearSearchViewFocus();
+                    //Ref: ActionBarDrawerToggle#setProgress
+                    toolbar.setNavigationIconProgress(v);
+                }
 
-            @Override
-            public void onPanelOpened(View view) {
-                toolbar.setNavigationIconVerticalMirror(true);
-            }
+                @Override
+                public void onPanelOpened(View view) {
+                    toolbar.setNavigationIconVerticalMirror(true);
+                }
 
-            @Override
-            public void onPanelClosed(View view) {
-                messageFormManager.enableComposingText(true);
-                toolbar.setNavigationIconVerticalMirror(false);
-                subPane.closePane();
-                closeUserActionContainer();
-            }
-        });
+                @Override
+                public void onPanelClosed(View view) {
+                    messageFormManager.enableComposingText(true);
+                    toolbar.setNavigationIconVerticalMirror(false);
+                    subPane.closePane();
+                    closeUserActionContainer();
+                }
+            });
+        }
     }
 
     public void closeUserActionContainer() {
@@ -537,6 +541,8 @@ public class RoomFragment extends AbstractChatRoomFragment implements
         try {
             inputContentInfo.releasePermission();
         } catch (Exception e) {
+            RCLog.e(e);
+            Logger.report(e);
         }
 
         return true;
@@ -552,9 +558,11 @@ public class RoomFragment extends AbstractChatRoomFragment implements
 
     @Override
     public void setupWith(RocketChatAbsoluteUrl rocketChatAbsoluteUrl) {
-        token = rocketChatAbsoluteUrl.getToken();
-        userId = rocketChatAbsoluteUrl.getUserId();
-        messageListAdapter.setAbsoluteUrl(rocketChatAbsoluteUrl);
+        if (rocketChatAbsoluteUrl != null) {
+            token = rocketChatAbsoluteUrl.getToken();
+            userId = rocketChatAbsoluteUrl.getUserId();
+            messageListAdapter.setAbsoluteUrl(rocketChatAbsoluteUrl);
+        }
     }
 
     @Override
@@ -657,12 +665,16 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     private void showRoomListFragment(int actionId) {
-        Intent intent = new Intent(getActivity(), RoomActivity.class).putExtra("actionId", actionId)
-                .putExtra("roomId", roomId)
-                .putExtra("roomType", roomType)
-                .putExtra("hostname", hostname)
-                .putExtra("token", token)
-                .putExtra("userId", userId);
-        startActivity(intent);
+        //TODO: oddly sometimes getActivity() yields null. Investigate the situations this might happen
+        //and fix it, removing this null-check
+        if (getActivity() != null) {
+            Intent intent = new Intent(getActivity(), RoomActivity.class).putExtra("actionId", actionId)
+                    .putExtra("roomId", roomId)
+                    .putExtra("roomType", roomType)
+                    .putExtra("hostname", hostname)
+                    .putExtra("token", token)
+                    .putExtra("userId", userId);
+            startActivity(intent);
+        }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainFragment.java

@@ -19,6 +19,7 @@ import com.jakewharton.rxbinding2.support.v7.widget.RxSearchView;
 import com.jakewharton.rxbinding2.widget.RxCompoundButton;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import bolts.Task;
@@ -58,7 +59,7 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
   private RoomListAdapter adapter;
   private SearchView searchView;
   private TextView loadMoreResultsText;
-  private List<RoomSidebar> roomSidebarList;
+  private List<RoomSidebar> roomSidebarList = Collections.emptyList();
   private Disposable spotlightDisposable;
   private String hostname;
   private static final String HOSTNAME = "hostname";
@@ -325,7 +326,6 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
   public void onLogoutCleanUp() {
     Activity activity = getActivity();
     if (activity != null && activity instanceof MainActivity) {
-      ((MainActivity) activity).hideLogoutMessage();
       ((MainActivity) activity).onLogout();
       presenter.onLogout(task -> {
         if (task.isFaulted()) {
@@ -343,7 +343,6 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
       presenter.beforeLogoutCleanUp();
       final Activity activity = getActivity();
       if (activity != null && activity instanceof MainActivity) {
-        ((MainActivity) activity).showLogoutMessage();
         // Clear subscriptions on MainPresenter.
         ((MainActivity) activity).beforeLogoutCleanUp();
       }

app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainPresenter.java

@@ -2,6 +2,7 @@ package chat.rocket.android.fragment.sidebar;
 
 import android.support.annotation.NonNull;
 import android.support.v4.util.Pair;
+import android.webkit.CookieManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -154,7 +155,8 @@ public class SidebarMainPresenter extends BasePresenter<SidebarMainContract.View
         String currentHostname = rocketChatCache.getSelectedServerHostname();
         RealmHelper realmHelper = RealmStore.getOrCreate(currentHostname);
         realmHelper.executeTransaction(realm -> {
-            realm.deleteAll();
+            realm.executeTransactionAsync(realmObj -> realmObj.deleteAll());
+            CookieManager.getInstance().removeAllCookie();
             ConnectivityManagerApi connectivityManagerApi = ConnectivityManager.getInstance(RocketChatApplication.getInstance());
             connectivityManagerApi.removeServer(currentHostname);
             rocketChatCache.removeHostname(currentHostname);

app/src/main/java/chat/rocket/android/service/RocketChatService.java

@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+import chat.rocket.android.helper.Logger;
 import chat.rocket.persistence.realm.RealmStore;
 import hugo.weaving.DebugLog;
 import rx.Observable;
@@ -113,6 +114,10 @@ public class RocketChatService extends Service implements ConnectivityServiceInt
           .doOnSuccess(thread -> {
             webSocketThreads.put(hostname, thread);
             webSocketThreadLock.release();
+          })
+          .doOnError(throwable -> {
+            Logger.report(throwable);
+            webSocketThreadLock.release();
           });
     });
   }

persistence-realm/src/main/java/chat/rocket/persistence/realm/RealmHelper.java

@@ -122,7 +122,7 @@ public class RealmHelper {
     return task.getTask();
   }
 
-  private Task<Void> executeTransactionAsync(final RealmHelper.Transaction transaction) {
+  public Task<Void> executeTransactionAsync(final RealmHelper.Transaction transaction) {
     final TaskCompletionSource<Void> task = new TaskCompletionSource<>();
 
     final Realm realm = instance();