Migrate RxJava 1.x to 2.x

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

@@ -2,6 +2,7 @@ package chat.rocket.android_ddp;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+
 import org.json.JSONObject;
 
 public class DDPClientCallback {

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

 package chat.rocket.android_ddp;
 
 import android.support.annotation.NonNull;
+
 import org.json.JSONArray;
 import org.json.JSONObject;
 

android-ddp/src/main/java/chat/rocket/android_ddp/rx/RxWebSocket.java

 package chat.rocket.android_ddp.rx;
 
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 import chat.rocket.android.log.RCLog;
 import io.reactivex.BackpressureStrategy;

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

 package chat.rocket.android;
 
 import android.os.StrictMode;
+
 import com.facebook.stetho.Stetho;
 import com.tspoon.traceur.Traceur;
 import com.uphyca.stetho_realm.RealmInspectorModulesProvider;

app/src/debug/java/chat/rocket/android/helper/OkHttpHelper.kt

@@ -5,8 +5,8 @@ import chat.rocket.android.RocketChatCache
 import chat.rocket.android.api.rest.CookieInterceptor
 import chat.rocket.android.api.rest.DefaultCookieProvider
 import com.facebook.stetho.okhttp3.StethoInterceptor
-import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
+import java.util.concurrent.TimeUnit
 
 object OkHttpHelper {
 

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

@@ -17,7 +17,6 @@ import java.util.UUID;
 import chat.rocket.android.helper.Logger;
 import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.log.RCLog;
-import chat.rocket.android.push.PushManager;
 import chat.rocket.core.utils.Pair;
 import io.reactivex.BackpressureStrategy;
 import io.reactivex.Flowable;

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

@@ -8,8 +8,8 @@ import android.support.v4.app.Fragment;
 import chat.rocket.android.R;
 import chat.rocket.android.fragment.server_config.LoginFragment;
 import chat.rocket.android.fragment.server_config.RetryLoginFragment;
-import chat.rocket.core.interactors.SessionInteractor;
 import chat.rocket.android.service.ConnectivityManager;
+import chat.rocket.core.interactors.SessionInteractor;
 import chat.rocket.persistence.realm.repositories.RealmSessionRepository;
 
 /**

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

@@ -2,14 +2,13 @@ package chat.rocket.android.activity;
 
 import android.support.annotation.NonNull;
 
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-
 import chat.rocket.android.BackgroundLooper;
 import chat.rocket.android.helper.Logger;
 import chat.rocket.android.service.ConnectivityManagerApi;
 import chat.rocket.android.shared.BasePresenter;
 import chat.rocket.core.interactors.SessionInteractor;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
 
 public class LoginPresenter extends BasePresenter<LoginContract.View>
     implements LoginContract.Presenter {

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

@@ -28,7 +28,6 @@ import chat.rocket.core.models.Session;
 import chat.rocket.core.models.User;
 import chat.rocket.core.repositories.PublicSettingRepository;
 import chat.rocket.core.utils.Pair;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
 import io.reactivex.Flowable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -220,7 +219,7 @@ public class MainPresenter extends BasePresenter<MainContract.View>
   }
 
   private void subscribeToNetworkChanges() {
-    Disposable disposable = RxJavaInterop.toV2Flowable(connectivityManagerApi.getServerConnectivityAsObservable())
+    Disposable disposable = connectivityManagerApi.getServerConnectivityAsObservable()
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(
                     connectivity -> {

app/src/main/java/chat/rocket/android/api/rest/CookieInterceptor.java

 package chat.rocket.android.api.rest;
 
 import java.io.IOException;
+
 import chat.rocket.android.helper.TextUtils;
 import okhttp3.Interceptor;
 import okhttp3.Request;

app/src/main/java/chat/rocket/android/api/rest/DefaultCookieProvider.java

 package chat.rocket.android.api.rest;
 
 import chat.rocket.android.RocketChatCache;
-import chat.rocket.persistence.realm.models.ddp.RealmUser;
-import chat.rocket.persistence.realm.models.internal.RealmSession;
 import chat.rocket.persistence.realm.RealmHelper;
 import chat.rocket.persistence.realm.RealmStore;
+import chat.rocket.persistence.realm.models.ddp.RealmUser;
+import chat.rocket.persistence.realm.models.internal.RealmSession;
 
 public class DefaultCookieProvider implements CookieProvider {
 

app/src/main/java/chat/rocket/android/api/rest/DefaultServerPolicyApi.java

@@ -2,12 +2,13 @@ package chat.rocket.android.api.rest;
 
 import android.support.annotation.NonNull;
 
-import io.reactivex.BackpressureStrategy;
-import io.reactivex.Flowable;
-import io.reactivex.FlowableEmitter;
 import org.json.JSONObject;
 
 import java.io.IOException;
+
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Flowable;
+import io.reactivex.FlowableEmitter;
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;

app/src/main/java/chat/rocket/android/api/rest/ServerPolicyApi.java

 package chat.rocket.android.api.rest;
 
-import io.reactivex.Flowable;
 import org.json.JSONObject;
 
+import io.reactivex.Flowable;
+
 public interface ServerPolicyApi {
 
   String SECURE_PROTOCOL = "https://";

app/src/main/java/chat/rocket/android/fragment/AbstractFragment.java

@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+
 import com.trello.rxlifecycle2.components.support.RxFragment;
 
 /**

app/src/main/java/chat/rocket/android/fragment/add_server/InputHostnameFragment.java

@@ -7,6 +7,7 @@ import android.support.constraint.ConstraintLayout;
 import android.support.design.widget.Snackbar;
 import android.view.View;
 import android.widget.TextView;
+
 import chat.rocket.android.BuildConfig;
 import chat.rocket.android.LaunchUtil;
 import chat.rocket.android.R;

app/src/main/java/chat/rocket/android/fragment/add_server/InputHostnamePresenter.java

 package chat.rocket.android.fragment.add_server;
 
 import chat.rocket.android.BackgroundLooper;
-import chat.rocket.android.helper.Logger;
-import chat.rocket.android.helper.OkHttpHelper;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-
 import chat.rocket.android.RocketChatCache;
 import chat.rocket.android.api.rest.DefaultServerPolicyApi;
 import chat.rocket.android.api.rest.ServerPolicyApi;
+import chat.rocket.android.helper.Logger;
+import chat.rocket.android.helper.OkHttpHelper;
 import chat.rocket.android.helper.ServerPolicyApiValidationHelper;
 import chat.rocket.android.helper.ServerPolicyHelper;
 import chat.rocket.android.service.ConnectivityManagerApi;
 import chat.rocket.android.shared.BasePresenter;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
 
 public class InputHostnamePresenter extends BasePresenter<InputHostnameContract.View> implements InputHostnameContract.Presenter {
   private final RocketChatCache rocketChatCache;

app/src/main/java/chat/rocket/android/fragment/chatroom/dialog/MessageOptionsDialogFragment.java

@@ -10,11 +10,6 @@ import android.support.v4.util.Pair;
 import android.view.View;
 import android.widget.TextView;
 
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-
 import chat.rocket.android.BackgroundLooper;
 import chat.rocket.android.R;
 import chat.rocket.android.RocketChatCache;
@@ -34,6 +29,10 @@ import chat.rocket.persistence.realm.repositories.RealmPublicSettingRepository;
 import chat.rocket.persistence.realm.repositories.RealmRoomRepository;
 import chat.rocket.persistence.realm.repositories.RealmRoomRoleRepository;
 import chat.rocket.persistence.realm.repositories.RealmUserRepository;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
 
 public class MessageOptionsDialogFragment extends BottomSheetDialogFragment {
 

app/src/main/java/chat/rocket/android/fragment/oauth/OAuthPresenter.java

 package chat.rocket.android.fragment.oauth;
 
-import io.reactivex.android.schedulers.AndroidSchedulers;
 import org.json.JSONObject;
 
 import chat.rocket.android.BackgroundLooper;
@@ -10,6 +9,7 @@ import chat.rocket.android.helper.Logger;
 import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.shared.BasePresenter;
 import chat.rocket.core.repositories.LoginServiceConfigurationRepository;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 
 public class OAuthPresenter extends BasePresenter<OAuthContract.View>
     implements OAuthContract.Presenter {

app/src/main/java/chat/rocket/android/fragment/server_config/LoginContract.java

 package chat.rocket.android.fragment.server_config;
 
 import java.util.List;
+
 import chat.rocket.android.shared.BaseContract;
 import chat.rocket.core.models.LoginServiceConfiguration;
 

app/src/main/java/chat/rocket/android/fragment/server_config/LoginFragment.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import java.util.HashMap;
 import java.util.List;
+
 import chat.rocket.android.R;
 import chat.rocket.android.api.MethodCallHelper;
 import chat.rocket.android.layouthelper.oauth.OAuthProviderInfo;

app/src/main/java/chat/rocket/android/fragment/server_config/LoginPresenter.java

@@ -3,7 +3,6 @@ package chat.rocket.android.fragment.server_config;
 import android.support.annotation.NonNull;
 
 import com.hadisatrio.optional.Optional;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 
 import bolts.Task;
 import chat.rocket.android.BackgroundLooper;
@@ -16,6 +15,7 @@ import chat.rocket.core.PublicSettingsConstants;
 import chat.rocket.core.models.PublicSetting;
 import chat.rocket.core.repositories.LoginServiceConfigurationRepository;
 import chat.rocket.core.repositories.PublicSettingRepository;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 
 public class LoginPresenter extends BasePresenter<LoginContract.View>
     implements LoginContract.Presenter {

app/src/main/java/chat/rocket/android/fragment/server_config/RetryLoginPresenter.java

@@ -3,7 +3,6 @@ package chat.rocket.android.fragment.server_config;
 import android.support.annotation.NonNull;
 
 import com.hadisatrio.optional.Optional;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 
 import chat.rocket.android.BackgroundLooper;
 import chat.rocket.android.api.MethodCallHelper;
@@ -12,6 +11,7 @@ import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.shared.BasePresenter;
 import chat.rocket.core.interactors.SessionInteractor;
 import chat.rocket.core.models.Session;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 
 public class RetryLoginPresenter extends BasePresenter<RetryLoginContract.View>
     implements RetryLoginContract.Presenter {

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

@@ -2,13 +2,14 @@ package chat.rocket.android.fragment.sidebar;
 
 import android.support.annotation.NonNull;
 
-import bolts.Continuation;
-import chat.rocket.core.models.RoomSidebar;
-import io.reactivex.Flowable;
 import java.util.List;
+
+import bolts.Continuation;
 import chat.rocket.android.shared.BaseContract;
+import chat.rocket.core.models.RoomSidebar;
 import chat.rocket.core.models.Spotlight;
 import chat.rocket.core.models.User;
+import io.reactivex.Flowable;
 
 public interface SidebarMainContract {
 

app/src/main/java/chat/rocket/android/fragment/sidebar/dialog/AddDirectMessageDialogFragment.java

@@ -5,11 +5,9 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.AutoCompleteTextView;
 import android.widget.TextView;
+
 import com.hadisatrio.optional.Optional;
 import com.jakewharton.rxbinding2.widget.RxTextView;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.realm.Case;
 
 import bolts.Task;
 import chat.rocket.android.BackgroundLooper;
@@ -20,11 +18,14 @@ import chat.rocket.android.helper.Logger;
 import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.layouthelper.sidebar.dialog.SuggestUserAdapter;
 import chat.rocket.core.interactors.SessionInteractor;
-import chat.rocket.persistence.realm.models.ddp.RealmUser;
 import chat.rocket.persistence.realm.RealmAutoCompleteAdapter;
+import chat.rocket.persistence.realm.models.ddp.RealmUser;
 import chat.rocket.persistence.realm.repositories.RealmServerInfoRepository;
 import chat.rocket.persistence.realm.repositories.RealmSessionRepository;
 import chat.rocket.persistence.realm.repositories.RealmUserRepository;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.realm.Case;
 
 /**
  * add Direct RealmMessage.

app/src/main/java/chat/rocket/android/helper/AbsoluteUrlHelper.java

 package chat.rocket.android.helper;
 
 import com.hadisatrio.optional.Optional;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
 
 import chat.rocket.android.fragment.chatroom.RocketChatAbsoluteUrl;
 import chat.rocket.core.interactors.SessionInteractor;
 import chat.rocket.core.repositories.ServerInfoRepository;
 import chat.rocket.core.repositories.UserRepository;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
 
 public class AbsoluteUrlHelper {
 

app/src/main/java/chat/rocket/android/helper/DateTime.java

@@ -9,6 +9,7 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
+
 import chat.rocket.android.log.RCLog;
 
 /**

app/src/main/java/chat/rocket/android/helper/FileUploadHelper.java

@@ -8,16 +8,18 @@ import android.os.ParcelFileDescriptor;
 import android.provider.OpenableColumns;
 import android.support.annotation.Nullable;
 import android.webkit.MimeTypeMap;
+
 import org.json.JSONObject;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.UUID;
+
 import chat.rocket.android.log.RCLog;
 import chat.rocket.core.SyncState;
+import chat.rocket.persistence.realm.RealmHelper;
 import chat.rocket.persistence.realm.models.ddp.RealmPublicSetting;
 import chat.rocket.persistence.realm.models.internal.FileUploading;
-import chat.rocket.persistence.realm.RealmHelper;
 
 /**
  * utility class for uploading file.

app/src/main/java/chat/rocket/android/helper/GcmPushSettingHelper.java

 package chat.rocket.android.helper;
 
-import io.realm.Realm;
-import io.realm.RealmResults;
-
 import java.util.List;
-import chat.rocket.persistence.realm.models.ddp.RealmPublicSetting;
+
 import chat.rocket.core.PublicSettingsConstants;
+import chat.rocket.persistence.realm.models.ddp.RealmPublicSetting;
+import io.realm.Realm;
+import io.realm.RealmResults;
 
 /**
  * utility class for getting value comprehensibly from public settings list.

app/src/main/java/chat/rocket/android/helper/RxHelper.java

 package chat.rocket.android.helper;
 
 import java.util.concurrent.TimeUnit;
-import rx.Observable;
-import rx.functions.Func1;
+
+import io.reactivex.Flowable;
+import io.reactivex.functions.Function;
 
 /**
  * Rx operator and so on.
  */
 public class RxHelper {
-  public static Func1<Observable<? extends Throwable>, Observable<?>> exponentialBackoff(
+  public static Function<Flowable<? extends Throwable>, Flowable<?>> exponentialBackoff(
       int maxRetryCount, long base, TimeUnit unit) {
 
     // ref: https://github.com/ReactiveX/RxJava/blob/a8ba158839b67246a742b6f1531995ffd7545c08/src/main/java/io/reactivex/Observable.java#L9601
     return attempts -> attempts
-        .zipWith(Observable.range(0, maxRetryCount), (error, retryCount) -> retryCount)
-        .flatMap(retryCount -> Observable.timer(base * (long) Math.pow(2, retryCount), unit));
+        .zipWith(Flowable.range(0, maxRetryCount), (error, retryCount) -> retryCount)
+        .flatMap(retryCount -> Flowable.timer(base * (long) Math.pow(2, retryCount), unit));
   }
 }

app/src/main/java/chat/rocket/android/helper/ServerPolicyApiValidationHelper.java

@@ -2,9 +2,8 @@ package chat.rocket.android.helper;
 
 import android.support.annotation.NonNull;
 
-import io.reactivex.Flowable;
-
 import chat.rocket.android.api.rest.ServerPolicyApi;
+import io.reactivex.Flowable;
 
 public class ServerPolicyApiValidationHelper {
 

app/src/main/java/chat/rocket/android/helper/ServerPolicyHelper.java

@@ -2,9 +2,10 @@ package chat.rocket.android.helper;
 
 import android.support.annotation.NonNull;
 
-import io.reactivex.Flowable;
 import org.json.JSONObject;
 
+import io.reactivex.Flowable;
+
 public class ServerPolicyHelper {
 
   private static final String DEFAULT_HOST = ".rocket.chat";

app/src/main/java/chat/rocket/android/layouthelper/chatroom/AbstractMessageViewHolder.java

@@ -4,6 +4,7 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import chat.rocket.android.R;
 import chat.rocket.android.helper.DateTime;
 import chat.rocket.android.helper.TextUtils;

app/src/main/java/chat/rocket/android/layouthelper/chatroom/MessageListAdapter.java

@@ -7,6 +7,7 @@ import android.view.View;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import chat.rocket.android.R;
 import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.layouthelper.ExtModelListAdapter;

app/src/main/java/chat/rocket/android/layouthelper/chatroom/MessageNormalViewHolder.java

 package chat.rocket.android.layouthelper.chatroom;
 
 import android.view.View;
+
 import chat.rocket.android.R;
 import chat.rocket.android.renderer.MessageRenderer;
 import chat.rocket.android.widget.AbsoluteUrl;

app/src/main/java/chat/rocket/android/layouthelper/chatroom/list/RoomUserAdapter.java

@@ -7,13 +7,14 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import java.util.List;
+
 import chat.rocket.android.R;
 import chat.rocket.android.helper.TextUtils;
+import chat.rocket.android.renderer.UserRenderer;
 import chat.rocket.android.widget.AbsoluteUrl;
 import chat.rocket.core.models.User;
-import chat.rocket.persistence.realm.models.ddp.RealmUser;
 import chat.rocket.persistence.realm.RealmHelper;
-import chat.rocket.android.renderer.UserRenderer;
+import chat.rocket.persistence.realm.models.ddp.RealmUser;
 
 /**
  * RecyclerView adapter for UsersOfRooms.

app/src/main/java/chat/rocket/android/layouthelper/chatroom/roomlist/ChannelRoomListHeader.java

@@ -2,9 +2,10 @@ package chat.rocket.android.layouthelper.chatroom.roomlist;
 
 import android.support.annotation.NonNull;
 
-import chat.rocket.core.models.RoomSidebar;
 import java.util.List;
+
 import chat.rocket.core.models.Room;
+import chat.rocket.core.models.RoomSidebar;
 
 public class ChannelRoomListHeader implements RoomListHeader {
 

app/src/main/java/chat/rocket/android/layouthelper/chatroom/roomlist/DirectMessageRoomListHeader.java

@@ -2,9 +2,10 @@ package chat.rocket.android.layouthelper.chatroom.roomlist;
 
 import android.support.annotation.NonNull;
 
-import chat.rocket.core.models.RoomSidebar;
 import java.util.List;
+
 import chat.rocket.core.models.Room;
+import chat.rocket.core.models.RoomSidebar;
 
 public class DirectMessageRoomListHeader implements RoomListHeader {
 

app/src/main/java/chat/rocket/android/layouthelper/chatroom/roomlist/FavoriteRoomListHeader.java

@@ -2,9 +2,10 @@ package chat.rocket.android.layouthelper.chatroom.roomlist;
 
 import android.support.annotation.NonNull;
 
-import chat.rocket.core.models.RoomSidebar;
 import java.util.List;
 
+import chat.rocket.core.models.RoomSidebar;
+
 public class FavoriteRoomListHeader implements RoomListHeader {
 
   private final String title;

app/src/main/java/chat/rocket/android/layouthelper/chatroom/roomlist/RoomListAdapter.java

@@ -5,14 +5,15 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
-import chat.rocket.core.models.RoomSidebar;
-import chat.rocket.core.models.Spotlight;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import chat.rocket.android.R;
 import chat.rocket.android.widget.internal.RoomListItemView;
+import chat.rocket.core.models.RoomSidebar;
+import chat.rocket.core.models.Spotlight;
 
 public class RoomListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 

app/src/main/java/chat/rocket/android/layouthelper/chatroom/roomlist/RoomListHeader.java

@@ -2,9 +2,10 @@ package chat.rocket.android.layouthelper.chatroom.roomlist;
 
 import android.support.annotation.NonNull;
 
-import chat.rocket.core.models.RoomSidebar;
 import java.util.List;
 
+import chat.rocket.core.models.RoomSidebar;
+
 public interface RoomListHeader {
 
   String getTitle();

app/src/main/java/chat/rocket/android/layouthelper/chatroom/roomlist/UnreadRoomListHeader.java

@@ -2,9 +2,10 @@ package chat.rocket.android.layouthelper.chatroom.roomlist;
 
 import android.support.annotation.NonNull;
 
-import chat.rocket.core.models.RoomSidebar;
 import java.util.List;
 
+import chat.rocket.core.models.RoomSidebar;
+
 public class UnreadRoomListHeader implements RoomListHeader {
 
   private final String title;

app/src/main/java/chat/rocket/android/layouthelper/oauth/OAuthProviderInfo.java

@@ -3,6 +3,7 @@ package chat.rocket.android.layouthelper.oauth;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import chat.rocket.android.R;
 import chat.rocket.android.fragment.oauth.AbstractOAuthFragment;
 import chat.rocket.android.fragment.oauth.FacebookOAuthFragment;

app/src/main/java/chat/rocket/android/layouthelper/sidebar/dialog/SuggestUserAdapter.java

@@ -5,11 +5,12 @@ import android.view.View;
 
 import java.util.Iterator;
 import java.util.List;
+
 import chat.rocket.android.R;
+import chat.rocket.android.renderer.UserRenderer;
 import chat.rocket.android.widget.AbsoluteUrl;
-import chat.rocket.persistence.realm.models.ddp.RealmUser;
 import chat.rocket.persistence.realm.RealmAutoCompleteAdapter;
-import chat.rocket.android.renderer.UserRenderer;
+import chat.rocket.persistence.realm.models.ddp.RealmUser;
 
 /**
  * adapter to suggest user names.

app/src/main/java/chat/rocket/android/push/BackgroundActionButtonHandler.java

@@ -5,8 +5,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.support.v4.app.RemoteInput;
+import android.util.Log;
 
 import chat.rocket.android.push.gcm.GCMIntentService;
 

app/src/main/java/chat/rocket/android/push/gcm/GcmInstanceIDListenerService.java

@@ -3,13 +3,14 @@ package chat.rocket.android.push.gcm;
 import com.google.android.gms.iid.InstanceIDListenerService;
 
 import java.util.List;
+
 import chat.rocket.android.helper.GcmPushSettingHelper;
-import chat.rocket.persistence.realm.models.ddp.RealmPublicSetting;
-import chat.rocket.persistence.realm.models.internal.GcmPushRegistration;
-import chat.rocket.persistence.realm.RealmHelper;
-import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.android.service.ConnectivityManager;
 import chat.rocket.core.models.ServerInfo;
+import chat.rocket.persistence.realm.RealmHelper;
+import chat.rocket.persistence.realm.RealmStore;
+import chat.rocket.persistence.realm.models.ddp.RealmPublicSetting;
+import chat.rocket.persistence.realm.models.internal.GcmPushRegistration;
 
 public class GcmInstanceIDListenerService extends InstanceIDListenerService {
 

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

@@ -4,9 +4,10 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.util.List;
+
 import chat.rocket.core.models.ServerInfo;
-import rx.Observable;
-import rx.Single;
+import io.reactivex.Observable;
+import io.reactivex.Single;
 
 /**
  * interfaces used for Activity/Fragment and other UI-related logic.

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

 package chat.rocket.android.service;
 
 import java.util.List;
+
 import chat.rocket.core.models.ServerInfo;
 
 /**

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

 package chat.rocket.android.service;
 
-import rx.Single;
+import io.reactivex.Single;
 
 public interface ConnectivityServiceInterface {
   Single<Boolean> ensureConnectionToServer(String hostname);

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

@@ -20,10 +20,10 @@ import chat.rocket.android_ddp.DDPClient;
 import chat.rocket.core.models.ServerInfo;
 import chat.rocket.persistence.realm.models.RealmBasedServerInfo;
 import hugo.weaving.DebugLog;
-import rx.Observable;
-import rx.Single;
-import rx.schedulers.Schedulers;
-import rx.subjects.PublishSubject;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.schedulers.Schedulers;
+import io.reactivex.subjects.PublishSubject;
 
 /**
  * Connectivity management implementation.
@@ -155,7 +155,7 @@ import rx.subjects.PublishSubject;
 
   @Override
   public Observable<ServerConnectivity> getServerConnectivityAsObservable() {
-    return Observable.concat(Observable.from(getCurrentConnectivityList()), connectivitySubject);
+    return Observable.concat(Observable.fromIterable(getCurrentConnectivityList()), connectivitySubject);
   }
 
   @Override
@@ -176,11 +176,6 @@ import rx.subjects.PublishSubject;
             .flatMap(_val -> connectToServerIfNeeded(hostname, forceConnect));
       }
 
-//      if (connectivity == ServerConnectivity.STATE_CONNECTING) {
-//        return waitForConnected(hostname)
-//                .doOnError(error -> notifyConnectionLost(hostname, REASON_NETWORK_ERROR));
-//      }
-
       if (connectivity == ServerConnectivity.STATE_DISCONNECTED) {
         notifyConnecting(hostname);
       }
@@ -219,7 +214,7 @@ import rx.subjects.PublishSubject;
         .filter(state ->
             state == ServerConnectivity.STATE_CONNECTED
                 || state == ServerConnectivity.STATE_DISCONNECTED)
-        .first()
+        .firstElement()
         .toSingle()
         .flatMap(state ->
             state == ServerConnectivity.STATE_CONNECTED
@@ -233,7 +228,7 @@ import rx.subjects.PublishSubject;
         .filter(serverConnectivity -> hostname.equals(serverConnectivity.hostname))
         .map(serverConnectivity -> serverConnectivity.state)
         .filter(state -> state == ServerConnectivity.STATE_DISCONNECTED)
-        .first()
+        .firstElement()
         .toSingle()
         .map(state -> true);
   }

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

@@ -15,8 +15,8 @@ import chat.rocket.android.helper.Logger;
 import chat.rocket.android.log.RCLog;
 import chat.rocket.persistence.realm.RealmStore;
 import hugo.weaving.DebugLog;
-import rx.Observable;
-import rx.Single;
+import io.reactivex.Observable;
+import io.reactivex.Single;
 
 /**
  * Background service for Rocket.Chat.Application class.
@@ -72,7 +72,6 @@ public class RocketChatService extends Service implements ConnectivityServiceInt
         .doOnError(err -> {
           err.printStackTrace();
           currentWebSocketThread = null;
-//          connectivityManager.notifyConnectionLost(hostname, ConnectivityManagerInternal.REASON_NETWORK_ERROR);
         })
         .flatMap(webSocketThreads -> webSocketThreads.keepAlive());
   }
@@ -93,7 +92,7 @@ public class RocketChatService extends Service implements ConnectivityServiceInt
               RealmStore.sStore.remove(hostname);
             });
       } else {
-        return Observable.timer(1, TimeUnit.SECONDS).toSingle()
+        return Observable.timer(1, TimeUnit.SECONDS).singleOrError()
             .flatMap(_val -> disconnectFromServer(hostname));
       }
     });

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

@@ -41,11 +41,10 @@ import chat.rocket.persistence.realm.RealmHelper;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.internal.RealmSession;
 import hugo.weaving.DebugLog;
+import io.reactivex.Completable;
 import io.reactivex.Flowable;
+import io.reactivex.Single;
 import io.reactivex.disposables.CompositeDisposable;
-import rx.Completable;
-import rx.Single;
-import rx.subscriptions.CompositeSubscription;
 
 /**
  * Thread for handling WebSocket connection.
@@ -74,7 +73,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
   private final ConnectivityManagerInternal connectivityManager;
   private final ArrayList<Registrable> listeners = new ArrayList<>();
   private final CompositeDisposable hearbeatDisposable = new CompositeDisposable();
-  private final CompositeSubscription reconnectSubscription = new CompositeSubscription();
+  private final CompositeDisposable reconnectSubscription = new CompositeDisposable();
   private boolean listenersRegistered;
 
   private static class KeepAliveTimer {
@@ -110,13 +109,14 @@ public class RocketChatWebSocketThread extends HandlerThread {
    */
   @DebugLog
   public static Single<RocketChatWebSocketThread> getStarted(Context appContext, String hostname) {
-    return Single.<RocketChatWebSocketThread>fromEmitter(objectSingleEmitter -> {
+    return Single.<RocketChatWebSocketThread>fromPublisher(objectSingleEmitter -> {
       new RocketChatWebSocketThread(appContext, hostname) {
         @Override
         protected void onLooperPrepared() {
           try {
             super.onLooperPrepared();
-            objectSingleEmitter.onSuccess(this);
+            objectSingleEmitter.onNext(this);
+            objectSingleEmitter.onComplete();
           } catch (Exception exception) {
             objectSingleEmitter.onError(exception);
           }
@@ -151,14 +151,15 @@ public class RocketChatWebSocketThread extends HandlerThread {
   @DebugLog
   public Single<Boolean> terminate() {
     if (isAlive()) {
-      return Single.fromEmitter(emitter -> {
+      return Single.fromPublisher(emitter -> {
         new Handler(getLooper()).post(() -> {
           RCLog.d("thread %s: terminated()", Thread.currentThread().getId());
           unregisterListenersAndClose();
           connectivityManager.notifyConnectionLost(hostname,
               DDPClient.REASON_CLOSED_BY_USER);
           RocketChatWebSocketThread.super.quit();
-          emitter.onSuccess(true);
+          emitter.onNext(true);
+          emitter.onComplete();
         });
       });
     } else {
@@ -198,7 +199,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
     }
     keepAliveTimer.update();
 
-    return Single.fromEmitter(emitter -> {
+    return Single.fromPublisher(emitter -> {
       new Thread() {
         @Override
         public void run() {
@@ -211,7 +212,8 @@ public class RocketChatWebSocketThread extends HandlerThread {
               emitter.onError(error);
             } else {
               keepAliveTimer.update();
-              emitter.onSuccess(true);
+              emitter.onNext(true);
+              emitter.onComplete();
             }
             return null;
           });
@@ -251,10 +253,11 @@ public class RocketChatWebSocketThread extends HandlerThread {
 
   private Single<Boolean> connectDDPClient() {
     return prepareDDPClient()
-        .flatMap(_val -> Single.fromEmitter(emitter -> {
+        .flatMap(_val -> Single.fromPublisher(emitter -> {
           ServerInfo info = connectivityManager.getServerInfoForHost(hostname);
           if (info == null) {
-            emitter.onSuccess(false);
+            emitter.onNext(false);
+            emitter.onComplete();
             return;
           }
           RCLog.d("DDPClient#connect");
@@ -292,7 +295,8 @@ public class RocketChatWebSocketThread extends HandlerThread {
                     if (task.isFaulted()) {
                       emitter.onError(task.getError());
                     } else {
-                      emitter.onSuccess(true);
+                      emitter.onNext(true);
+                      emitter.onComplete();
                     }
                     return null;
                   });
@@ -301,13 +305,11 @@ public class RocketChatWebSocketThread extends HandlerThread {
 
   private void reconnect() {
     // if we are already trying to reconnect then return.
-    if (reconnectSubscription.hasSubscriptions()) {
+    if (reconnectSubscription.size() > 0) {
       return;
     }
     forceInvalidateTokens();
     connectivityManager.notifyConnecting(hostname);
-    // Needed to use subscriptions because of legacy code.
-    // TODO: Should update to RxJava 2
     reconnectSubscription.add(
         connectWithExponentialBackoff()
             .subscribe(
@@ -326,9 +328,9 @@ public class RocketChatWebSocketThread extends HandlerThread {
     );
   }
 
-  private void logErrorAndUnsubscribe(CompositeSubscription subscriptions, Throwable err) {
+  private void logErrorAndUnsubscribe(CompositeDisposable disposables, Throwable err) {
     RCLog.e(err);
-    subscriptions.clear();
+    disposables.clear();
   }
 
   private Single<Boolean> connectWithExponentialBackoff() {
@@ -338,11 +340,12 @@ public class RocketChatWebSocketThread extends HandlerThread {
   @DebugLog
   private Single<Boolean> connect() {
     return connectDDPClient()
-        .flatMap(_val -> Single.fromEmitter(emitter -> {
+        .flatMap(_val -> Single.fromPublisher(emitter -> {
           fetchPublicSettings();
           fetchPermissions();
           registerListeners();
-          emitter.onSuccess(true);
+          emitter.onNext(true);
+          emitter.onComplete();
         }));
   }
 
@@ -376,9 +379,9 @@ public class RocketChatWebSocketThread extends HandlerThread {
     if (sessions != null && sessions.size() > 0) {
       // if we have a session try to resume it. At this point we're probably recovering from
       // a disconnection state
-      final CompositeSubscription subscriptions = new CompositeSubscription();
+      final CompositeDisposable disposables = new CompositeDisposable();
       MethodCallHelper methodCall = new MethodCallHelper(realmHelper);
-      subscriptions.add(
+      disposables.add(
               Completable.defer(() -> {
                 Task<Void> result = methodCall.loginWithToken(sessions.get(0).getToken());
                 if (result.isFaulted()) {
@@ -390,9 +393,9 @@ public class RocketChatWebSocketThread extends HandlerThread {
                 .subscribe(
                       () -> {
                         createObserversAndRegister();
-                        subscriptions.clear();
+                        disposables.clear();
                       },
-                      error -> logErrorAndUnsubscribe(subscriptions, error)
+                      error -> logErrorAndUnsubscribe(disposables, error)
               )
       );
     } else {

build.gradle

@@ -12,11 +12,12 @@ buildscript {
         google()
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
+        maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.51"
-        classpath 'io.realm:realm-gradle-plugin:3.0.0'
+        classpath 'io.realm:realm-gradle-plugin:4.2.0-SNAPSHOT'
         classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
@@ -35,6 +36,7 @@ allprojects {
         maven { url 'http://dl.bintray.com/amulyakhare/maven' } //for TextDrawable.
         maven { url "https://clojars.org/repo/" } //for icepick.
         maven { url 'https://jitpack.io' } //for widget-fontawesome.
+        maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local' } //for widget-fontawesome.
     }
 }
 

persistence-realm/build.gradle

@@ -37,7 +37,6 @@ dependencies {
     compile supportDependencies.annotation
     compile supportDependencies.designSupportLibrary
     compile extraDependencies.rxAndroid
-    compile 'com.github.akarnokd:rxjava2-interop:0.10.2'
     provided extraDependencies.optional
     testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"

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

 package chat.rocket.persistence.realm;
 
-import io.realm.DynamicRealm;
-import io.realm.FieldAttribute;
-import io.realm.RealmMigration;
-import io.realm.RealmObjectSchema;
-import io.realm.RealmSchema;
-
 import chat.rocket.persistence.realm.models.ddp.RealmMessage;
 import chat.rocket.persistence.realm.models.ddp.RealmPermission;
 import chat.rocket.persistence.realm.models.ddp.RealmRole;
 import chat.rocket.persistence.realm.models.ddp.RealmRoomRole;
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlightRoom;
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlightUser;
+import io.realm.DynamicRealm;
+import io.realm.FieldAttribute;
+import io.realm.RealmMigration;
+import io.realm.RealmObjectSchema;
+import io.realm.RealmSchema;
 
 public class Migration implements RealmMigration {
   @Override

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

@@ -8,13 +8,14 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Filter;
 import android.widget.TextView;
-import io.realm.Realm;
-import io.realm.RealmObject;
-import io.realm.RealmResults;
 
 import java.util.Collections;
 import java.util.List;
 
+import io.realm.Realm;
+import io.realm.RealmObject;
+import io.realm.RealmResults;
+
 /**
  * ListAdapter for AutoCompleteTextView.
  */

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

@@ -3,18 +3,20 @@ package chat.rocket.persistence.realm;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Looper;
-import io.realm.Realm;
-import io.realm.RealmConfiguration;
-import io.realm.RealmObject;
-import io.realm.RealmQuery;
-import io.realm.RealmResults;
+
 import org.json.JSONException;
 
 import java.util.Collections;
 import java.util.List;
+
 import bolts.Task;
 import bolts.TaskCompletionSource;
 import chat.rocket.android.log.RCLog;
+import io.realm.Realm;
+import io.realm.RealmConfiguration;
+import io.realm.RealmObject;
+import io.realm.RealmQuery;
+import io.realm.RealmResults;
 
 @SuppressLint("NewApi")
 public class RealmHelper {

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

 package chat.rocket.persistence.realm;
 
+import java.util.List;
+
 import io.realm.Realm;
 import io.realm.RealmChangeListener;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
 
-import java.util.List;
-
 public class RealmListObserver<T extends RealmObject> extends AbstractRealmResultsObserver<T> {
   private final Query<T> query;
   private OnUpdateListener<T> onUpdateListener;

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

 package chat.rocket.persistence.realm;
 
-import io.realm.Realm;
-import io.realm.RealmConfiguration;
-
 import java.util.HashMap;
+
 import chat.rocket.persistence.realm.modules.RocketChatLibraryModule;
 import chat.rocket.persistence.realm.modules.RocketChatServerModule;
+import io.realm.Realm;
+import io.realm.RealmConfiguration;
 
 public class RealmStore {
   public static HashMap<String, RealmConfiguration> sStore = new HashMap<>();

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

 package chat.rocket.persistence.realm;
 
 import android.content.Context;
+
 import io.realm.Realm;
 import io.realm.RealmConfiguration;
 

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/RealmBasedServerInfo.java

@@ -2,17 +2,18 @@ package chat.rocket.persistence.realm.models;
 
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import io.realm.Realm;
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
 
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import chat.rocket.core.models.ServerInfo;
 import chat.rocket.persistence.realm.RealmHelper;
 import chat.rocket.persistence.realm.RealmStore;
+import io.realm.Realm;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * Backend implementation to store ServerInfo.
@@ -41,7 +42,7 @@ public class RealmBasedServerInfo extends RealmObject {
         .build();
   }
 
-  public static Realm getRealm() {
+  public static Realm getServerRealm() {
     return RealmStore.getRealm(DB_NAME);
   }
 

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmEmail.java

 package chat.rocket.persistence.realm.models.ddp;
 
+import chat.rocket.core.models.Email;
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
 
-import chat.rocket.core.models.Email;
-
 /**
  * Login-RealmUser's email.
  */

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmMessage.java

 package chat.rocket.persistence.realm.models.ddp;
 
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -10,6 +8,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import chat.rocket.core.JsonConstants;
 import chat.rocket.core.SyncState;
 import chat.rocket.core.models.Attachment;
@@ -21,6 +20,8 @@ import chat.rocket.core.models.WebContent;
 import chat.rocket.core.models.WebContentHeaders;
 import chat.rocket.core.models.WebContentMeta;
 import chat.rocket.core.models.WebContentParsedUrl;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * RealmMessage.

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmMeteorLoginServiceConfiguration.java

 package chat.rocket.persistence.realm.models.ddp;
 
+import chat.rocket.core.models.LoginServiceConfiguration;
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
 
-import chat.rocket.core.models.LoginServiceConfiguration;
-
 /**
  * subscription model for "meteor_accounts_loginServiceConfiguration".
  */

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmPermission.java

 package chat.rocket.persistence.realm.models.ddp;
 
-import io.realm.RealmList;
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import chat.rocket.core.models.Permission;
 import chat.rocket.core.models.Role;
+import io.realm.RealmList;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class RealmPermission extends RealmObject {
 

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmPreferences.java

 package chat.rocket.persistence.realm.models.ddp;
 
+import chat.rocket.core.models.Preferences;
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
 
-import chat.rocket.core.models.Preferences;
-
 @SuppressWarnings({"PMD.ShortVariable"})
 public class RealmPreferences extends RealmObject {
 

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmPublicSetting.java

 package chat.rocket.persistence.realm.models.ddp;
 
 import android.support.annotation.Nullable;
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import chat.rocket.core.JsonConstants;
 import chat.rocket.core.models.PublicSetting;
 import chat.rocket.persistence.realm.RealmHelper;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * public setting model.

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmRole.java

 package chat.rocket.persistence.realm.models.ddp;
 
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import chat.rocket.core.models.Role;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class RealmRole extends RealmObject {
 

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmRoom.java

 package chat.rocket.persistence.realm.models.ddp;
 
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import chat.rocket.core.JsonConstants;
 import chat.rocket.core.models.Room;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * Chat Room(Subscription).

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmRoomRole.java

 package chat.rocket.persistence.realm.models.ddp;
 
-import io.realm.RealmList;
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import chat.rocket.core.models.Role;
 import chat.rocket.core.models.RoomRole;
+import io.realm.RealmList;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class RealmRoomRole extends RealmObject {
 

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmSettings.java

 package chat.rocket.persistence.realm.models.ddp;
 
+import chat.rocket.core.models.Settings;
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
 
-import chat.rocket.core.models.Settings;
-
 @SuppressWarnings({"PMD.ShortVariable"})
 public class RealmSettings extends RealmObject {
 

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmSpotlightRoom.java

 package chat.rocket.persistence.realm.models.ddp;
 
+import chat.rocket.core.models.SpotlightRoom;
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
 
-import chat.rocket.core.models.SpotlightRoom;
-
 public class RealmSpotlightRoom extends RealmObject {
 
   public interface Columns {

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/ddp/RealmSpotlightUser.java

 package chat.rocket.persistence.realm.models.ddp;
 
+import chat.rocket.core.models.SpotlightUser;
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
 
-import chat.rocket.core.models.SpotlightUser;
-
 public class RealmSpotlightUser extends RealmObject {
 
   public interface Columns {

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/internal/GcmPushRegistration.java

 package chat.rocket.persistence.realm.models.internal;
 
-import io.realm.Realm;
-import io.realm.RealmObject;
-import io.realm.RealmQuery;
-import io.realm.annotations.PrimaryKey;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import chat.rocket.core.SyncState;
+import io.realm.Realm;
+import io.realm.RealmObject;
+import io.realm.RealmQuery;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * just stores gcm registration status.

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/internal/LoadMessageProcedure.java

 package chat.rocket.persistence.realm.models.internal;
 
+import chat.rocket.core.models.RoomHistoryState;
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
 
-import chat.rocket.core.models.RoomHistoryState;
-
 /**
  * Load messages in the room.
  */

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/internal/MethodCall.java

 package chat.rocket.persistence.realm.models.internal;
 
 import android.text.TextUtils;
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
+
 import org.json.JSONObject;
 
 import java.util.HashMap;
 import java.util.UUID;
+
 import bolts.Task;
 import bolts.TaskCompletionSource;
 import chat.rocket.android.log.RCLog;
@@ -14,6 +14,8 @@ import chat.rocket.core.SyncState;
 import chat.rocket.persistence.realm.RealmHelper;
 import chat.rocket.persistence.realm.RealmObjectObserver;
 import chat.rocket.persistence.realm.helpers.LogcatIfError;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class MethodCall extends RealmObject {
 

persistence-realm/src/main/java/chat/rocket/persistence/realm/models/internal/RealmSession.java

 package chat.rocket.persistence.realm.models.internal;
 
 import android.text.TextUtils;
-import io.realm.Realm;
-import io.realm.RealmObject;
-import io.realm.RealmQuery;
-import io.realm.annotations.PrimaryKey;
+
 import org.json.JSONObject;
 
 import chat.rocket.core.models.Session;
 import chat.rocket.persistence.realm.RealmHelper;
 import chat.rocket.persistence.realm.helpers.LogcatIfError;
 import hugo.weaving.DebugLog;
+import io.realm.Realm;
+import io.realm.RealmObject;
+import io.realm.RealmQuery;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * Login session info.

persistence-realm/src/main/java/chat/rocket/persistence/realm/modules/RocketChatServerModule.java

 package chat.rocket.persistence.realm.modules;
 
-import io.realm.annotations.RealmModule;
-
 import chat.rocket.persistence.realm.models.RealmBasedServerInfo;
+import io.realm.annotations.RealmModule;
 
 @RealmModule(library = true, classes = {RealmBasedServerInfo.class})
 public class RocketChatServerModule {

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmLoginServiceConfigurationRepository.java

@@ -2,19 +2,20 @@ package chat.rocket.persistence.realm.repositories;
 
 import android.os.Looper;
 import android.support.v4.util.Pair;
+
 import com.hadisatrio.optional.Optional;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.realm.RealmResults;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import chat.rocket.core.models.LoginServiceConfiguration;
 import chat.rocket.core.repositories.LoginServiceConfigurationRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmMeteorLoginServiceConfiguration;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.realm.RealmResults;
 
 public class RealmLoginServiceConfigurationRepository extends RealmRepository
     implements LoginServiceConfigurationRepository {
@@ -34,11 +35,10 @@ public class RealmLoginServiceConfigurationRepository extends RealmRepository
             return Flowable.empty();
           }
 
-          return RxJavaInterop.toV2Flowable(
-                  pair.first.where(RealmMeteorLoginServiceConfiguration.class)
+          return pair.first.where(RealmMeteorLoginServiceConfiguration.class)
                           .equalTo(RealmMeteorLoginServiceConfiguration.SERVICE, serviceName)
                           .findAll()
-                          .<RealmResults<RealmMeteorLoginServiceConfiguration>>asObservable());
+                          .<RealmResults<RealmMeteorLoginServiceConfiguration>>asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )
@@ -57,10 +57,9 @@ public class RealmLoginServiceConfigurationRepository extends RealmRepository
             return Flowable.empty();
           }
 
-          return RxJavaInterop
-                  .toV2Flowable(pair.first.where(RealmMeteorLoginServiceConfiguration.class)
+          return pair.first.where(RealmMeteorLoginServiceConfiguration.class)
                           .findAll()
-                          .asObservable());
+                          .asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmMessageRepository.java

@@ -5,17 +5,10 @@ import android.support.v4.util.Pair;
 
 import com.hadisatrio.optional.Optional;
 
-import chat.rocket.core.SyncState;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.realm.Realm;
-import io.realm.RealmResults;
-import io.realm.Sort;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import chat.rocket.core.SyncState;
 import chat.rocket.core.models.Message;
 import chat.rocket.core.models.Room;
 import chat.rocket.core.models.User;
@@ -23,7 +16,12 @@ import chat.rocket.core.repositories.MessageRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmMessage;
 import chat.rocket.persistence.realm.models.ddp.RealmUser;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.realm.Realm;
+import io.realm.RealmResults;
+import io.realm.Sort;
 
 public class RealmMessageRepository extends RealmRepository implements MessageRepository {
 
@@ -42,11 +40,11 @@ public class RealmMessageRepository extends RealmRepository implements MessageRe
               return Flowable.empty();
             }
 
-            return RxJavaInterop.toV2Flowable(
+            return
               pair.first.where(RealmMessage.class)
                   .equalTo(RealmMessage.ID, messageId)
                   .findAll()
-                  .<RealmResults<RealmMessage>>asObservable());
+                  .<RealmResults<RealmMessage>>asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )
@@ -93,8 +91,8 @@ public class RealmMessageRepository extends RealmRepository implements MessageRe
 
       realm.beginTransaction();
 
-      return RxJavaInterop.toV2Flowable(realm.copyToRealmOrUpdate(realmMessage)
-          .asObservable())
+      return realm.copyToRealmOrUpdate(realmMessage)
+          .asFlowable()
           .filter(it -> it.isLoaded() && it.isValid())
           .firstElement()
           .doOnSuccess(it -> realm.commitTransaction())
@@ -117,10 +115,10 @@ public class RealmMessageRepository extends RealmRepository implements MessageRe
 
       realm.beginTransaction();
 
-      return RxJavaInterop.toV2Flowable(realm.where(RealmMessage.class)
+      return realm.where(RealmMessage.class)
           .equalTo(RealmMessage.ID, message.getId())
           .findAll()
-          .<RealmResults<RealmMessage>>asObservable())
+          .<RealmResults<RealmMessage>>asFlowable()
           .filter(realmObject -> realmObject.isLoaded() && realmObject.isValid())
           .firstElement()
           .toSingle()
@@ -145,13 +143,13 @@ public class RealmMessageRepository extends RealmRepository implements MessageRe
             return Flowable.empty();
           }
 
-          return RxJavaInterop.toV2Flowable(pair.first.where(RealmMessage.class)
+          return pair.first.where(RealmMessage.class)
                   .notEqualTo(RealmMessage.SYNC_STATE, SyncState.DELETE_NOT_SYNCED)
                   .notEqualTo(RealmMessage.SYNC_STATE, SyncState.DELETING)
                   .equalTo(RealmMessage.ROOM_ID, room.getRoomId())
                   .isNotNull(RealmMessage.USER)
                   .findAllSorted(RealmMessage.TIMESTAMP, Sort.DESCENDING)
-                  .asObservable());
+                  .asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )
@@ -170,12 +168,12 @@ public class RealmMessageRepository extends RealmRepository implements MessageRe
             return Flowable.empty();
           }
 
-          return RxJavaInterop.toV2Flowable(pair.first.where(RealmMessage.class)
+          return pair.first.where(RealmMessage.class)
                   .equalTo(RealmMessage.ROOM_ID, room.getId())
                   .greaterThanOrEqualTo(RealmMessage.TIMESTAMP, room.getLastSeen())
                   .notEqualTo(RealmMessage.USER_ID, user.getId())
                   .findAll()
-                  .asObservable());
+                  .asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmPermissionRepository.java

@@ -2,17 +2,17 @@ package chat.rocket.persistence.realm.repositories;
 
 import android.os.Looper;
 import android.support.v4.util.Pair;
+
 import com.hadisatrio.optional.Optional;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.realm.RealmResults;
 
 import chat.rocket.core.models.Permission;
 import chat.rocket.core.repositories.PermissionRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmPermission;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.realm.RealmResults;
 
 public class RealmPermissionRepository extends RealmRepository implements PermissionRepository {
 
@@ -30,11 +30,10 @@ public class RealmPermissionRepository extends RealmRepository implements Permis
             if (pair.first == null) {
                 return Flowable.empty();
             }
-            return RxJavaInterop.toV2Flowable(
-                pair.first.where(RealmPermission.class)
+            return pair.first.where(RealmPermission.class)
                     .equalTo(RealmPermission.Columns.ID, id)
                     .findAll()
-                    .<RealmResults<RealmPermission>>asObservable());
+                    .<RealmResults<RealmPermission>>asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmPublicSettingRepository.java

@@ -2,17 +2,17 @@ package chat.rocket.persistence.realm.repositories;
 
 import android.os.Looper;
 import android.support.v4.util.Pair;
+
 import com.hadisatrio.optional.Optional;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.realm.RealmResults;
 
 import chat.rocket.core.models.PublicSetting;
 import chat.rocket.core.repositories.PublicSettingRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmPublicSetting;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.realm.RealmResults;
 
 public class RealmPublicSettingRepository extends RealmRepository
     implements PublicSettingRepository {
@@ -31,11 +31,10 @@ public class RealmPublicSettingRepository extends RealmRepository
             if (pair.first == null) {
               return Flowable.empty();
             }
-            return RxJavaInterop.toV2Flowable(
-              pair.first.where(RealmPublicSetting.class)
+            return pair.first.where(RealmPublicSetting.class)
                   .equalTo(RealmPublicSetting.ID, id)
                   .findAll()
-                  .<RealmResults<RealmPublicSetting>>asObservable());
+                  .<RealmResults<RealmPublicSetting>>asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmRepository.java

@@ -2,12 +2,13 @@ package chat.rocket.persistence.realm.repositories;
 
 import android.os.Handler;
 import android.os.Looper;
+
+import java.util.List;
+
 import io.realm.Realm;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
 
-import java.util.List;
-
 public class RealmRepository {
 
   protected void close(Realm realm, Looper looper) {

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmRoomRepository.java

@@ -15,7 +15,6 @@ import chat.rocket.core.repositories.RoomRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmRoom;
 import chat.rocket.persistence.realm.models.internal.LoadMessageProcedure;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
 import io.reactivex.Flowable;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -42,10 +41,9 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
                 return Flowable.empty();
             }
 
-            return RxJavaInterop.toV2Flowable(
-                    pair.first.where(RealmRoom.class)
+            return pair.first.where(RealmRoom.class)
                             .findAll()
-                            .asObservable());
+                            .asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )
@@ -72,13 +70,11 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
             return Flowable.just(Optional.<RealmRoom>absent());
           }
 
-          return RxJavaInterop.toV2Flowable(
-              realmRoom
-                  .<RealmRoom>asObservable()
+          return realmRoom.<RealmRoom>asFlowable()
                   .filter(
                       roomSubscription -> roomSubscription.isLoaded()
                           && roomSubscription.isValid())
-                  .map(Optional::of));
+                  .map(Optional::of);
         },
         pair -> close(pair.first, pair.second)
     )
@@ -109,12 +105,10 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
             return Flowable.just(Optional.<LoadMessageProcedure>absent());
           }
 
-          return RxJavaInterop.toV2Flowable(
-              messageProcedure
-                  .<LoadMessageProcedure>asObservable()
+          return messageProcedure.<LoadMessageProcedure>asFlowable()
                   .filter(loadMessageProcedure -> loadMessageProcedure.isLoaded()
                       && loadMessageProcedure.isValid())
-                  .map(Optional::of));
+                  .map(Optional::of);
         },
         pair -> close(pair.first, pair.second)
     )
@@ -177,8 +171,7 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
             if (pair.first == null) {
                 return Flowable.empty();
             }
-            return RxJavaInterop.toV2Flowable(
-                pair.first.where(RealmRoom.class)
+            return pair.first.where(RealmRoom.class)
                     .like(RealmRoom.NAME, "*" + name + "*", Case.INSENSITIVE)
                     .beginGroup()
                     .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_CHANNEL)
@@ -187,7 +180,7 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
                     .endGroup()
                     .findAllSorted(RealmRoom.NAME,
                         direction.equals(SortDirection.ASC) ? Sort.ASCENDING : Sort.DESCENDING)
-                    .asObservable());
+                    .asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )
@@ -205,15 +198,14 @@ public class RealmRoomRepository extends RealmRepository implements RoomReposito
             if (pair.first == null) {
                 return Flowable.empty();
             }
-            return RxJavaInterop.toV2Flowable(
-                pair.first.where(RealmRoom.class)
+            return pair.first.where(RealmRoom.class)
                     .beginGroup()
                     .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_CHANNEL)
                     .or()
                     .equalTo(RealmRoom.TYPE, RealmRoom.TYPE_PRIVATE)
                     .endGroup()
                     .findAllSorted(RealmRoom.LAST_SEEN, Sort.ASCENDING)
-                    .asObservable());
+                    .asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmRoomRoleRepository.java

@@ -2,11 +2,8 @@ package chat.rocket.persistence.realm.repositories;
 
 import android.os.Looper;
 import android.support.v4.util.Pair;
+
 import com.hadisatrio.optional.Optional;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.realm.RealmResults;
 
 import chat.rocket.core.models.Room;
 import chat.rocket.core.models.RoomRole;
@@ -15,7 +12,10 @@ import chat.rocket.core.repositories.RoomRoleRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmRoomRole;
 import chat.rocket.persistence.realm.models.ddp.RealmUser;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.realm.RealmResults;
 
 public class RealmRoomRoleRepository extends RealmRepository implements RoomRoleRepository {
 
@@ -33,12 +33,11 @@ public class RealmRoomRoleRepository extends RealmRepository implements RoomRole
             if (pair.first == null) {
                 return Flowable.empty();
             }
-            return RxJavaInterop.toV2Flowable(
-                pair.first.where(RealmRoomRole.class)
+            return pair.first.where(RealmRoomRole.class)
                     .equalTo(RealmRoomRole.Columns.ROOM_ID, room.getId())
                     .equalTo(RealmRoomRole.Columns.USER + "." + RealmUser.ID, user.getId())
                     .findAll()
-                    .<RealmResults<RealmRoomRole>>asObservable());
+                    .<RealmResults<RealmRoomRole>>asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmServerInfoRepository.java

@@ -2,21 +2,21 @@ package chat.rocket.persistence.realm.repositories;
 
 import android.os.Looper;
 import android.support.v4.util.Pair;
+
 import com.hadisatrio.optional.Optional;
-import io.reactivex.Flowable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 
 import chat.rocket.core.models.ServerInfo;
 import chat.rocket.core.repositories.ServerInfoRepository;
 import chat.rocket.persistence.realm.models.RealmBasedServerInfo;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.Flowable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 
 public class RealmServerInfoRepository extends RealmRepository implements ServerInfoRepository {
 
   @Override
   public Flowable<Optional<ServerInfo>> getByHostname(String hostname) {
     return Flowable.defer(() -> Flowable.using(
-        () -> new Pair<>(RealmBasedServerInfo.getRealm(), Looper.myLooper()),
+        () -> new Pair<>(RealmBasedServerInfo.getServerRealm(), Looper.myLooper()),
         pair -> {
           RealmBasedServerInfo info = pair.first.where(RealmBasedServerInfo.class)
               .equalTo(RealmBasedServerInfo.ColumnName.HOSTNAME, hostname)
@@ -26,10 +26,9 @@ public class RealmServerInfoRepository extends RealmRepository implements Server
             return Flowable.just(Optional.<RealmBasedServerInfo>absent());
           }
 
-          return RxJavaInterop.toV2Flowable(info
-              .<RealmBasedServerInfo>asObservable()
+          return info.<RealmBasedServerInfo>asFlowable()
               .filter(it -> it.isLoaded() && it.isValid())
-              .map(Optional::of));
+              .map(Optional::of);
         },
         pair -> close(pair.first, pair.second)
     )

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmSessionRepository.java

@@ -2,17 +2,17 @@ package chat.rocket.persistence.realm.repositories;
 
 import android.os.Looper;
 import android.support.v4.util.Pair;
+
 import com.hadisatrio.optional.Optional;
-import io.reactivex.Flowable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.realm.Realm;
 
 import chat.rocket.core.models.Session;
 import chat.rocket.core.repositories.SessionRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.internal.RealmSession;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.realm.Realm;
 
 public class RealmSessionRepository extends RealmRepository implements SessionRepository {
 
@@ -31,11 +31,10 @@ public class RealmSessionRepository extends RealmRepository implements SessionRe
             return Flowable.empty();
           }
 
-          return RxJavaInterop.toV2Flowable(
-                  pair.first.where(RealmSession.class)
+          return pair.first.where(RealmSession.class)
                           .equalTo(RealmSession.ID, id)
                           .findAll()
-                          .<RealmSession>asObservable());
+                          .<RealmSession>asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )
@@ -76,8 +75,8 @@ public class RealmSessionRepository extends RealmRepository implements SessionRe
 
       realm.beginTransaction();
 
-      return RxJavaInterop.toV2Flowable(realm.copyToRealmOrUpdate(realmSession)
-          .asObservable())
+      return realm.copyToRealmOrUpdate(realmSession)
+          .asFlowable()
           .filter(it -> it != null && it.isLoaded() && it.isValid())
           .firstElement()
           .doOnSuccess(it -> realm.commitTransaction())

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmSpotlightRepository.kt

@@ -6,13 +6,12 @@ import chat.rocket.core.repositories.SpotlightRepository
 import chat.rocket.persistence.realm.RealmStore
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlight
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlight.Columns
-import hu.akarnokd.rxjava.interop.RxJavaInterop
 import io.reactivex.Flowable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.realm.Realm
 import io.realm.RealmResults
 import io.realm.Sort
-import java.util.ArrayList
+import java.util.*
 
 class RealmSpotlightRepository(private val hostname: String) : RealmRepository(), SpotlightRepository {
 
@@ -24,9 +23,9 @@ class RealmSpotlightRepository(private val hostname: String) : RealmRepository()
                 return@using Flowable.empty()
             }
 
-            return@using RxJavaInterop.toV2Flowable<RealmResults<RealmSpotlight>>(pair.first.where(RealmSpotlight::class.java)
+            return@using pair.first.where(RealmSpotlight::class.java)
                 .findAllSorted(Columns.TYPE, Sort.DESCENDING)
-                .asObservable())
+                .asFlowable()
         }) { pair -> close(pair.first, pair.second) }
                 .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()!!))
                 .filter { realmSpotlightResults -> realmSpotlightResults.isLoaded && realmSpotlightResults.isValid }

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmSpotlightRoomRepository.java

@@ -2,20 +2,20 @@ package chat.rocket.persistence.realm.repositories;
 
 import android.os.Looper;
 import android.support.v4.util.Pair;
-import io.reactivex.Flowable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.realm.Case;
-import io.realm.Sort;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import chat.rocket.core.SortDirection;
 import chat.rocket.core.models.SpotlightRoom;
 import chat.rocket.core.repositories.SpotlightRoomRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmRoom;
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlightRoom;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.Flowable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.realm.Case;
+import io.realm.Sort;
 
 public class RealmSpotlightRoomRepository extends RealmRepository implements SpotlightRoomRepository {
 
@@ -34,8 +34,7 @@ public class RealmSpotlightRoomRepository extends RealmRepository implements Spo
             return Flowable.empty();
           }
 
-          return RxJavaInterop.toV2Flowable(
-                  pair.first.where(RealmSpotlightRoom.class)
+          return pair.first.where(RealmSpotlightRoom.class)
                           .like(RealmSpotlightRoom.Columns.NAME, "*" + name + "*", Case.INSENSITIVE)
                           .beginGroup()
                           .equalTo(RealmSpotlightRoom.Columns.TYPE, RealmRoom.TYPE_CHANNEL)
@@ -43,7 +42,7 @@ public class RealmSpotlightRoomRepository extends RealmRepository implements Spo
                           .equalTo(RealmSpotlightRoom.Columns.TYPE, RealmRoom.TYPE_PRIVATE)
                           .endGroup()
                           .findAllSorted(RealmSpotlightRoom.Columns.NAME, direction.equals(SortDirection.ASC) ? Sort.ASCENDING : Sort.DESCENDING)
-                          .asObservable());
+                          .asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmSpotlightUserRepository.java

@@ -2,19 +2,19 @@ package chat.rocket.persistence.realm.repositories;
 
 import android.os.Looper;
 import android.support.v4.util.Pair;
-import io.reactivex.Flowable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.realm.Case;
-import io.realm.Sort;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import chat.rocket.core.SortDirection;
 import chat.rocket.core.models.SpotlightUser;
 import chat.rocket.core.repositories.SpotlightUserRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmSpotlightUser;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.Flowable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.realm.Case;
+import io.realm.Sort;
 
 public class RealmSpotlightUserRepository extends RealmRepository implements SpotlightUserRepository {
 
@@ -33,8 +33,7 @@ public class RealmSpotlightUserRepository extends RealmRepository implements Spo
             return Flowable.empty();
           }
 
-          return RxJavaInterop.toV2Flowable(
-                  pair.first.where(RealmSpotlightUser.class)
+          return pair.first.where(RealmSpotlightUser.class)
                           .beginGroup()
                           .like(RealmSpotlightUser.Columns.USERNAME, "*" + name + "*", Case.INSENSITIVE)
                           .isNull(RealmSpotlightUser.Columns.NAME)
@@ -46,7 +45,7 @@ public class RealmSpotlightUserRepository extends RealmRepository implements Spo
                           .endGroup()
                           .findAllSorted(RealmSpotlightUser.Columns.USERNAME,
                                   direction.equals(SortDirection.ASC) ? Sort.ASCENDING : Sort.DESCENDING)
-                          .asObservable());
+                          .asFlowable();
         },
         pair -> close(pair.first, pair.second)
     )

persistence-realm/src/main/java/chat/rocket/persistence/realm/repositories/RealmUserRepository.java

@@ -12,7 +12,6 @@ import chat.rocket.core.models.User;
 import chat.rocket.core.repositories.UserRepository;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmUser;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
 import io.reactivex.Flowable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.realm.Case;
@@ -36,10 +35,9 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
                         return Flowable.empty();
                     }
 
-                    return RxJavaInterop.toV2Flowable(
-                            pair.first.where(RealmUser.class)
+                    return pair.first.where(RealmUser.class)
                                     .findAll()
-                                    .asObservable());
+                                    .asFlowable();
                 },
                 pair -> close(pair.first, pair.second))
                 .unsubscribeOn(AndroidSchedulers.from(Looper.myLooper()))
@@ -71,11 +69,10 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
                         return Flowable.empty();
                     }
 
-                    return RxJavaInterop.toV2Flowable(
-                        pair.first.where(RealmUser.class)
+                    return pair.first.where(RealmUser.class)
                                 .isNotEmpty(RealmUser.EMAILS)
                                 .findAll()
-                                .<RealmResults<RealmUser>>asObservable());
+                                .<RealmResults<RealmUser>>asFlowable();
                 },
                 pair -> close(pair.first, pair.second));
     }
@@ -114,11 +111,9 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
             return Flowable.just(Optional.absent());
         }
 
-        return RxJavaInterop.toV2Flowable(
-                realmUser
-                        .<RealmUser>asObservable()
+        return realmUser.<RealmUser>asFlowable()
                         .filter(user -> user.isLoaded() && user.isValid())
-                        .map(Optional::of));
+                        .map(Optional::of);
     }
 
     @Override
@@ -139,11 +134,10 @@ public class RealmUserRepository extends RealmRepository implements UserReposito
                         return Flowable.empty();
                     }
 
-                    return RxJavaInterop.toV2Flowable(
-                            pair.first.where(RealmUser.class)
+                    return pair.first.where(RealmUser.class)
                                     .like(RealmUser.USERNAME, "*" + name + "*", Case.INSENSITIVE)
                                     .findAllSorted(RealmUser.USERNAME, Sort.DESCENDING)
-                                    .asObservable());
+                                    .asFlowable();
                 },
                 pair -> close(pair.first, pair.second));
     }

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/RocketChatAvatar.java

@@ -7,9 +7,11 @@ import android.os.Build;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;
-import chat.rocket.android.widget.helper.FrescoHelper;
+
 import com.facebook.drawee.view.SimpleDraweeView;
 
+import chat.rocket.android.widget.helper.FrescoHelper;
+
 public class RocketChatAvatar extends FrameLayout {
 
   private SimpleDraweeView simpleDraweeViewAvatar;

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/helper/IconProvider.java

@@ -3,6 +3,7 @@ package chat.rocket.android.widget.helper;
 import android.support.annotation.StringRes;
 
 import java.util.HashMap;
+
 import chat.rocket.android.widget.R;
 
 public class IconProvider {

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/helper/InlineHightlighter.java

@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import chat.rocket.android.widget.R;
 
 public class InlineHightlighter {

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/helper/LinkMovementMethodCompat.java

@@ -5,7 +5,6 @@ import android.text.Selection;
 import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
 import android.text.method.MovementMethod;
-import android.text.method.Touch;
 import android.text.style.ClickableSpan;
 import android.view.MotionEvent;
 import android.widget.TextView;

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/helper/Linkify.java

@@ -3,6 +3,7 @@ package chat.rocket.android.widget.helper;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.widget.TextView;
+
 import org.nibor.autolink.LinkExtractor;
 import org.nibor.autolink.LinkSpan;
 import org.nibor.autolink.LinkType;

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/internal/ExtraActionPickerDialogFragment.java

@@ -6,6 +6,7 @@ import android.support.v4.app.Fragment;
 import android.support.v7.widget.RecyclerView;
 
 import java.util.List;
+
 import chat.rocket.android.widget.R;
 import chat.rocket.android.widget.layouthelper.MessageExtraActionListAdapter;
 import chat.rocket.android.widget.message.MessageExtraActionItemPresenter;

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/layouthelper/MessageExtraActionListAdapter.java

@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import java.util.List;
+
 import chat.rocket.android.widget.R;
 import chat.rocket.android.widget.message.MessageExtraActionItemPresenter;
 

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/RocketChatMessageAttachmentsLayout.java

@@ -16,6 +16,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
+import com.facebook.drawee.view.SimpleDraweeView;
+
+import java.util.List;
+
 import chat.rocket.android.widget.AbsoluteUrl;
 import chat.rocket.android.widget.R;
 import chat.rocket.android.widget.helper.FrescoHelper;
@@ -24,10 +30,6 @@ import chat.rocket.core.models.AttachmentAuthor;
 import chat.rocket.core.models.AttachmentField;
 import chat.rocket.core.models.AttachmentTitle;
 
-import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
-import com.facebook.drawee.view.SimpleDraweeView;
-import java.util.List;
-
 /**
  */
 public class RocketChatMessageAttachmentsLayout extends LinearLayout {

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/RocketChatMessageLayout.java

@@ -8,6 +8,7 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
 import com.emojione.Emojione;
 
 import chat.rocket.android.widget.R;

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/RocketChatMessageUrlsLayout.java

@@ -11,12 +11,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import chat.rocket.android.widget.helper.FrescoHelper;
+
 import com.facebook.drawee.view.SimpleDraweeView;
 
 import java.util.List;
 import java.util.Map;
+
 import chat.rocket.android.widget.R;
+import chat.rocket.android.widget.helper.FrescoHelper;
 import chat.rocket.android.widget.helper.ImageFormat;
 import chat.rocket.core.models.WebContent;
 import chat.rocket.core.models.WebContentHeaders;