Merge pull request #635 from RocketChat/pack-of-fixes

[FIX] Pack of fixes

android-ddp/build.gradle

@@ -21,9 +21,10 @@ android {
     }
 }
 dependencies {
-    compile project(':log-wrapper')
-    compile extraDependencies.okHTTP
-    compile extraDependencies.rxJava
-    compile extraDependencies.boltTask
-    compile supportDependencies.annotation
+    api project(':log-wrapper')
+    implementation extraDependencies.okHTTP
+    implementation extraDependencies.rxJava
+    implementation extraDependencies.rxKotlin
+    implementation extraDependencies.boltTask
+    implementation supportDependencies.annotation
 }
\ No newline at end of file

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

@@ -84,7 +84,11 @@ public class DDPClient {
     }
 
     public void close() {
-        impl.close(REASON_CLOSED_BY_USER, "closed by DDPClient#close()");
+        close(REASON_CLOSED_BY_USER);
+    }
+
+    public void close(int reason) {
+        impl.close(reason, "closed by DDPClient#close()");
     }
 
     /**

app/build.gradle

@@ -98,7 +98,6 @@ play {
     track = "${track}"
 }
 ext {
-    playLibVersion = '11.6.0'
     stethoVersion = '1.5.0'
     stethoOkhttp3Version = '1.5.0'
     stethoRealmVersion = '2.2.2'
@@ -109,43 +108,49 @@ ext {
 }
 
 dependencies {
-    compile project(':android-ddp')
-    compile project(':rocket-chat-android-widgets')
-    compile project(':persistence-realm')
-    compile extraDependencies.okHTTP
-    compile extraDependencies.rxJava
-    compile extraDependencies.boltTask
-    compile supportDependencies.multidex
-    compile supportDependencies.designSupportLibrary
-    compile supportDependencies.annotation
-    compile rxbindingDependencies.rxBinding
-    compile rxbindingDependencies.rxBindingSupport
-    compile rxbindingDependencies.rxBindingAppcompact
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
-    compile "com.google.firebase:firebase-core:$playLibVersion"
-    compile "com.google.firebase:firebase-crash:$playLibVersion"
-    compile "com.google.android.gms:play-services-gcm:$playLibVersion"
-    compile "com.trello.rxlifecycle2:rxlifecycle:$rxlifecycleVersion"
-    compile "com.trello.rxlifecycle2:rxlifecycle-android:$rxlifecycleVersion"
-    compile "com.trello.rxlifecycle2:rxlifecycle-components:$rxlifecycleVersion"
-    compile 'nl.littlerobots.rxlint:rxlint:1.2'
-    compile "frankiesardo:icepick:$icepickVersion"
+    api project(':android-ddp')
+    api project(':rocket-chat-android-widgets')
+    api project(':persistence-realm')
+    implementation extraDependencies.okHTTP
+    implementation extraDependencies.rxJava
+    implementation extraDependencies.rxKotlin
+    implementation extraDependencies.boltTask
+    implementation supportDependencies.multidex
+    implementation supportDependencies.designSupportLibrary
+    implementation supportDependencies.annotation
+    implementation rxbindingDependencies.rxBinding
+    implementation rxbindingDependencies.rxBindingSupport
+    implementation rxbindingDependencies.rxBindingAppcompact
+    api "org.jetbrains.kotlin:kotlin-stdlib-jre8:$rootProject.ext.kotlinVersion"
+    implementation "com.google.firebase:firebase-core:$rootProject.ext.playLibVersion"
+    implementation "com.google.firebase:firebase-crash:$rootProject.ext.playLibVersion"
+    implementation "com.google.android.gms:play-services-gcm:$rootProject.ext.playLibVersion"
+    implementation "com.trello.rxlifecycle2:rxlifecycle:$rxlifecycleVersion"
+    implementation "com.trello.rxlifecycle2:rxlifecycle-android:$rxlifecycleVersion"
+    implementation "com.trello.rxlifecycle2:rxlifecycle-components:$rxlifecycleVersion"
+    implementation 'nl.littlerobots.rxlint:rxlint:1.2'
+    implementation "frankiesardo:icepick:$icepickVersion"
     annotationProcessor "frankiesardo:icepick-processor:$icepickVersion"
-    compile "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
+    implementation "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
     annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
         transitive = true;
     }
-    debugCompile "com.facebook.stetho:stetho:$stethoVersion"
+    implementation(extraDependencies.crouton) {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
+    implementation extraDependencies.androidJob
+    implementation extraDependencies.jstate
+    debugImplementation "com.facebook.stetho:stetho:$stethoVersion"
     debugCompile "com.facebook.stetho:stetho-okhttp3:$stethoOkhttp3Version"
     debugCompile "com.uphyca:stetho_realm:$stethoRealmVersion"
     debugCompile "com.tspoon.traceur:traceur:1.0.1"
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.3'
-    testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-reflect:$rootProject.ext.kotlinVersion"
-    testCompile "com.nhaarman:mockito-kotlin:1.5.0"
-    testCompile 'org.amshove.kluent:kluent:1.14'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:3.3'
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
+    testImplementation "org.jetbrains.kotlin:kotlin-reflect:$rootProject.ext.kotlinVersion"
+    testImplementation "com.nhaarman:mockito-kotlin:1.5.0"
+    testImplementation 'org.amshove.kluent:kluent:1.14'
 }
 apply plugin: 'com.google.gms.google-services'

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

 package chat.rocket.android.helper
 
-import android.content.Context
-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
@@ -24,17 +22,18 @@ object OkHttpHelper {
         return httpClientForUploadFile ?: throw AssertionError("httpClientForUploadFile set to null by another thread")
     }
 
-    fun getClientForDownloadFile(context: Context): OkHttpClient {
-        if(httpClientForDownloadFile == null) {
+    fun getClientForDownloadFile(): OkHttpClient {
+        if (httpClientForDownloadFile == null) {
             httpClientForDownloadFile = OkHttpClient.Builder()
                     .addNetworkInterceptor(StethoInterceptor())
                     .followRedirects(true)
                     .followSslRedirects(true)
-                    .addInterceptor(CookieInterceptor(DefaultCookieProvider(RocketChatCache(context))))
+                    .addInterceptor(CookieInterceptor(DefaultCookieProvider()))
                     .build()
         }
         return httpClientForDownloadFile ?: throw  AssertionError("httpClientForDownloadFile set to null by another thread")
     }
+
     /**
      * Returns the OkHttpClient instance for WebSocket connection.
      * @return The OkHttpClient WebSocket connection instance.

app/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="chat.rocket.android">
+    package="chat.rocket.android">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <permission
         android:name="chat.rocket.android.permission.C2D_MESSAGE"
-        android:protectionLevel="signature"/>
+        android:protectionLevel="signature" />
 
-    <uses-permission android:name="chat.rocket.android.permission.C2D_MESSAGE"/>
+    <uses-permission android:name="chat.rocket.android.permission.C2D_MESSAGE" />
 
     <application
         android:name=".RocketChatApplication"
@@ -26,39 +27,40 @@
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
         <activity
             android:name=".activity.room.RoomActivity"
             android:configChanges="orientation|screenSize"
-            android:windowSoftInputMode="adjustResize"/>
+            android:windowSoftInputMode="adjustResize" />
 
         <activity
             android:name=".activity.AddServerActivity"
             android:configChanges="orientation|screenSize"
-            android:windowSoftInputMode="adjustResize"
-            android:launchMode="singleTop"/>
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize" />
 
         <activity
             android:name=".activity.LoginActivity"
             android:configChanges="orientation|screenSize"
-            android:windowSoftInputMode="adjustResize"/>
+            android:windowSoftInputMode="adjustResize" />
 
-        <service android:name=".service.RocketChatService"/>
+        <service android:name=".service.RocketChatService" />
 
         <receiver
             android:name="com.google.android.gms.gcm.GcmReceiver"
             android:exported="true"
             android:permission="com.google.android.c2dm.permission.SEND">
             <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
-                <action android:name="com.google.android.c2dm.intent.REGISTRATION"/>
-                <category android:name="chat.rocket.android"/>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+
+                <category android:name="chat.rocket.android" />
             </intent-filter>
         </receiver>
 
@@ -67,8 +69,8 @@
             android:exported="true"
             android:permission="com.google.android.c2dm.permission.SEND">
             <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
-                <category android:name="chat.rocket.android"/>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+                <category android:name="chat.rocket.android" />
             </intent-filter>
         </receiver>
 
@@ -76,7 +78,8 @@
             android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver"
             android:exported="false" />
 
-        <service android:name="com.google.firebase.iid.FirebaseInstanceIdService"
+        <service
+            android:name="com.google.firebase.iid.FirebaseInstanceIdService"
             android:exported="true">
             <intent-filter android:priority="-500">
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
@@ -87,7 +90,7 @@
             android:name=".push.gcm.GCMIntentService"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
             </intent-filter>
         </service>
 
@@ -95,14 +98,16 @@
             android:name=".push.gcm.GcmInstanceIDListenerService"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.google.android.gms.iid.InstanceID"/>
+                <action android:name="com.google.android.gms.iid.InstanceID" />
             </intent-filter>
         </service>
 
-        <receiver android:name=".push.PushManager$DeleteReceiver"
+        <receiver
+            android:name=".push.PushManager$DeleteReceiver"
             android:exported="false" />
 
-        <receiver android:name=".push.PushManager$ReplyReceiver"
+        <receiver
+            android:name=".push.PushManager$ReplyReceiver"
             android:exported="false" />
 
         <meta-data

app/src/main/java/chat/rocket/android/ConnectionStatusManager.kt

+package chat.rocket.android
+
+import chat.rocket.android.extensions.printStackTraceOnDebug
+import chat.rocket.android.service.KeepAliveJob
+import unquietcode.tools.esm.EnumStateMachine
+import unquietcode.tools.esm.TransitionException
+
+object ConnectionStatusManager {
+    enum class State {
+        OFFLINE, CONNECTING, ONLINE
+    }
+
+    private const val DEBUG = false
+    private val DEFAULT_CALLBACK = object : TransitionCallback {
+        override fun onTransitioned(success: Boolean) {
+        }
+    }
+    private val stateMachine: EnumStateMachine<State>
+
+    init {
+        stateMachine = EnumStateMachine(State.OFFLINE)
+
+        stateMachine.addTransitions(State.OFFLINE, State.CONNECTING)
+        stateMachine.addTransitions(State.CONNECTING, State.ONLINE, State.OFFLINE)
+        stateMachine.addTransitions(State.ONLINE, State.OFFLINE)
+    }
+
+    @Synchronized
+    fun transitionCount() = stateMachine.transitionCount()
+
+    @Synchronized
+    fun currentState() = stateMachine.currentState()
+
+    @Synchronized
+    fun setOnline(callback: TransitionCallback = DEFAULT_CALLBACK) {
+        KeepAliveJob.cancelPendingJobRequests()
+        tryTransitionTo(State.ONLINE, callback)
+    }
+
+    @Synchronized
+    fun setOnline() {
+        KeepAliveJob.cancelPendingJobRequests()
+        tryTransitionTo(State.ONLINE, DEFAULT_CALLBACK)
+    }
+
+    @Synchronized
+    fun setConnecting(callback: TransitionCallback = DEFAULT_CALLBACK) {
+        KeepAliveJob.cancelPendingJobRequests()
+        tryTransitionTo(State.CONNECTING, callback)
+    }
+
+    @Synchronized
+    fun setConnecting() {
+        KeepAliveJob.cancelPendingJobRequests()
+        tryTransitionTo(State.CONNECTING, DEFAULT_CALLBACK)
+    }
+
+    @Synchronized
+    fun setConnectionError(callback: TransitionCallback = DEFAULT_CALLBACK) {
+        KeepAliveJob.schedule()
+        tryTransitionTo(State.OFFLINE, callback)
+    }
+
+    @Synchronized
+    fun setConnectionError() {
+        KeepAliveJob.schedule()
+        tryTransitionTo(State.OFFLINE, DEFAULT_CALLBACK)
+    }
+
+    @Synchronized
+    fun setOffline() {
+        stateMachine.reset()
+    }
+
+    private fun tryTransitionTo(newState: State, callback: TransitionCallback) {
+        try {
+            stateMachine.transition(newState)
+            callback.onTransitioned(true)
+        } catch (e: TransitionException) {
+            if (DEBUG) {
+                e.printStackTraceOnDebug()
+            }
+            callback.onTransitioned(false)
+        }
+    }
+
+    interface TransitionCallback {
+        fun onTransitioned(success: Boolean)
+    }
+}
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import android.support.multidex.MultiDexApplication;
 import android.support.v7.app.AppCompatDelegate;
 
 import com.crashlytics.android.Crashlytics;
+import com.evernote.android.job.JobManager;
 
 import java.util.List;
 
@@ -34,6 +35,8 @@ public class RocketChatApplication extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+        RocketChatCache.INSTANCE.initialize(this);
+        JobManager.create(this).addJobCreator(new RocketChatJobCreator());
         DDPClient.initialize(OkHttpHelper.INSTANCE.getClientForWebSocket());
         Fabric.with(this, new Crashlytics());
 
@@ -44,7 +47,7 @@ public class RocketChatApplication extends MultiDexApplication {
             RealmStore.put(serverInfo.getHostname());
         }
 
-        RocketChatWidgets.initialize(this, OkHttpHelper.INSTANCE.getClientForDownloadFile(this));
+        RocketChatWidgets.initialize(this, OkHttpHelper.INSTANCE.getClientForDownloadFile());
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
@@ -57,7 +60,7 @@ public class RocketChatApplication extends MultiDexApplication {
             if (BuildConfig.DEBUG) {
                 e.printStackTrace();
             }
-            Logger.report(e);
+            Logger.INSTANCE.report(e);
         });
 
         instance = this;

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

-package chat.rocket.android;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.hadisatrio.optional.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-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.core.utils.Pair;
-import io.reactivex.BackpressureStrategy;
-import io.reactivex.Flowable;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.annotations.Nullable;
-import okhttp3.HttpUrl;
-
-/**
- * sharedpreference-based cache.
- */
-public class RocketChatCache {
-  private static final String KEY_SELECTED_SERVER_HOSTNAME = "KEY_SELECTED_SERVER_HOSTNAME";
-  private static final String KEY_SELECTED_SITE_URL = "KEY_SELECTED_SITE_URL";
-  private static final String KEY_SELECTED_SITE_NAME = "KEY_SELECTED_SITE_NAME";
-  private static final String KEY_SELECTED_ROOM_ID = "KEY_SELECTED_ROOM_ID";
-  private static final String KEY_PUSH_ID = "KEY_PUSH_ID";
-  private static final String KEY_HOSTNAME_LIST = "KEY_HOSTNAME_LIST";
-
-  private Context context;
-
-  public RocketChatCache(Context context) {
-    this.context = context.getApplicationContext();
-  }
-
-  public String getSelectedServerHostname() {
-    return getString(KEY_SELECTED_SERVER_HOSTNAME, null);
-  }
-
-  public void setSelectedServerHostname(String hostname) {
-    String newHostname = null;
-    if (hostname != null) {
-      newHostname = hostname.toLowerCase();
-    }
-    setString(KEY_SELECTED_SERVER_HOSTNAME, newHostname);
-  }
-
-  public void addHostSiteName(@NonNull String currentHostname, @NonNull String siteName) {
-    try {
-      String hostSiteNamesJson = getHostSiteNamesJson();
-      JSONObject jsonObject = (hostSiteNamesJson == null) ?
-              new JSONObject() : new JSONObject(hostSiteNamesJson);
-      jsonObject.put(currentHostname, siteName);
-      setString(KEY_SELECTED_SITE_NAME, jsonObject.toString());
-    } catch (JSONException e) {
-      RCLog.e(e);
-    }
-  }
-
-  public @NonNull String getHostSiteName(@NonNull String host) {
-    if (host.startsWith("http")) {
-      HttpUrl url = HttpUrl.parse(host);
-      if (url != null) {
-        host = url.host();
-      }
-    }
-    try {
-      String hostSiteNamesJson = getHostSiteNamesJson();
-      JSONObject jsonObject = (hostSiteNamesJson == null) ?
-              new JSONObject() : new JSONObject(hostSiteNamesJson);
-      host = getSiteUrlFor(host);
-      return jsonObject.optString(host);
-    } catch (JSONException e) {
-      RCLog.e(e);
-    }
-    return "";
-  }
-
-  private @Nullable String getHostSiteNamesJson() {
-    return getString(KEY_SELECTED_SITE_NAME, null);
-  }
-
-  public void addHostnameSiteUrl(@Nullable String hostnameAlias, @NonNull String currentHostname) {
-    String alias = null;
-    if (hostnameAlias != null) {
-      alias = hostnameAlias.toLowerCase();
-    }
-    try {
-      String selectedHostnameAliasJson = getLoginHostnamesJson();
-      JSONObject jsonObject = selectedHostnameAliasJson == null ?
-              new JSONObject() : new JSONObject(selectedHostnameAliasJson);
-      jsonObject.put(alias, currentHostname);
-      setString(KEY_SELECTED_SITE_URL, jsonObject.toString());
-    } catch (JSONException e) {
-      RCLog.e(e);
-    }
-  }
-
-  public @Nullable String getSiteUrlFor(String hostname) {
-    try {
-      String selectedServerHostname = getSelectedServerHostname();
-      if (getLoginHostnamesJson() == null || getLoginHostnamesJson().isEmpty()) {
-        return null;
-      }
-      return new JSONObject(getLoginHostnamesJson())
-              .optString(hostname, selectedServerHostname);
-    } catch (JSONException e) {
-      RCLog.e(e);
-    }
-    return null;
-  }
-
-  private @Nullable String getLoginHostnamesJson() {
-    return getString(KEY_SELECTED_SITE_URL, null);
-  }
-
-  public void addHostname(@NonNull String hostname, @Nullable String hostnameAvatarUri, String siteName) {
-    String hostnameList = getString(KEY_HOSTNAME_LIST, null);
-    try {
-      JSONObject json;
-      if (hostnameList == null) {
-        json = new JSONObject();
-      } else {
-        json = new JSONObject(hostnameList);
-      }
-      JSONObject serverInfoJson = new JSONObject();
-      serverInfoJson.put("avatar", hostnameAvatarUri);
-      serverInfoJson.put("sitename", siteName);
-      // Replace server avatar uri if exists.
-      json.put(hostname, hostnameAvatarUri == null ? JSONObject.NULL : serverInfoJson);
-      setString(KEY_HOSTNAME_LIST, json.toString());
-    } catch (JSONException e) {
-      RCLog.e(e);
-    }
-  }
-
-  public List<Pair<String, Pair<String, String>>> getServerList() {
-    String json = getString(KEY_HOSTNAME_LIST, null);
-    if (json == null) {
-      return Collections.emptyList();
-    }
-    try {
-      JSONObject jsonObj = new JSONObject(json);
-      List<Pair<String, Pair<String, String>>> serverList = new ArrayList<>();
-      for (Iterator<String> iter = jsonObj.keys(); iter.hasNext();) {
-        String hostname = iter.next();
-        JSONObject serverInfoJson = jsonObj.getJSONObject(hostname);
-        serverList.add(new Pair<>(hostname, new Pair<>(
-                "http://" + hostname + "/" + serverInfoJson.getString("avatar"),
-                serverInfoJson.getString("sitename"))));
-      }
-      return serverList;
-    } catch (JSONException e) {
-      RCLog.e(e);
-    }
-    return Collections.emptyList();
-  }
-
-  public void removeHostname(String hostname) {
-    String json = getString(KEY_HOSTNAME_LIST, null);
-    if (TextUtils.isEmpty(json)) {
-      return;
-    }
-    try {
-      JSONObject jsonObj = new JSONObject(json);
-      jsonObj.remove(hostname);
-      String result = jsonObj.length() == 0 ? null : jsonObj.toString();
-      setString(KEY_HOSTNAME_LIST, result);
-    } catch (JSONException e) {
-      RCLog.e(e);
-    }
-  }
-
-  @Nullable
-  public String getFirstLoggedHostnameIfAny() {
-    String json = getString(KEY_HOSTNAME_LIST, null);
-    if (json != null) {
-      try {
-        JSONObject jsonObj = new JSONObject(json);
-        if (jsonObj.length() > 0 && jsonObj.keys().hasNext()) {
-          // Returns the first hostname on the list.
-          return jsonObj.keys().next();
-        }
-      } catch (JSONException e) {
-        RCLog.e(e);
-      }
-    }
-    return null;
-  }
-
-  public String getSelectedRoomId() {
-    try {
-      JSONObject jsonObject = getSelectedRoomIdJsonObject();
-      return jsonObject.optString(getSelectedServerHostname(), null);
-    } catch (JSONException e) {
-      RCLog.e(e);
-      Logger.report(e);
-    }
-    return null;
-  }
-
-  public void setSelectedRoomId(String roomId) {
-    try {
-      JSONObject jsonObject = getSelectedRoomIdJsonObject();
-      jsonObject.put(getSelectedServerHostname(), roomId);
-      setString(KEY_SELECTED_ROOM_ID, jsonObject.toString());
-    } catch (JSONException e) {
-      RCLog.e(e);
-      Logger.report(e);
-    }
-  }
-
-  private JSONObject getSelectedRoomIdJsonObject() throws JSONException {
-    String json = getString(KEY_SELECTED_ROOM_ID, null);
-    if (json == null) {
-      return new JSONObject();
-    }
-    return new JSONObject(json);
-  }
-
-  public String getOrCreatePushId() {
-    SharedPreferences preferences = getSharedPreferences();
-    if (!preferences.contains(KEY_PUSH_ID)) {
-      // generates one and save
-      String newId = UUID.randomUUID().toString().replace("-", "");
-      preferences.edit()
-          .putString(KEY_PUSH_ID, newId)
-          .apply();
-      return newId;
-    }
-    return preferences.getString(KEY_PUSH_ID, null);
-  }
-
-  public Flowable<Optional<String>> getSelectedServerHostnamePublisher() {
-    return getValuePublisher(KEY_SELECTED_SERVER_HOSTNAME);
-  }
-
-  public Flowable<Optional<String>> getSelectedRoomIdPublisher() {
-    return getValuePublisher(KEY_SELECTED_ROOM_ID)
-            .filter(Optional::isPresent)
-            .map(Optional::get)
-            .map(roomValue -> Optional.ofNullable(new JSONObject(roomValue).optString(getSelectedServerHostname(), null)));
-  }
-
-  private SharedPreferences getSharedPreferences() {
-    return context.getSharedPreferences("cache", Context.MODE_PRIVATE);
-  }
-
-  private SharedPreferences.Editor getEditor() {
-    return getSharedPreferences().edit();
-  }
-
-  public String getString(String key, String defaultValue) {
-    return getSharedPreferences().getString(key, defaultValue);
-  }
-
-  private void setString(String key, String value) {
-    getEditor().putString(key, value).apply();
-  }
-
-  private Flowable<Optional<String>> getValuePublisher(final String key) {
-    return Flowable.create(emitter -> {
-      SharedPreferences.OnSharedPreferenceChangeListener
-          listener = (sharedPreferences, changedKey) -> {
-        if (key.equals(changedKey) && !emitter.isCancelled()) {
-          String value = getString(key, null);
-          emitter.onNext(Optional.ofNullable(value));
-        }
-      };
-
-      emitter.setCancellable(() -> getSharedPreferences()
-          .unregisterOnSharedPreferenceChangeListener(listener));
-
-      getSharedPreferences().registerOnSharedPreferenceChangeListener(listener);
-    }, BackpressureStrategy.LATEST);
-  }
-
-  public void removeSelectedRoomId(String currentHostname) {
-    try {
-      JSONObject selectedRoomIdJsonObject = getSelectedRoomIdJsonObject();
-      selectedRoomIdJsonObject.remove(currentHostname);
-      String result = selectedRoomIdJsonObject.length() == 0 ?
-              null : selectedRoomIdJsonObject.toString();
-      setString(KEY_SELECTED_ROOM_ID, result);
-    } catch (JSONException e) {
-      Logger.report(e);
-      RCLog.e(e);
-    }
-  }
-}

app/src/main/java/chat/rocket/android/RocketChatJobCreator.kt

+package chat.rocket.android
+
+import chat.rocket.android.service.KeepAliveJob
+import com.evernote.android.job.Job
+import com.evernote.android.job.JobCreator
+
+class RocketChatJobCreator : JobCreator {
+    override fun create(tag: String): Job? {
+        when (tag) {
+            KeepAliveJob.TAG -> return KeepAliveJob()
+            else -> return null
+        }
+    }
+}
\ No newline at end of file

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

@@ -16,77 +16,85 @@ import chat.rocket.persistence.realm.repositories.RealmSessionRepository;
  * Activity for Login, Sign-up, and Retry connecting...
  */
 public class LoginActivity extends AbstractFragmentActivity implements LoginContract.View {
-  public static final String KEY_HOSTNAME = "hostname";
+    public static final String KEY_HOSTNAME = "hostname";
 
-  private LoginContract.Presenter presenter;
+    private LoginContract.Presenter presenter;
 
-  @Override
-  protected int getLayoutContainerForFragment() {
-    return R.id.content;
-  }
+    @Override
+    protected int getLayoutContainerForFragment() {
+        return R.id.content;
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        String hostname = null;
+        Intent intent = getIntent();
+        if (intent != null && intent.getExtras() != null) {
+            hostname = intent.getStringExtra(KEY_HOSTNAME);
+        }
+
+        presenter = new LoginPresenter(
+                hostname,
+                new SessionInteractor(new RealmSessionRepository(hostname)),
+                ConnectivityManager.getInstance(getApplicationContext())
+        );
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        presenter.bindView(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        presenter.release();
+        super.onDestroy();
+    }
+
+    private void showFragment(Fragment fragment, String hostname) {
+        setContentView(R.layout.simple_screen);
+        injectHostnameArgTo(fragment, hostname);
+        super.showFragment(fragment);
+    }
+
+    private void injectHostnameArgTo(Fragment fragment, String hostname) {
+        Bundle args = fragment.getArguments();
+        if (args == null) {
+            args = new Bundle();
+        }
+        args.putString(LoginActivity.KEY_HOSTNAME, hostname);
+        fragment.setArguments(args);
+    }
+
+    @Override
+    protected void onBackPressedNotHandled() {
+        moveTaskToBack(true);
+    }
+
+    @Override
+    public void showLogin(String hostname) {
+        showFragment(new LoginFragment(), hostname);
+    }
 
-  @Override
-  protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
+    @Override
+    public void showRetryLogin(String hostname) {
+        showFragment(new RetryLoginFragment(), hostname);
+    }
 
-    String hostname = null;
-    Intent intent = getIntent();
-    if (intent != null && intent.getExtras() != null) {
-      hostname = intent.getStringExtra(KEY_HOSTNAME);
+    @Override
+    public void closeView() {
+        finish();
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
     }
 
-    presenter = new LoginPresenter(
-        hostname,
-        new SessionInteractor(new RealmSessionRepository(hostname)),
-        ConnectivityManager.getInstance(getApplicationContext())
-    );
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    presenter.bindView(this);
-  }
-
-  @Override
-  protected void onDestroy() {
-    presenter.release();
-    super.onDestroy();
-  }
-
-  private void showFragment(Fragment fragment, String hostname) {
-    setContentView(R.layout.simple_screen);
-    injectHostnameArgTo(fragment, hostname);
-    super.showFragment(fragment);
-  }
-
-  private void injectHostnameArgTo(Fragment fragment, String hostname) {
-    Bundle args = fragment.getArguments();
-    if (args == null) {
-      args = new Bundle();
+    @Override
+    protected boolean onBackPress() {
+        LoginFragment loginFragment = (LoginFragment) getSupportFragmentManager()
+                .findFragmentById(getLayoutContainerForFragment());
+        loginFragment.goBack();
+        return true;
     }
-    args.putString(LoginActivity.KEY_HOSTNAME, hostname);
-    fragment.setArguments(args);
-  }
-
-  @Override
-  protected void onBackPressedNotHandled() {
-    moveTaskToBack(true);
-  }
-
-  @Override
-  public void showLogin(String hostname) {
-    showFragment(new LoginFragment(), hostname);
-  }
-
-  @Override
-  public void showRetryLogin(String hostname) {
-    showFragment(new RetryLoginFragment(), hostname);
-  }
-
-  @Override
-  public void closeView() {
-    finish();
-    overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
-  }
 }

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

@@ -66,7 +66,7 @@ public class LoginPresenter extends BasePresenter<LoginContract.View>
                   view.closeView();
               }
             },
-            Logger::report
+            Logger.INSTANCE::report
         );
 
     addSubscription(subscription);

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

@@ -41,7 +41,6 @@ public class MainPresenter extends BasePresenter<MainContract.View>
     private final SessionInteractor sessionInteractor;
     private final MethodCallHelper methodCallHelper;
     private final ConnectivityManagerApi connectivityManagerApi;
-    private final RocketChatCache rocketChatCache;
     private final PublicSettingRepository publicSettingRepository;
 
     public MainPresenter(RoomInteractor roomInteractor,
@@ -49,13 +48,12 @@ public class MainPresenter extends BasePresenter<MainContract.View>
                          SessionInteractor sessionInteractor,
                          MethodCallHelper methodCallHelper,
                          ConnectivityManagerApi connectivityManagerApi,
-                         RocketChatCache rocketChatCache, PublicSettingRepository publicSettingRepository) {
+                         PublicSettingRepository publicSettingRepository) {
         this.roomInteractor = roomInteractor;
         this.canCreateRoomInteractor = canCreateRoomInteractor;
         this.sessionInteractor = sessionInteractor;
         this.methodCallHelper = methodCallHelper;
         this.connectivityManagerApi = connectivityManagerApi;
-        this.rocketChatCache = rocketChatCache;
         this.publicSettingRepository = publicSettingRepository;
     }
 
@@ -97,12 +95,13 @@ public class MainPresenter extends BasePresenter<MainContract.View>
         subscribeToNetworkChanges();
         subscribeToUnreadCount();
         subscribeToSession();
-        setUserOnline();
     }
 
     @Override
     public void release() {
-        setUserAway();
+        if (RocketChatCache.INSTANCE.getSessionToken() != null) {
+            setUserAway();
+        }
 
         super.release();
     }
@@ -120,7 +119,7 @@ public class MainPresenter extends BasePresenter<MainContract.View>
                                 view.showHome();
                             }
                         },
-                        Logger::report
+                        Logger.INSTANCE::report
                 );
 
         addSubscription(subscription);
@@ -157,13 +156,13 @@ public class MainPresenter extends BasePresenter<MainContract.View>
         String logoUrl = (jsonObject.has("url")) ?
                 jsonObject.optString("url") : jsonObject.optString("defaultUrl");
         String siteName = serverInfoPair.second;
-        rocketChatCache.addHostname(hostname.toLowerCase(), logoUrl, siteName);
-        return rocketChatCache.getServerList();
+        RocketChatCache.INSTANCE.addHostname(hostname.toLowerCase(), logoUrl, siteName);
+        return RocketChatCache.INSTANCE.getServerList();
     }
 
     private void openRoom() {
-        String hostname = rocketChatCache.getSelectedServerHostname();
-        String roomId = rocketChatCache.getSelectedRoomId();
+        String hostname = RocketChatCache.INSTANCE.getSelectedServerHostname();
+        String roomId = RocketChatCache.INSTANCE.getSelectedRoomId();
 
         if (roomId == null || roomId.length() == 0) {
             view.showHome();
@@ -183,7 +182,7 @@ public class MainPresenter extends BasePresenter<MainContract.View>
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         pair -> view.showUnreadCount(pair.first, pair.second),
-                        Logger::report
+                        Logger.INSTANCE::report
                 );
 
         addSubscription(subscription);
@@ -211,10 +210,11 @@ public class MainPresenter extends BasePresenter<MainContract.View>
                                 view.showConnecting();
                                 return;
                             }
-
-                            view.showConnectionOk();
+                            // TODO: Should we remove below and above calls to view?
+                            // view.showConnectionOk();
+                            RocketChatCache.INSTANCE.setSessionToken(session.getToken());
                         },
-                        Logger::report
+                        Logger.INSTANCE::report
                 );
 
         addSubscription(subscription);
@@ -227,17 +227,21 @@ public class MainPresenter extends BasePresenter<MainContract.View>
                 .subscribe(
                         connectivity -> {
                             if (connectivity.state == ServerConnectivity.STATE_CONNECTED) {
-                                view.showConnectionOk();
-                                view.refreshRoom();
+                                //TODO: notify almost connected or something like that.
+//                                view.showConnectionOk();
                             } else if (connectivity.state == ServerConnectivity.STATE_DISCONNECTED) {
                                 if (connectivity.code == DDPClient.REASON_NETWORK_ERROR) {
                                     view.showConnectionError();
                                 }
+                            } else if (connectivity.state == ServerConnectivity.STATE_SESSION_ESTABLISHED) {
+                                setUserOnline();
+                                view.refreshRoom();
+                                view.showConnectionOk();
                             } else {
                                 view.showConnecting();
                             }
                         },
-                        Logger::report
+                        RCLog::e
                 );
 
         addSubscription(disposable);

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

@@ -8,42 +8,37 @@ import chat.rocket.persistence.realm.models.internal.RealmSession;
 
 public class DefaultCookieProvider implements CookieProvider {
 
-  private RocketChatCache rocketChatCache;
-
-  public DefaultCookieProvider(RocketChatCache rocketChatCache) {
-    this.rocketChatCache = rocketChatCache;
-  }
-
-  @Override
-  public String getHostname() {
-    return getHostnameFromCache();
-  }
-
-  @Override
-  public String getCookie() {
-    final String hostname = getHostnameFromCache();
-    if (hostname == null) {
-      return "";
-    }
 
-    final RealmHelper realmHelper = RealmStore.get(getHostnameFromCache());
-    if (realmHelper == null) {
-      return "";
+    @Override
+    public String getHostname() {
+        return getHostnameFromCache();
     }
 
-    final RealmUser user = realmHelper.executeTransactionForRead(realm ->
-        RealmUser.queryCurrentUser(realm).findFirst());
-    final RealmSession session = realmHelper.executeTransactionForRead(realm ->
-        RealmSession.queryDefaultSession(realm).findFirst());
+    @Override
+    public String getCookie() {
+        final String hostname = getHostnameFromCache();
+        if (hostname == null) {
+            return "";
+        }
 
-    if (user == null || session == null) {
-      return "";
-    }
+        final RealmHelper realmHelper = RealmStore.get(getHostnameFromCache());
+        if (realmHelper == null) {
+            return "";
+        }
+
+        final RealmUser user = realmHelper.executeTransactionForRead(realm ->
+                RealmUser.queryCurrentUser(realm).findFirst());
+        final RealmSession session = realmHelper.executeTransactionForRead(realm ->
+                RealmSession.queryDefaultSession(realm).findFirst());
 
-    return "rc_uid=" + user.getId() + ";rc_token=" + session.getToken();
-  }
+        if (user == null || session == null) {
+            return "";
+        }
 
-  private String getHostnameFromCache() {
-    return rocketChatCache.getSelectedServerHostname();
-  }
+        return "rc_uid=" + user.getId() + ";rc_token=" + session.getToken();
+    }
+
+    private String getHostnameFromCache() {
+        return RocketChatCache.INSTANCE.getSelectedServerHostname();
+    }
 }

app/src/main/java/chat/rocket/android/extensions/HelperExtensions.kt

+package chat.rocket.android.extensions
+
+import chat.rocket.android.BuildConfig
+
+fun Throwable.printStackTraceOnDebug() {
+    if (BuildConfig.DEBUG) {
+        this.printStackTrace()
+    }
+}
\ No newline at end of file

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

@@ -12,7 +12,6 @@ import android.widget.TextView;
 import chat.rocket.android.BuildConfig;
 import chat.rocket.android.LaunchUtil;
 import chat.rocket.android.R;
-import chat.rocket.android.RocketChatCache;
 import chat.rocket.android.fragment.AbstractFragment;
 import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.service.ConnectivityManager;
@@ -34,7 +33,7 @@ public class InputHostnameFragment extends AbstractFragment implements InputHost
         super.onCreate(savedInstanceState);
 
         Context appContext = getContext().getApplicationContext();
-        presenter = new InputHostnamePresenter(new RocketChatCache(appContext), ConnectivityManager.getInstance(appContext));
+        presenter = new InputHostnamePresenter(ConnectivityManager.getInstance(appContext));
     }
 
     @Override
@@ -52,7 +51,7 @@ public class InputHostnameFragment extends AbstractFragment implements InputHost
     }
 
     private void setupVersionInfo() {
-        TextView versionInfoView = (TextView) rootView.findViewById(R.id.version_info);
+        TextView versionInfoView = rootView.findViewById(R.id.version_info);
         versionInfoView.setText(getString(R.string.version_info_text, BuildConfig.VERSION_NAME));
     }
 

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

@@ -14,11 +14,9 @@ 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;
   private final ConnectivityManagerApi connectivityManager;
 
-  public InputHostnamePresenter(RocketChatCache rocketChatCache, ConnectivityManagerApi connectivityManager) {
-    this.rocketChatCache = rocketChatCache;
+  public InputHostnamePresenter(ConnectivityManagerApi connectivityManager) {
     this.connectivityManager = connectivityManager;
   }
 
@@ -47,14 +45,14 @@ public class InputHostnamePresenter extends BasePresenter<InputHostnameContract.
               }
             },
             throwable -> {
-              Logger.report(throwable);
+              Logger.INSTANCE.report(throwable);
               view.showConnectionError();
             });
     addSubscription(subscription);
   }
 
   private void onServerValid(String hostname, boolean usesSecureConnection) {
-    rocketChatCache.setSelectedServerHostname(hostname);
+    RocketChatCache.INSTANCE.setSelectedServerHostname(hostname);
 
     String server = hostname.replace("/", ".");
     connectivityManager.addOrUpdateServer(server, server, !usesSecureConnection);

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

@@ -11,7 +11,7 @@ import chat.rocket.android.fragment.AbstractFragment;
 import chat.rocket.android.widget.RoomToolbar;
 import chat.rocket.core.models.User;
 
-abstract class AbstractChatRoomFragment extends AbstractFragment {
+public abstract class AbstractChatRoomFragment extends AbstractFragment {
   private RoomToolbar roomToolbar;
 
   @Nullable

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

-package chat.rocket.android.fragment.chatroom;
-
-import chat.rocket.android.R;
-
-public class HomeFragment extends AbstractChatRoomFragment {
-
-  public HomeFragment() {}
-
-  @Override
-  protected int getLayout() {
-    return R.layout.fragment_home;
-  }
-
-  @Override
-  protected void onSetupView() {
-    setToolbarTitle(getText(R.string.home_fragment_title));
-  }
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/fragment/chatroom/HomeFragment.kt

+package chat.rocket.android.fragment.chatroom
+
+import chat.rocket.android.R
+
+class HomeFragment : AbstractChatRoomFragment() {
+
+    override fun getLayout(): Int {
+        return R.layout.fragment_home
+    }
+
+    override fun onSetupView() {
+        setToolbarTitle(getText(R.string.home_fragment_title))
+    }
+}
\ No newline at end of file

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

-package chat.rocket.android.fragment.chatroom;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import java.util.List;
-
-import chat.rocket.android.shared.BaseContract;
-import chat.rocket.android.widget.AbsoluteUrl;
-import chat.rocket.core.models.Message;
-import chat.rocket.core.models.Room;
-import chat.rocket.core.models.User;
-
-public interface RoomContract {
-
-  interface View extends BaseContract.View {
-
-    void setupWith(RocketChatAbsoluteUrl rocketChatAbsoluteUrl);
-
-    void render(Room room);
-
-    void showUserStatus(User user);
-
-    void updateHistoryState(boolean hasNext, boolean isLoaded);
-
-    void onMessageSendSuccessfully();
-
-    void disableMessageInput();
-
-    void enableMessageInput();
-
-    void showUnreadCount(int count);
-
-    void showMessages(List<Message> messages);
-
-    void showMessageSendFailure(Message message);
-
-    void showMessageDeleteFailure(Message message);
-
-    void autoloadImages();
-
-    void manualLoadImages();
-
-    void onReply(AbsoluteUrl absoluteUrl, String markdown, Message message);
-
-    void onCopy(String message);
-
-    void showMessageActions(Message message);
-  }
-
-  interface Presenter extends BaseContract.Presenter<View> {
-
-    void loadMessages();
-
-    void loadMoreMessages();
-
-    void onMessageSelected(@Nullable Message message);
-
-    void onMessageTap(@Nullable Message message);
-
-    void sendMessage(String messageText);
-
-    void resendMessage(@NonNull Message message);
-
-    void updateMessage(@NonNull Message message, String content);
-
-    void deleteMessage(@NonNull Message message);
-
-    void onUnreadCount();
-
-    void onMarkAsRead();
-
-    void refreshRoom();
-
-    void replyMessage(@NonNull Message message, boolean justQuote);
-
-    void acceptMessageDeleteFailure(Message message);
-  }
-}

app/src/main/java/chat/rocket/android/fragment/chatroom/RoomContract.kt

+package chat.rocket.android.fragment.chatroom
+
+import chat.rocket.android.shared.BaseContract
+import chat.rocket.android.widget.AbsoluteUrl
+import chat.rocket.core.models.Message
+import chat.rocket.core.models.Room
+import chat.rocket.core.models.User
+
+interface RoomContract {
+
+    interface View : BaseContract.View {
+
+        fun setupWith(rocketChatAbsoluteUrl: RocketChatAbsoluteUrl)
+
+        fun render(room: Room)
+
+        fun showUserStatus(user: User)
+
+        fun updateHistoryState(hasNext: Boolean, isLoaded: Boolean)
+
+        fun onMessageSendSuccessfully()
+
+        fun disableMessageInput()
+
+        fun enableMessageInput()
+
+        fun showUnreadCount(count: Int)
+
+        fun showMessages(messages: List<Message>)
+
+        fun showMessageSendFailure(message: Message)
+
+        fun showMessageDeleteFailure(message: Message)
+
+        fun autoloadImages()
+
+        fun manualLoadImages()
+
+        fun onReply(absoluteUrl: AbsoluteUrl, markdown: String, message: Message)
+
+        fun onCopy(message: String)
+
+        fun showMessageActions(message: Message)
+    }
+
+    interface Presenter : BaseContract.Presenter<View> {
+
+        fun loadMessages()
+
+        fun loadMoreMessages()
+
+        fun onMessageSelected(message: Message?)
+
+        fun onMessageTap(message: Message?)
+
+        fun sendMessage(messageText: String)
+
+        fun resendMessage(message: Message)
+
+        fun updateMessage(message: Message, content: String)
+
+        fun deleteMessage(message: Message)
+
+        fun onUnreadCount()
+
+        fun onMarkAsRead()
+
+        fun refreshRoom()
+
+        fun replyMessage(message: Message, justQuote: Boolean)
+
+        fun acceptMessageDeleteFailure(message: Message)
+
+        fun loadMissedMessages()
+    }
+}

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

@@ -131,7 +131,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     private MethodCallHelper methodCallHelper;
     private AbsoluteUrlHelper absoluteUrlHelper;
 
-    private Message edittingMessage = null;
+    private Message editingMessage = null;
 
     private RoomToolbar toolbar;
 
@@ -344,7 +344,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
 
         optionalPane.ifPresent(pane -> pane.setPanelSlideListener(new SlidingPaneLayout.PanelSlideListener() {
                 @Override
-                public void onPanelSlide(View view, float v) {
+                public void onPanelSlide(@NonNull View view, float v) {
                     messageFormManager.enableComposingText(false);
                     sidebarFragment.clearSearchViewFocus();
                     //Ref: ActionBarDrawerToggle#setProgress
@@ -352,12 +352,12 @@ public class RoomFragment extends AbstractChatRoomFragment implements
                 }
 
                 @Override
-                public void onPanelOpened(View view) {
+                public void onPanelOpened(@NonNull View view) {
                     toolbar.setNavigationIconVerticalMirror(true);
                 }
 
                 @Override
-                public void onPanelClosed(View view) {
+                public void onPanelClosed(@NonNull View view) {
                     messageFormManager.enableComposingText(true);
                     toolbar.setNavigationIconVerticalMirror(false);
                     subPane.closePane();
@@ -487,8 +487,8 @@ public class RoomFragment extends AbstractChatRoomFragment implements
 
     @Override
     public boolean onBackPressed() {
-        if (edittingMessage != null) {
-            edittingMessage = null;
+        if (editingMessage != null) {
+            editingMessage = null;
             messageFormManager.clearComposingText();
         }
         return false;
@@ -540,22 +540,22 @@ public class RoomFragment extends AbstractChatRoomFragment implements
             inputContentInfo.releasePermission();
         } catch (Exception e) {
             RCLog.e(e);
-            Logger.report(e);
+            Logger.INSTANCE.report(e);
         }
 
         return true;
     }
 
     private void sendMessage(String messageText) {
-        if (edittingMessage == null) {
+        if (editingMessage == null) {
             presenter.sendMessage(messageText);
         } else {
-            presenter.updateMessage(edittingMessage, messageText);
+            presenter.updateMessage(editingMessage, messageText);
         }
     }
 
     @Override
-    public void setupWith(RocketChatAbsoluteUrl rocketChatAbsoluteUrl) {
+    public void setupWith(@NonNull RocketChatAbsoluteUrl rocketChatAbsoluteUrl) {
         if (rocketChatAbsoluteUrl != null) {
             token = rocketChatAbsoluteUrl.getToken();
             userId = rocketChatAbsoluteUrl.getUserId();
@@ -564,7 +564,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     @Override
-    public void render(Room room) {
+    public void render(@NonNull Room room) {
         roomType = room.getType();
         setToolbarTitle(room.getName());
 
@@ -589,7 +589,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     @Override
-    public void showUserStatus(User user) {
+    public void showUserStatus(@NonNull User user) {
         showToolbarUserStatuslIcon(user.getStatus());
     }
 
@@ -610,7 +610,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     public void onMessageSendSuccessfully() {
         scrollToLatestMessage();
         messageFormManager.onMessageSend();
-        edittingMessage = null;
+        editingMessage = null;
     }
 
     @Override
@@ -629,15 +629,16 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     @Override
-    public void showMessages(List<Message> messages) {
+    public void showMessages(@NonNull List<? extends Message> messages) {
         if (messageListAdapter == null) {
             return;
         }
-        messageListAdapter.updateData(messages);
+
+        messageListAdapter.updateData((List<Message>) messages);
     }
 
     @Override
-    public void showMessageSendFailure(Message message) {
+    public void showMessageSendFailure(@NonNull Message message) {
         new AlertDialog.Builder(getContext())
                 .setPositiveButton(R.string.resend,
                         (dialog, which) -> presenter.resendMessage(message))
@@ -648,7 +649,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     @Override
-    public void showMessageDeleteFailure(Message message) {
+    public void showMessageDeleteFailure(@NonNull Message message) {
         new AlertDialog.Builder(getContext())
                 .setTitle(getContext().getString(R.string.failed_to_delete))
                 .setMessage(getContext().getString(R.string.failed_to_delete_message))
@@ -667,12 +668,12 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     @Override
-    public void onReply(AbsoluteUrl absoluteUrl, String markdown, Message message) {
+    public void onReply(@NonNull AbsoluteUrl absoluteUrl, @NonNull String markdown, @NonNull Message message) {
         messageFormManager.setReply(absoluteUrl, markdown, message);
     }
 
     @Override
-    public void onCopy(String message) {
+    public void onCopy(@NonNull String message) {
         RocketChatApplication context = RocketChatApplication.getInstance();
         ClipboardManager clipboardManager =
                 (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
@@ -680,7 +681,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     @Override
-    public void showMessageActions(Message message) {
+    public void showMessageActions(@NonNull Message message) {
         Activity context = getActivity();
         if (context != null && context instanceof MainActivity) {
             MessagePopup.take(message)
@@ -694,7 +695,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     private void onEditMessage(Message message) {
-        edittingMessage = message;
+        editingMessage = message;
         messageFormManager.setEditMessage(message.getMessage());
     }
 
@@ -716,7 +717,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
         }
     }
 
-    public void loadMessages() {
-        presenter.loadMessages();
+    public void loadMissedMessages() {
+        presenter.loadMissedMessages();
     }
 }
\ No newline at end of file

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

@@ -37,7 +37,7 @@ public class OAuthPresenter extends BasePresenter<OAuthContract.View>
                     view.close();
                   }
                 },
-                Logger::report
+                Logger.INSTANCE::report
             )
     );
   }

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

@@ -8,7 +8,7 @@ import chat.rocket.android.R;
 import chat.rocket.android.fragment.AbstractFragment;
 import chat.rocket.android.helper.TextUtils;
 
-abstract class AbstractServerConfigFragment extends AbstractFragment {
+public abstract class AbstractServerConfigFragment extends AbstractFragment {
   public static final String KEY_HOSTNAME = "hostname";
 
   protected String hostname;

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

@@ -7,21 +7,25 @@ import chat.rocket.core.models.LoginServiceConfiguration;
 
 public interface LoginContract {
 
-  interface View extends BaseContract.View {
+    interface View extends BaseContract.View {
 
-    void showLoader();
+        void showLoader();
 
-    void hideLoader();
+        void hideLoader();
 
-    void showError(String message);
+        void showError(String message);
 
-    void showLoginServices(List<LoginServiceConfiguration> loginServiceList);
+        void showLoginServices(List<LoginServiceConfiguration> loginServiceList);
 
-    void showTwoStepAuth();
-  }
+        void showTwoStepAuth();
 
-  interface Presenter extends BaseContract.Presenter<View> {
+        void goBack();
+    }
 
-    void login(String username, String password);
-  }
+    interface Presenter extends BaseContract.Presenter<View> {
+
+        void login(String username, String password);
+
+        void goBack();
+    }
 }

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

-package chat.rocket.android.fragment.server_config;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.constraint.ConstraintLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.view.View;
-import android.widget.Button;
-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;
-import chat.rocket.android.log.RCLog;
-import chat.rocket.core.models.LoginServiceConfiguration;
-import chat.rocket.persistence.realm.repositories.RealmLoginServiceConfigurationRepository;
-import chat.rocket.persistence.realm.repositories.RealmPublicSettingRepository;
-
-/**
- * Login screen.
- */
-public class LoginFragment extends AbstractServerConfigFragment implements LoginContract.View {
-
-  private LoginContract.Presenter presenter;
-  private ConstraintLayout container;
-  private View waitingView;
-  private TextView txtUsername;
-  private TextView txtPasswd;
-
-  @Override
-  protected int getLayout() {
-    return R.layout.fragment_login;
-  }
-
-  @Override
-  public void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    presenter = new LoginPresenter(
-        new RealmLoginServiceConfigurationRepository(hostname),
-        new RealmPublicSettingRepository(hostname),
-        new MethodCallHelper(getContext(), hostname)
-    );
-  }
-
-  @Override
-  protected void onSetupView() {
-    container = rootView.findViewById(R.id.container);
-
-    Button btnEmail = rootView.findViewById(R.id.btn_login_with_email);
-    Button btnUserRegistration = rootView.findViewById(R.id.btn_user_registration);
-    txtUsername = rootView.findViewById(R.id.editor_username);
-    txtPasswd = rootView.findViewById(R.id.editor_passwd);
-    waitingView = rootView.findViewById(R.id.waiting);
-
-    btnEmail.setOnClickListener(view ->
-        presenter.login(txtUsername.getText().toString(), txtPasswd.getText().toString()));
-
-    btnUserRegistration.setOnClickListener(view ->
-        UserRegistrationDialogFragment.create(hostname, txtUsername.getText().toString(), txtPasswd.getText().toString())
-        .show(getFragmentManager(), "UserRegistrationDialogFragment"));
-  }
-
-  @Override
-  public void showLoader() {
-    container.setVisibility(View.GONE);
-    waitingView.setVisibility(View.VISIBLE);
-  }
-
-  @Override
-  public void hideLoader() {
-    waitingView.setVisibility(View.GONE);
-    container.setVisibility(View.VISIBLE);
-  }
-
-  @Override
-  public void showError(String message) {
-    Snackbar.make(rootView, message, Snackbar.LENGTH_SHORT).show();
-  }
-
-  @Override
-  public void showLoginServices(List<LoginServiceConfiguration> loginServiceList) {
-    HashMap<String, View> viewMap = new HashMap<>();
-    HashMap<String, Boolean> supportedMap = new HashMap<>();
-    for (OAuthProviderInfo info : OAuthProviderInfo.LIST) {
-      viewMap.put(info.serviceName, rootView.findViewById(info.buttonId));
-      supportedMap.put(info.serviceName, false);
-    }
-
-    for (LoginServiceConfiguration authProvider : loginServiceList) {
-      for (OAuthProviderInfo info : OAuthProviderInfo.LIST) {
-        if (!supportedMap.get(info.serviceName)
-            && info.serviceName.equals(authProvider.getService())) {
-          supportedMap.put(info.serviceName, true);
-          viewMap.get(info.serviceName).setOnClickListener(view -> {
-            Fragment fragment = null;
-            try {
-              fragment = info.fragmentClass.newInstance();
-            } catch (Exception exception) {
-              RCLog.w(exception, "failed to build new Fragment");
-            }
-            if (fragment != null) {
-              Bundle args = new Bundle();
-              args.putString("hostname", hostname);
-              fragment.setArguments(args);
-              showFragmentWithBackStack(fragment);
-            }
-          });
-          viewMap.get(info.serviceName).setVisibility(View.VISIBLE);
-        }
-      }
-    }
-
-    for (OAuthProviderInfo info : OAuthProviderInfo.LIST) {
-      if (!supportedMap.get(info.serviceName)) {
-        viewMap.get(info.serviceName).setVisibility(View.GONE);
-      }
-    }
-  }
-
-  @Override
-  public void showTwoStepAuth() {
-    showFragmentWithBackStack(TwoStepAuthFragment.create(
-        hostname, txtUsername.getText().toString(), txtPasswd.getText().toString()
-    ));
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    presenter.bindView(this);
-  }
-
-  @Override
-  public void onPause() {
-    presenter.release();
-    super.onPause();
-  }
-}

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

@@ -52,7 +52,7 @@ public class RetryLoginPresenter extends BasePresenter<RetryLoginContract.View>
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(
                 this::onSession,
-                Logger::report
+                Logger.INSTANCE::report
             )
     );
   }

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

@@ -24,7 +24,6 @@ import java.util.List;
 
 import chat.rocket.android.BuildConfig;
 import chat.rocket.android.R;
-import chat.rocket.android.RocketChatCache;
 import chat.rocket.android.activity.MainActivity;
 import chat.rocket.android.api.MethodCallHelper;
 import chat.rocket.android.fragment.AbstractFragment;
@@ -94,13 +93,11 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
                 new SessionInteractor(new RealmSessionRepository(hostname))
         );
 
-        RocketChatCache rocketChatCache = new RocketChatCache(getContext().getApplicationContext());
 
         presenter = new SidebarMainPresenter(
                 hostname,
                 new RoomInteractor(new RealmRoomRepository(hostname)),
                 userRepository,
-                rocketChatCache,
                 absoluteUrlHelper,
                 new MethodCallHelper(getContext(), hostname),
                 new RealmSpotlightRepository(hostname)
@@ -239,7 +236,7 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
                 .compose(bindToLifecycle())
                 .subscribe(
                         this::showUserActionContainer,
-                        Logger::report
+                        Logger.INSTANCE::report
                 );
     }
 

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

@@ -47,7 +47,7 @@ public class AddChannelDialogFragment extends AbstractAddRoomDialogFragment {
             .compose(bindToLifecycle())
             .subscribe(
                 buttonAddChannel::setEnabled,
-                Logger::report
+                Logger.INSTANCE::report
             );
 
     buttonAddChannel.setOnClickListener(view -> createRoom());