Merge branch 'develop' into develop

.github/CONTRIBUTING.md

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

.github/ISSUE_TEMPLATE.md

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

CONTRIBUTING.md

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

README.md

@@ -10,16 +10,25 @@
 
 Retrolambda needs java8 to be installed on your system
 ```
-export ANDROID_HOME=/path/to/android/sdk
+$ export ANDROID_HOME=/path/to/android/sdk
+$ git clone https://github.com/RocketChat/Rocket.Chat.Android.git
+$ cd Rocket.Chat.Android
+$ echo "sdk.dir="$ANDROID_HOME > local.properties
+$ ./gradlew assembleDebug
+(> gradlew assembleDebug on Windows)
+```
 
-git clone https://github.com/RocketChat/Rocket.Chat.Android.git
-cd Rocket.Chat.Android
+### How to send APK to device
 
-echo "sdk.dir="$ANDROID_HOME > local.properties
+The following steps are only needed if running via command line. They are not needed if you are building via Android Studio.
 
-./gradlew assembleDebug
-```
+Ensure that ADB recognizes your device with `$ adb devices`.
+
+If a single device exists, install via `$ adb install /path/to/apk.apk`.
+
+Assuming you used Gradle like earlier, the file will be called `module_name-debug.apk` in `project_name/module_name/build/outputs/apk/`.
 
+Alternatively, you can simply run `$ ./gradlew installDebug` (`> gradlew installDebug` on Windows) to build, deploy, and debug all in a single command.
 
 ## Bug report & Feature request
 

android-ddp/build.gradle

@@ -11,11 +11,9 @@ buildscript {
         classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
     }
 }
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -33,15 +31,10 @@ android {
         }
     }
 }
-
 dependencies {
     compile project(':log-wrapper')
-
-    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
-
-    compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
-
-    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
-
-    compile 'com.parse.bolts:bolts-tasks:1.4.0'
+    compile extraDependencies.okHTTP
+    compile extraDependencies.rxJava
+    compile extraDependencies.boltTask
+    compile supportDependencies.annotation
 }
\ No newline at end of file

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

 package chat.rocket.android_ddp;
 
-import android.support.annotation.Nullable;
 
+import io.reactivex.Flowable;
+import io.reactivex.Maybe;
+import io.reactivex.annotations.Nullable;
 import org.json.JSONArray;
 
 import bolts.Task;
 import bolts.TaskCompletionSource;
 import chat.rocket.android_ddp.rx.RxWebSocketCallback;
-import io.reactivex.Flowable;
-import io.reactivex.Maybe;
 import okhttp3.OkHttpClient;
 
 public class DDPClient {

app/build.gradle

@@ -22,7 +22,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'me.tatarka:gradle-retrolambda:3.5.0'
@@ -46,8 +45,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 41
-        versionName "1.0.21"
+        versionCode 43
+        versionName "1.0.22"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -115,7 +114,6 @@ play {
     jsonFile = file('rocket-chat.json')
     track = "${track}"
 }
-
 ext {
     playLibVersion = '11.0.4'
     stethoVersion = '1.5.0'
@@ -128,67 +126,53 @@ ext {
 }
 
 dependencies {
-    compile project(':log-wrapper')
     compile project(':android-ddp')
-    compile project(':rocket-chat-core')
     compile project(':rocket-chat-android-widgets')
     compile project(':persistence-realm')
-
-    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
+    compile extraDependencies.okHTTP
+    compile extraDependencies.rxJava
+    compile extraDependencies.boltTask
+    compile supportDependencies.designSupportLibrary
+    compile supportDependencies.annotation
+    compile supportDependencies.kotlin;
+    compile rxbindingDependencies.rxBinding
+    compile rxbindingDependencies.rxBindingSupport
+    compile rxbindingDependencies.rxBindingAppcompact
     compile 'com.android.support:multidex:1.0.1'
-
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$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.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
-
     debugCompile "com.facebook.stetho:stetho:$stethoVersion"
     debugCompile "com.facebook.stetho:stetho-okhttp3:$stethoOkhttp3Version"
     debugCompile "com.uphyca:stetho_realm:$stethoRealmVersion"
-
-    compile "com.jakewharton.rxbinding2:rxbinding:$rxbindingVersion"
-    compile "com.jakewharton.rxbinding2:rxbinding-support-v4:$rxbindingVersion"
-    compile "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:$rxbindingVersion"
-
     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 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-
     compile "frankiesardo:icepick:$icepickVersion"
     provided "frankiesardo:icepick-processor:$icepickVersion"
-
     compile "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
     annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
-
     compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
         transitive = true;
     }
-
     debugCompile "com.tspoon.traceur:traceur:1.0.1"
-
-    provided 'com.parse.bolts:bolts-tasks:1.4.0'
-    provided 'io.reactivex.rxjava2:rxjava:2.1.0'
+    compile 'com.aurelhubert:ahbottomnavigation:2.0.6'
+    compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.6@aar') {
+        transitive = true
+    }
+    compile 'com.github.JakeWharton:ViewPagerIndicator:2.4.1@aar'
+    compile 'com.jakewharton:butterknife:8.5.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile 'com.jakewharton.timber:timber:4.5.1'
+    compile 'com.github.matrixxun:MaterialBadgeTextView:c5a27e8243'
+    compile 'com.github.chrisbanes:PhotoView:2.0.0'
     provided 'io.reactivex:rxjava:1.3.0'
     provided "com.github.akarnokd:rxjava2-interop:0.10.2"
     provided 'com.hadisatrio:Optional:v1.0.1'
-
     testCompile 'junit:junit:4.12'
     testCompile "org.mockito:mockito-core:2.7.19"
     testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
 }
-
 apply plugin: 'com.google.gms.google-services'

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

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

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

@@ -172,7 +172,10 @@ public class RocketChatCache {
   }
 
   public Flowable<Optional<String>> getSelectedRoomIdPublisher() {
-    return getValuePublisher(KEY_SELECTED_ROOM_ID);
+    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() {

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

@@ -3,14 +3,11 @@ package chat.rocket.android.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-
 import com.hadisatrio.optional.Optional;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
 import java.util.List;
-
 import chat.rocket.android.LaunchUtil;
 import chat.rocket.android.RocketChatCache;
 import chat.rocket.android.helper.Logger;
@@ -21,9 +18,6 @@ import chat.rocket.core.models.ServerInfo;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmRoom;
 import icepick.State;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
 
 abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
   @State protected String hostname;
@@ -33,6 +27,7 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
   private CompositeDisposable compositeDisposable = new CompositeDisposable();
   private boolean isNotification;
 
+
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -198,9 +193,8 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
 
     compositeDisposable.add(
         rocketChatCache.getSelectedRoomIdPublisher()
+            .filter(Optional::isPresent)
             .map(Optional::get)
-            .map(this::convertStringToJsonObject)
-            .map(jsonObject -> jsonObject.optString(rocketChatCache.getSelectedServerHostname(), null))
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(
@@ -209,11 +203,4 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
             )
     );
   }
-
-  private JSONObject convertStringToJsonObject(String json) throws JSONException {
-    if (json == null) {
-      return new JSONObject();
-    }
-    return new JSONObject(json);
-  }
 }

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

@@ -48,7 +48,8 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
   private SlidingPaneLayout pane;
   private MainContract.Presenter presenter;
 
-  protected int getLayoutContainerForFragment() {
+  @Override
+  public int getLayoutContainerForFragment() {
     return R.id.activity_main_container;
   }
 

app/src/main/java/chat/rocket/android/activity/room/RoomActivity.kt

@@ -9,7 +9,6 @@ import kotlinx.android.synthetic.main.activity_room.*
 
 class RoomActivity : AppCompatActivity() {
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_room)
@@ -35,8 +34,7 @@ class RoomActivity : AppCompatActivity() {
     }
 
     private fun addFragment(fragment: Fragment, tag: String) {
-        supportFragmentManager
-                .beginTransaction()
+        supportFragmentManager.beginTransaction()
                 .add(R.id.fragment_container, fragment, tag)
                 .commit()
     }

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

@@ -30,7 +30,7 @@ public class DDPClientWrapper {
   }
 
   /**
-   * create new API client instance.
+   * build new API client instance.
    */
   public static DDPClientWrapper create(String hostname) {
     return new DDPClientWrapper(hostname);

app/src/main/java/chat/rocket/android/api/rest/RestApiHelper.kt

@@ -96,6 +96,7 @@ object RestApiHelper {
         val parsedHttpUrl = HttpUrl.parse(getEndpointUrlForFileList(roomType, hostname))
                 ?.newBuilder()
                 ?.addQueryParameter("roomId", roomId)
+                ?.addQueryParameter("sort", "{\"uploadedAt\":-1}")
                 ?.addQueryParameter("offset", offset)
                 ?.build()
 
@@ -178,7 +179,7 @@ object RestApiHelper {
         var restApiUrl: String? = null
         when (roomType) {
             Room.TYPE_CHANNEL -> restApiUrl = "/api/v1/channels.messages"
-            Room.TYPE_PRIVATE -> restApiUrl = "/api/v1/groups.messages"
+            Room.TYPE_GROUP -> restApiUrl = "/api/v1/groups.messages"
             Room.TYPE_DIRECT_MESSAGE -> restApiUrl = "/api/v1/dm.messages"
         }
         return restApiUrl
@@ -194,7 +195,7 @@ object RestApiHelper {
         var restApiUrl: String? = null
         when (roomType) {
             Room.TYPE_CHANNEL -> restApiUrl = "/api/v1/channels.files"
-            Room.TYPE_PRIVATE -> restApiUrl = "/api/v1/groups.files"
+            Room.TYPE_GROUP -> restApiUrl = "/api/v1/groups.files"
             Room.TYPE_DIRECT_MESSAGE -> restApiUrl = "/api/v1/dm.files"
         }
         return restApiUrl
@@ -210,7 +211,7 @@ object RestApiHelper {
         var restApiUrl: String? = null
         when (roomType) {
             Room.TYPE_CHANNEL -> restApiUrl = "/api/v1/channels.members"
-            Room.TYPE_PRIVATE -> restApiUrl = "/api/v1/groups.members"
+            Room.TYPE_GROUP -> restApiUrl = "/api/v1/groups.members"
             Room.TYPE_DIRECT_MESSAGE -> restApiUrl = "/api/v1/dm.members"
         }
         return restApiUrl

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

@@ -29,4 +29,8 @@ public class RocketChatAbsoluteUrl implements AbsoluteUrl {
   public String getToken() {
     return token;
   }
+
+  public String getBaseUrl() {
+    return baseUrl;
+  }
 }
\ 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 chat.rocket.core.models.User;
 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 {
 
@@ -35,6 +38,12 @@ public interface RoomContract {
     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> {
@@ -45,18 +54,22 @@ public interface RoomContract {
 
     void onMessageSelected(@Nullable Message message);
 
+    void onMessageTap(@Nullable Message message);
+
     void sendMessage(String messageText);
 
-    void resendMessage(Message message);
+    void resendMessage(@NonNull Message message);
 
-    void updateMessage(Message message, String content);
+    void updateMessage(@NonNull Message message, String content);
 
-    void deleteMessage(Message message);
+    void deleteMessage(@NonNull Message message);
 
     void onUnreadCount();
 
     void onMarkAsRead();
 
     void refreshRoom();
+
+    void replyMessage(@NonNull Message message, boolean justQuote);
   }
 }

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

@@ -2,6 +2,9 @@ package chat.rocket.android.fragment.chatroom;
 
 import android.Manifest;
 import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -26,10 +29,11 @@ import java.util.List;
 
 import chat.rocket.android.BackgroundLooper;
 import chat.rocket.android.R;
+import chat.rocket.android.RocketChatApplication;
+import chat.rocket.android.activity.MainActivity;
 import chat.rocket.android.activity.room.RoomActivity;
 import chat.rocket.android.api.MethodCallHelper;
 import chat.rocket.android.fragment.chatroom.dialog.FileUploadProgressDialogFragment;
-import chat.rocket.android.fragment.chatroom.dialog.MessageOptionsDialogFragment;
 import chat.rocket.android.fragment.sidebar.SidebarMainFragment;
 import chat.rocket.android.helper.AbsoluteUrlHelper;
 import chat.rocket.android.helper.FileUploadHelper;
@@ -42,12 +46,14 @@ import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.layouthelper.chatroom.AbstractNewMessageIndicatorManager;
 import chat.rocket.android.layouthelper.chatroom.MessageFormManager;
 import chat.rocket.android.layouthelper.chatroom.MessageListAdapter;
+import chat.rocket.android.layouthelper.chatroom.MessagePopup;
 import chat.rocket.android.layouthelper.chatroom.ModelListAdapter;
 import chat.rocket.android.layouthelper.chatroom.PairedMessage;
 import chat.rocket.android.layouthelper.extra_action.AbstractExtraActionItem;
 import chat.rocket.android.layouthelper.extra_action.MessageExtraActionBehavior;
 import chat.rocket.android.layouthelper.extra_action.upload.AbstractUploadActionItem;
 import chat.rocket.android.layouthelper.extra_action.upload.AudioUploadActionItem;
+import chat.rocket.android.layouthelper.extra_action.upload.FileUploadActionItem;
 import chat.rocket.android.layouthelper.extra_action.upload.ImageUploadActionItem;
 import chat.rocket.android.layouthelper.extra_action.upload.VideoUploadActionItem;
 import chat.rocket.android.log.RCLog;
@@ -55,6 +61,7 @@ import chat.rocket.android.renderer.RocketChatUserStatusProvider;
 import chat.rocket.android.service.ConnectivityManager;
 import chat.rocket.android.service.temp.DeafultTempSpotlightRoomCaller;
 import chat.rocket.android.service.temp.DefaultTempSpotlightUserCaller;
+import chat.rocket.android.widget.AbsoluteUrl;
 import chat.rocket.android.widget.RoomToolbar;
 import chat.rocket.android.widget.internal.ExtraActionPickerDialogFragment;
 import chat.rocket.android.widget.message.MessageFormLayout;
@@ -90,8 +97,8 @@ import permissions.dispatcher.RuntimePermissions;
 public class RoomFragment extends AbstractChatRoomFragment implements
         OnBackPressListener,
         ExtraActionPickerDialogFragment.Callback,
-        ModelListAdapter.OnItemClickListener<PairedMessage>,
         ModelListAdapter.OnItemLongClickListener<PairedMessage>,
+        ModelListAdapter.OnItemClickListener<PairedMessage>,
         RoomContract.View {
 
     private static final int DIALOG_ID = 1;
@@ -128,14 +135,14 @@ public class RoomFragment extends AbstractChatRoomFragment implements
 
     private RoomToolbar toolbar;
 
-    private SlidingPaneLayout pane;
+    private Optional<SlidingPaneLayout> optionalPane;
     private SidebarMainFragment sidebarFragment;
 
     public RoomFragment() {
     }
 
     /**
-     * create fragment with roomId.
+     * build fragment with roomId.
      */
     public static RoomFragment create(String hostname, String roomId) {
         Bundle args = new Bundle();
@@ -197,13 +204,13 @@ public class RoomFragment extends AbstractChatRoomFragment implements
 
     @Override
     protected void onSetupView() {
-        pane = getActivity().findViewById(R.id.sliding_pane);
+        optionalPane = Optional.ofNullable(getActivity().findViewById(R.id.sliding_pane));
         messageRecyclerView = rootView.findViewById(R.id.messageRecyclerView);
 
         messageListAdapter = new MessageListAdapter(getContext(), hostname);
         messageRecyclerView.setAdapter(messageListAdapter);
-        messageListAdapter.setOnItemClickListener(this);
         messageListAdapter.setOnItemLongClickListener(this);
+        messageListAdapter.setOnItemClickListener(this);
 
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, true);
         messageRecyclerView.setLayoutManager(linearLayoutManager);
@@ -251,10 +258,11 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     private void setupMessageActions() {
-        extraActionItems = new ArrayList<>(3); // fixed number as of now
+        extraActionItems = new ArrayList<>(4); // fixed number as of now
         extraActionItems.add(new ImageUploadActionItem());
         extraActionItems.add(new AudioUploadActionItem());
         extraActionItems.add(new VideoUploadActionItem());
+        extraActionItems.add(new FileUploadActionItem());
     }
 
     private void scrollToLatestMessage() {
@@ -288,22 +296,14 @@ public class RoomFragment extends AbstractChatRoomFragment implements
     }
 
     @Override
-    public void onItemClick(PairedMessage pairedMessage) {
+    public boolean onItemLongClick(PairedMessage pairedMessage) {
         presenter.onMessageSelected(pairedMessage.target);
+        return true;
     }
 
     @Override
-    public boolean onItemLongClick(PairedMessage pairedMessage) {
-        MessageOptionsDialogFragment messageOptionsDialogFragment = MessageOptionsDialogFragment
-                .create(pairedMessage.target);
-
-        messageOptionsDialogFragment.setOnMessageOptionSelectedListener(message -> {
-            messageOptionsDialogFragment.dismiss();
-            onEditMessage(message);
-        });
-
-        messageOptionsDialogFragment.show(getChildFragmentManager(), "MessageOptionsDialogFragment");
-        return true;
+    public void onItemClick(PairedMessage pairedMessage) {
+        presenter.onMessageTap(pairedMessage.target);
     }
 
     private void setupToolbar() {
@@ -311,11 +311,11 @@ public class RoomFragment extends AbstractChatRoomFragment implements
         toolbar.getMenu().clear();
         toolbar.inflateMenu(R.menu.menu_room);
 
-        toolbar.setNavigationOnClickListener(view -> {
+        optionalPane.ifPresent(pane -> toolbar.setNavigationOnClickListener(view -> {
             if (pane.isSlideable() && !pane.isOpen()) {
                 pane.openPane();
             }
-        });
+        }));
 
         toolbar.setOnMenuItemClickListener(menuItem -> {
             switch (menuItem.getItemId()) {
@@ -325,9 +325,9 @@ public class RoomFragment extends AbstractChatRoomFragment implements
                 case R.id.action_favorite_messages:
                     showRoomListFragment(R.id.action_favorite_messages);
                     break;
-//                case R.id.action_file_list:
-//                    showRoomListFragment(R.id.action_file_list);
-//                    break;
+                case R.id.action_file_list:
+                    showRoomListFragment(R.id.action_file_list);
+                    break;
                 case R.id.action_member_list:
                     showRoomListFragment(R.id.action_member_list);
                     break;
@@ -342,8 +342,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
         SlidingPaneLayout subPane = getActivity().findViewById(R.id.sub_sliding_pane);
         sidebarFragment = (SidebarMainFragment) getActivity().getSupportFragmentManager().findFragmentById(R.id.sidebar_fragment_container);
 
-        if (pane != null) {
-            pane.setPanelSlideListener(new SlidingPaneLayout.PanelSlideListener() {
+        optionalPane.ifPresent(pane -> pane.setPanelSlideListener(new SlidingPaneLayout.PanelSlideListener() {
                 @Override
                 public void onPanelSlide(View view, float v) {
                     messageFormManager.enableComposingText(false);
@@ -364,8 +363,7 @@ public class RoomFragment extends AbstractChatRoomFragment implements
                     subPane.closePane();
                     closeUserActionContainer();
                 }
-            });
-        }
+            }));
     }
 
     public void closeUserActionContainer() {
@@ -659,6 +657,32 @@ public class RoomFragment extends AbstractChatRoomFragment implements
         messageListAdapter.setAutoloadImages(false);
     }
 
+    @Override
+    public void onReply(AbsoluteUrl absoluteUrl, String markdown, Message message) {
+        messageFormManager.setReply(absoluteUrl, markdown, message);
+    }
+
+    @Override
+    public void onCopy(String message) {
+        RocketChatApplication context = RocketChatApplication.getInstance();
+        ClipboardManager clipboardManager =
+                (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        clipboardManager.setPrimaryClip(ClipData.newPlainText("message", message));
+    }
+
+    @Override
+    public void showMessageActions(Message message) {
+        Activity context = getActivity();
+        if (context != null && context instanceof MainActivity) {
+            MessagePopup.take(message)
+                    .setReplyAction(msg -> presenter.replyMessage(message, false))
+                    .setEditAction(this::onEditMessage)
+                    .setCopyAction(msg -> onCopy(message.getMessage()))
+                    .setQuoteAction(msg -> presenter.replyMessage(message, true))
+                    .showWith(context);
+        }
+    }
+
     private void onEditMessage(Message message) {
         edittingMessage = message;
         messageFormManager.setEditMessage(message.getMessage());

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

@@ -6,15 +6,12 @@ import android.support.v4.util.Pair;
 
 import com.hadisatrio.optional.Optional;
 
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-
 import chat.rocket.android.BackgroundLooper;
 import chat.rocket.android.api.MethodCallHelper;
 import chat.rocket.android.helper.AbsoluteUrlHelper;
 import chat.rocket.android.helper.LogIfError;
 import chat.rocket.android.helper.Logger;
+import chat.rocket.android.service.ConnectivityManagerApi;
 import chat.rocket.android.shared.BasePresenter;
 import chat.rocket.core.SyncState;
 import chat.rocket.core.interactors.MessageInteractor;
@@ -24,7 +21,9 @@ import chat.rocket.core.models.Settings;
 import chat.rocket.core.models.User;
 import chat.rocket.core.repositories.RoomRepository;
 import chat.rocket.core.repositories.UserRepository;
-import chat.rocket.android.service.ConnectivityManagerApi;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
 
 public class RoomPresenter extends BasePresenter<RoomContract.View>
     implements RoomContract.Presenter {
@@ -36,8 +35,9 @@ public class RoomPresenter extends BasePresenter<RoomContract.View>
   private final AbsoluteUrlHelper absoluteUrlHelper;
   private final MethodCallHelper methodCallHelper;
   private final ConnectivityManagerApi connectivityManagerApi;
+  private Room currentRoom;
 
-  public RoomPresenter(String roomId,
+    public RoomPresenter(String roomId,
                        UserRepository userRepository,
                        MessageInteractor messageInteractor,
                        RoomRepository roomRepository,
@@ -112,11 +112,58 @@ public class RoomPresenter extends BasePresenter<RoomContract.View>
       return;
     }
 
+    if (message.getType() == null && message.getSyncState() == SyncState.SYNCED) {
+        // If message is not a system message show applicable actions.
+        view.showMessageActions(message);
+    }
+  }
+
+  @Override
+  public void onMessageTap(@Nullable Message message) {
+    if (message == null) {
+      return;
+    }
+
     if (message.getSyncState() == SyncState.FAILED) {
       view.showMessageSendFailure(message);
     }
   }
 
+  @Override
+  public void replyMessage(@NonNull Message message, boolean justQuote) {
+      this.absoluteUrlHelper.getRocketChatAbsoluteUrl()
+              .cache()
+              .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
+              .observeOn(AndroidSchedulers.mainThread())
+              .subscribe(
+                      serverUrl -> {
+                          if (serverUrl.isPresent()) {
+                              RocketChatAbsoluteUrl absoluteUrl = serverUrl.get();
+                              String baseUrl = absoluteUrl.getBaseUrl();
+                              view.onReply(absoluteUrl, buildReplyOrQuoteMarkdown(baseUrl, message, justQuote), message);
+                          }
+                      },
+                      Logger::report
+              );
+  }
+
+  private String buildReplyOrQuoteMarkdown(String baseUrl, Message message, boolean justQuote) {
+    if (currentRoom == null || message.getUser() == null) {
+        return "";
+    }
+
+    if (currentRoom.isDirectMessage()) {
+        return String.format("[ ](%s/direct/%s?msg=%s) ", baseUrl,
+                message.getUser().getUsername(),
+                message.getId());
+    } else {
+        return String.format("[ ](%s/channel/%s?msg=%s) %s", baseUrl,
+                currentRoom.getName(),
+                message.getId(),
+                justQuote ? "" : "@" + message.getUser().getUsername() + " ");
+    }
+  }
+
   @Override
   public void sendMessage(String messageText) {
     view.disableMessageInput();
@@ -141,7 +188,7 @@ public class RoomPresenter extends BasePresenter<RoomContract.View>
   }
 
   @Override
-  public void resendMessage(Message message) {
+  public void resendMessage(@NonNull Message message) {
     final Disposable subscription = getCurrentUser()
         .flatMap(user -> messageInteractor.resend(message, user))
         .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
@@ -152,7 +199,7 @@ public class RoomPresenter extends BasePresenter<RoomContract.View>
   }
 
   @Override
-  public void updateMessage(Message message, String content) {
+  public void updateMessage(@NonNull Message message, String content) {
     view.disableMessageInput();
     final Disposable subscription = getCurrentUser()
         .flatMap(user -> messageInteractor.update(message, user, content))
@@ -175,7 +222,7 @@ public class RoomPresenter extends BasePresenter<RoomContract.View>
   }
 
   @Override
-  public void deleteMessage(Message message) {
+  public void deleteMessage(@NonNull Message message) {
     final Disposable subscription = messageInteractor.delete(message)
         .subscribeOn(AndroidSchedulers.from(BackgroundLooper.get()))
         .observeOn(AndroidSchedulers.mainThread())
@@ -233,6 +280,7 @@ public class RoomPresenter extends BasePresenter<RoomContract.View>
   }
 
   private void processRoom(Room room) {
+      this.currentRoom = room;
     view.render(room);
 
     if (room.isDirectMessage()) {

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

 package chat.rocket.android.fragment.chatroom.list
 
+import chat.rocket.core.models.Attachment
 import chat.rocket.core.models.Message
 import chat.rocket.core.models.User
 
@@ -32,7 +33,7 @@ interface RoomListContract {
          * @param dataSet The file data set to show.
          * @param total The total number of files.
          */
-        fun showFileList(dataSet: ArrayList<String>, total: String)
+        fun showFileList(dataSet: ArrayList<Attachment>, total: String)
 
         /**
          * Shows a list of members of a room.

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

@@ -9,8 +9,10 @@ import android.view.View
 import android.view.ViewGroup
 import chat.rocket.android.R
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
+import chat.rocket.android.layouthelper.chatroom.list.RoomFileListAdapter
 import chat.rocket.android.layouthelper.chatroom.list.RoomMemberListAdapter
 import chat.rocket.android.layouthelper.chatroom.list.RoomMessagesAdapter
+import chat.rocket.core.models.Attachment
 import chat.rocket.core.models.Message
 import chat.rocket.core.models.User
 import kotlinx.android.synthetic.main.fragment_room_list.*
@@ -84,6 +86,14 @@ class RoomListFragment : Fragment(), RoomListContract.View {
                         userId,
                         offset)
             }
+            R.id.action_file_list -> {
+                presenter.requestFileList(roomId,
+                        roomType,
+                        hostname,
+                        token,
+                        userId,
+                        offset)
+            }
             R.id.action_favorite_messages -> {
                 presenter.requestFavoriteMessages(roomId,
                         roomType,
@@ -139,8 +149,23 @@ class RoomListFragment : Fragment(), RoomListContract.View {
         }
     }
 
-    // TODO (after REST api fixes)
-    override fun showFileList(dataSet: ArrayList<String>, total: String) {}
+    override fun showFileList(dataSet: ArrayList<Attachment>, total: String) {
+        activity.title = getString(R.string.fragment_room_list_file_list_title, total)
+        if (recyclerView.adapter == null) {
+            recyclerView.adapter = RoomFileListAdapter(dataSet)
+            val linearLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+            recyclerView.layoutManager = linearLayoutManager
+            if (dataSet.size >= 50) {
+                recyclerView.addOnScrollListener(object : EndlessRecyclerViewScrollListener(linearLayoutManager) {
+                    override fun onLoadMore(page: Int, totalItemsCount: Int, recyclerView: RecyclerView?) {
+                        loadNextDataFromApi(page)
+                    }
+                })
+            }
+        } else {
+            (recyclerView.adapter as RoomFileListAdapter).addDataSet(dataSet)
+        }
+    }
 
     override fun showMemberList(dataSet: ArrayList<User>, total: String) {
         activity.title = getString(R.string.fragment_room_list_member_list_title, total)

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

@@ -2,11 +2,13 @@ package chat.rocket.android.fragment.chatroom.list
 
 import android.content.Context
 import android.os.Handler
-import android.util.Log
 import chat.rocket.android.R
 import chat.rocket.android.api.rest.RestApiHelper
 import chat.rocket.android.helper.OkHttpHelper
+import chat.rocket.android.helper.UrlHelper
 import chat.rocket.core.SyncState
+import chat.rocket.core.models.Attachment
+import chat.rocket.core.models.AttachmentTitle
 import chat.rocket.core.models.Message
 import chat.rocket.core.models.User
 import okhttp3.Call
@@ -98,13 +100,43 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
                 })
     }
 
-    // TODO (after the REST api fixes)
     override fun requestFileList(roomId: String,
                                  roomType: String,
                                  hostname: String,
                                  token: String,
                                  userId: String,
-                                 offset: Int) {}
+                                 offset: Int) {
+        view.showWaitingView(true)
+        OkHttpHelper.getClient()
+                .newCall(RestApiHelper.getRequestForFileList(roomId,
+                        roomType,
+                        hostname,
+                        token,
+                        userId,
+                        offset.toString()))
+                .enqueue(object : Callback {
+                    override fun onFailure(call: Call, e: IOException) {
+                        if (!call.isCanceled) {
+                            val message = e.message
+                            if (message != null) {
+                                showErrorMessage(message)
+                            }
+                        }
+                    }
+
+                    @Throws(IOException::class)
+                    override fun onResponse(call: Call, response: Response) {
+                        if (response.isSuccessful) {
+                            val result = response.body()?.string()
+                            if (result != null) {
+                                handleFilesJson(result, hostname)
+                            }
+                        } else {
+                            showErrorMessage(response.message())
+                        }
+                    }
+                })
+    }
 
     override fun requestMemberList(roomId: String,
                                    roomType: String,
@@ -159,27 +191,13 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
                 val messageJsonObject = messagesJSONArray.getJSONObject(it)
                 val userJsonObject = messageJsonObject.getJSONObject("u")
 
-                val timestampString = messageJsonObject.optString("ts")
-                val timestamp = if (timestampString.isBlank()) {
-                    0
-                } else {
-                    Timestamp.valueOf(timestampString.replace("T", " ").replace("Z", "")).time
-                }
-
-                val editedAtString = messageJsonObject.optString("_updatedAt")
-                val editedAt = if (editedAtString.isBlank()) {
-                    0
-                } else {
-                    Timestamp.valueOf(editedAtString.replace("T", " ").replace("Z", "")).time
-                }
-
                 Message.builder()
                         .setId(messageJsonObject.optString("_id"))
                         .setRoomId(messageJsonObject.optString("rid"))
                         .setMessage(messageJsonObject.optString("msg"))
                         .setUser(getUserFromJsonObject(userJsonObject))
-                        .setTimestamp(timestamp)
-                        .setEditedAt(editedAt)
+                        .setTimestamp(getLongTimestamp(messageJsonObject.optString("ts")))
+                        .setEditedAt(getLongTimestamp(messageJsonObject.optString("_updatedAt")))
                         .setGroupable(messageJsonObject.optBoolean("groupable"))
                         .setSyncState(SyncState.SYNCED)
                         .build()
@@ -202,6 +220,52 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
         }
     }
 
+    private fun handleFilesJson(json: String, hostname: String) {
+        try {
+            val jsonObject = JSONObject(json)
+            val filesJsonArray = jsonObject.getJSONArray("files")
+
+            val total = filesJsonArray.length()
+            val dataSet = ArrayList<Attachment>(total)
+            (0 until total).mapTo(dataSet) {
+                val fileJsonObject = filesJsonArray.getJSONObject(it)
+
+                val fileLink = UrlHelper.getAttachmentLink(hostname, fileJsonObject.optString("_id"), fileJsonObject.optString("name"))
+
+                val attachmentTitle = AttachmentTitle.builder()
+                        .setTitle(fileJsonObject.optString("name"))
+                        .setLink(fileLink)
+                        .setDownloadLink(fileLink)
+                        .build()
+
+                val attachment = Attachment.builder()
+
+                val type = fileJsonObject.optString("type")
+                when {
+                    type.startsWith("image") -> attachment.setImageUrl(fileLink)
+                    type.startsWith("audio") -> attachment.setAudioUrl(fileLink)
+                    type.startsWith("video") -> attachment.setVideoUrl(fileLink)
+                }
+
+                attachment.setCollapsed(false)
+                        .setAttachmentTitle(attachmentTitle)
+                        .setTimestamp(getSafeTimestamp(fileJsonObject.optString("uploadedAt")))
+                        .build()
+            }
+
+            if (dataSet.isEmpty() && !hasItem) {
+                showEmptyViewMessage(context.getString(R.string.fragment_room_list_no_file_list_to_show))
+            } else {
+                if (dataSet.isNotEmpty()) {
+                    hasItem = true
+                    showFileList(dataSet, jsonObject.optString("total"))
+                }
+            }
+        } catch (exception: JSONException) {
+            showInvalidRequest()
+        }
+    }
+
     private fun handleMembersJson(json: String) {
         try {
             val jsonObject = JSONObject(json)
@@ -221,7 +285,7 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
                     showMemberList(dataSet, jsonObject.optString("total"))
                 }
             }
-        }catch (exception: JSONException) {
+        } catch (exception: JSONException) {
             showInvalidRequest()
         }
     }
@@ -236,6 +300,17 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
                 .build()
     }
 
+    private fun getLongTimestamp(timestamp: String): Long {
+        return if (timestamp.isNotBlank()) {
+            Timestamp.valueOf(getSafeTimestamp(timestamp)).time
+        } else {
+            0
+        }
+    }
+
+    private fun getSafeTimestamp(timestamp: String): String =
+            timestamp.replace("T", " ").replace("Z", "")
+
     private fun showPinnedMessageList(dataSet: ArrayList<Message>, total: String) {
         mainHandler.post {
             view.showWaitingView(false)
@@ -250,6 +325,13 @@ class RoomListPresenter(val context: Context, val view: RoomListContract.View) :
         }
     }
 
+    private fun showFileList(dataSet: ArrayList<Attachment>, total: String) {
+        mainHandler.post {
+            view.showWaitingView(false)
+            view.showFileList(dataSet, total)
+        }
+    }
+
     private fun showMemberList(dataSet: ArrayList<User>, total: String) {
         mainHandler.post {
             view.showWaitingView(false)

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

@@ -100,7 +100,7 @@ public class LoginFragment extends AbstractServerConfigFragment implements Login
             try {
               fragment = info.fragmentClass.newInstance();
             } catch (Exception exception) {
-              RCLog.w(exception, "failed to create new Fragment");
+              RCLog.w(exception, "failed to build new Fragment");
             }
             if (fragment != null) {
               Bundle args = new Bundle();

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

@@ -30,7 +30,7 @@ public class UserRegistrationDialogFragment extends DialogFragment {
   }
 
   /**
-   * create UserRegistrationDialogFragment with auto-detect email/username.
+   * build UserRegistrationDialogFragment with auto-detect email/username.
    */
   public static UserRegistrationDialogFragment create(String hostname,
                                                       String usernameOrEmail, String password) {
@@ -42,7 +42,7 @@ public class UserRegistrationDialogFragment extends DialogFragment {
   }
 
   /**
-   * create UserRegistrationDialogFragment.
+   * build UserRegistrationDialogFragment.
    */
   public static UserRegistrationDialogFragment create(String hostname,
                                                       String username, String email,

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

@@ -67,7 +67,7 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
   public SidebarMainFragment() {}
 
   /**
-   * create SidebarMainFragment with hostname.
+   * build SidebarMainFragment with hostname.
    */
   public static SidebarMainFragment create(String hostname) {
     Bundle args = new Bundle();

app/src/main/java/chat/rocket/android/helper/UrlHelper.kt

@@ -8,7 +8,8 @@ object UrlHelper {
      * @param uri The URI.
      * @return The URI whit no scheme (HTTP or HTTPS)
      */
-    fun removeUriScheme(uri: String) = uri.replace("http://", "").replace("https://", "")
+    fun removeUriScheme(uri: String) =
+            uri.replace("http://", "").replace("https://", "")
 
     /**
      * Returns the hostname with the security protocol (scheme) HTTPS.
@@ -17,7 +18,7 @@ object UrlHelper {
      * @return The hostname with the security protocol (scheme) HTTPS.
      */
     fun getSafeHostname(hostname: String): String =
-        "https://" + hostname.replace("http://", "").replace("https://", "")
+            "https://" + removeUriScheme(hostname)
 
     /**
      * Returns an URL with no spaces and inverted slashes.
@@ -25,17 +26,17 @@ object UrlHelper {
      * @param url The URL.
      * @return The URL with no spaces and inverted slashes.
      */
-    fun getUrl(url: String) =
+    fun getSafeUrl(url: String) =
             url.replace(" ", "%20").replace("\\", "")
 
     /**
-     * Returns an URL for a file.
+     * Returns an attachment link.
      *
-     * @param path The path to the file.
-     * @param userId The user ID.
-     * @param token The token.
-     * @return The URL for a file
+     * @param hostname The hostname.
+     * @param fileId The file ID.
+     * @param fileName The file name.
+     * @return The attachment link.
      */
-    fun getUrlForFile(path: String, userId: String, token: String): String =
-            "https://" + removeUriScheme(getUrl(path)) + "?rc_uid=$userId" + "&rc_token=$token"
+    fun getAttachmentLink(hostname: String, fileId: String, fileName: String): String =
+            getSafeUrl(getSafeHostname(hostname) + "/file-upload/" + fileId + "/" + fileName)
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/layouthelper/chatroom/MessageFormManager.kt

 package chat.rocket.android.layouthelper.chatroom
 
+import chat.rocket.android.widget.AbsoluteUrl
 import chat.rocket.android.widget.message.MessageFormLayout
+import chat.rocket.core.models.Message
 
 class MessageFormManager(private val messageFormLayout: MessageFormLayout, val callback: MessageFormLayout.ExtraActionSelectionClickListener) {
     private var sendMessageCallback: SendMessageCallback? = null
+    private var replyMarkDown: String = ""
 
     init {
         messageFormLayout.setExtraActionSelectionClickListener(callback)
@@ -31,8 +34,20 @@ class MessageFormManager(private val messageFormLayout: MessageFormLayout, val c
         messageFormLayout.isEnabled = enable
     }
 
+    fun setReply(absoluteUrl: AbsoluteUrl, replyMarkDown: String, message: Message) {
+        this.replyMarkDown = replyMarkDown
+        messageFormLayout.setReplyContent(absoluteUrl, message)
+        messageFormLayout.setReplyCancelListener({
+            this.replyMarkDown = ""
+            messageFormLayout.clearReplyContent()
+            messageFormLayout.hideKeyboard()
+        })
+    }
+
     private fun sendMessage(message: String) {
-        sendMessageCallback?.onSubmitText(message)
+        val finalMessage = if (replyMarkDown.isNotEmpty()) "$replyMarkDown $message" else message
+        replyMarkDown = ""
+        sendMessageCallback?.onSubmitText(finalMessage)
     }
 
     interface SendMessageCallback {

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

@@ -4,14 +4,19 @@ import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import chat.rocket.android.R
-import chat.rocket.android.widget.message.RocketChatMessageLayout
+import chat.rocket.android.helper.DateTime
+import chat.rocket.android.widget.message.RocketChatMessageAttachmentsLayout
+import chat.rocket.core.models.Attachment
+import kotlinx.android.synthetic.main.day.view.*
 import kotlinx.android.synthetic.main.item_room_file.view.*
+import java.sql.Timestamp
 
 /**
  * Created by Filipe de Lima Brito (filipedelimabrito@gmail.com) on 9/22/17.
  */
-class RoomFileListAdapter(private var dataSet: List<String>) : RecyclerView.Adapter<RoomFileListAdapter.ViewHolder>() {
+class RoomFileListAdapter(private var dataSet: List<Attachment>) : RecyclerView.Adapter<RoomFileListAdapter.ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(R.layout.item_room_file, parent, false)
@@ -19,17 +24,22 @@ class RoomFileListAdapter(private var dataSet: List<String>) : RecyclerView.Adap
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.fileNameLink.setText(dataSet[position])
+        val attachment = dataSet[position]
+
+        holder.newDay.text = DateTime.fromEpocMs(Timestamp.valueOf(attachment.timestamp).time, DateTime.Format.DATE)
+        holder.attachment.appendAttachmentView(attachment, true, false)
     }
 
     override fun getItemCount(): Int = dataSet.size
 
-    fun setDataSet(dataSet: List<String>) {
-        this.dataSet = dataSet
-        notifyDataSetChanged()
+    fun addDataSet(dataSet: List<Attachment>) {
+        val previousDataSetSize = this.dataSet.size
+        this.dataSet += dataSet
+        notifyItemRangeInserted(previousDataSetSize, dataSet.size)
     }
 
     class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val fileNameLink : RocketChatMessageLayout = itemView.fileLink
+        val newDay: TextView = itemView.day
+        val attachment: RocketChatMessageAttachmentsLayout = itemView.attachment
     }
 }
\ No newline at end of file

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

@@ -23,14 +23,14 @@ public class ChannelRoomListHeader implements RoomListHeader {
 
   @Override
   public boolean owns(RoomSidebar roomSidebar) {
-    return roomSidebar.getType().equals(Room.TYPE_CHANNEL) || roomSidebar.getType().equals(Room.TYPE_PRIVATE);
+    return roomSidebar.getType().equals(Room.TYPE_CHANNEL) || roomSidebar.getType().equals(Room.TYPE_GROUP);
   }
 
   @Override
   public boolean shouldShow(@NonNull List<RoomSidebar> roomSidebarList) {
     for (RoomSidebar roomSidebar: roomSidebarList) {
       if ((roomSidebar.getType().equals(Room.TYPE_CHANNEL)
-              || roomSidebar.getType().equals(Room.TYPE_PRIVATE))
+              || roomSidebar.getType().equals(Room.TYPE_GROUP))
               && !roomSidebar.isAlert()
               && !roomSidebar.isFavorite()) {
         return true;

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

@@ -2,6 +2,7 @@ package chat.rocket.android.layouthelper.chatroom.roomlist;
 
 import android.support.v7.widget.RecyclerView;
 
+import chat.rocket.android.helper.Logger;
 import chat.rocket.android.widget.internal.RoomListItemView;
 import chat.rocket.core.models.Room;
 import chat.rocket.core.models.RoomSidebar;
@@ -92,14 +93,16 @@ public class RoomListItemViewHolder extends RecyclerView.ViewHolder {
       case Room.TYPE_CHANNEL:
         itemView.showPublicChannelIcon();
         break;
-      case Room.TYPE_PRIVATE:
+      case Room.TYPE_GROUP:
         itemView.showPrivateChannelIcon();
         break;
       case Room.TYPE_LIVECHAT:
         itemView.showLivechatChannelIcon();
         break;
-      default:
-        throw new AssertionError("Room type doesn't satisfies the method documentation. Room type is:" + roomType);
+      default: {
+        itemView.showPrivateChannelIcon();
+        Logger.report(new AssertionError("Room type doesn't satisfies the method documentation. Room type is:" + roomType));
+      }
     }
   }
 }
\ No newline at end of file

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

@@ -88,7 +88,7 @@ public class PushNotificationHandler implements PushConstants {
     if ((message != null && message.length() != 0) ||
         (title != null && title.length() != 0)) {
 
-      Log.d(LOG_TAG, "create notification");
+      Log.d(LOG_TAG, "build notification");
 
       if (title == null || title.isEmpty()) {
         extras.putString(TITLE, getAppName(context));
@@ -191,7 +191,7 @@ public class PushNotificationHandler implements PushConstants {
 
   private void createActions(Context context, Bundle extras, NotificationCompat.Builder builder,
                              Resources resources, String packageName, int notId) {
-    Log.d(LOG_TAG, "create actions: with in-line");
+    Log.d(LOG_TAG, "build actions: with in-line");
     String actions = extras.getString(ACTIONS);
     if (actions == null) {
       return;
@@ -256,7 +256,7 @@ public class PushNotificationHandler implements PushConstants {
 
         RemoteInput remoteInput;
         if (inline) {
-          Log.d(LOG_TAG, "create remote input");
+          Log.d(LOG_TAG, "build remote input");
           String replyLabel = "Enter your reply here";
           remoteInput = new RemoteInput.Builder(INLINE_REPLY)
               .setLabel(replyLabel)
@@ -287,7 +287,7 @@ public class PushNotificationHandler implements PushConstants {
   @RequiresApi(api = Build.VERSION_CODES.KITKAT_WATCH)
   private void createActions(Context context, Bundle extras, Notification.Builder builder,
                              Resources resources, String packageName, int notId) {
-    Log.d(LOG_TAG, "create actions: with in-line");
+    Log.d(LOG_TAG, "build actions: with in-line");
     String actions = extras.getString(ACTIONS);
     if (actions == null) {
       return;
@@ -352,7 +352,7 @@ public class PushNotificationHandler implements PushConstants {
 
         android.app.RemoteInput remoteInput;
         if (inline) {
-          Log.d(LOG_TAG, "create remote input");
+          Log.d(LOG_TAG, "build remote input");
           String replyLabel = "Enter your reply here";
           remoteInput = new android.app.RemoteInput.Builder(INLINE_REPLY)
                   .setLabel(replyLabel)

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

@@ -109,7 +109,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
   }
 
   /**
-   * create new Thread.
+   * build new Thread.
    */
   @DebugLog
   public static Single<RocketChatWebSocketThread> getStarted(Context appContext, String hostname) {
@@ -241,11 +241,11 @@ public class RocketChatWebSocketThread extends HandlerThread {
 
   private Single<Boolean> prepareDDPClient() {
     // TODO: temporarily replaced checkIfConnectionAlive() call for this single checking if ddpClient is
-    // null or not. In case it is, create a new client, otherwise just keep connecting with existing one.
+    // null or not. In case it is, build a new client, otherwise just keep connecting with existing one.
     return Single.just(ddpClient != null)
         .doOnSuccess(alive -> {
           if (!alive) {
-            RCLog.d("DDPClient#create");
+            RCLog.d("DDPClient#build");
             ddpClient = DDPClientWrapper.create(hostname);
           }
         });
@@ -392,7 +392,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
               )
       );
     } else {
-      // if we don't have any session then just create the observers and register normally
+      // if we don't have any session then just build the observers and register normally
       createObserversAndRegister();
     }
   }

app/src/main/java/chat/rocket/android/service/internal/AbstractRocketChatCacheObserver.java

@@ -4,14 +4,13 @@ import android.content.Context;
 
 import com.hadisatrio.optional.Optional;
 
-import chat.rocket.android.log.RCLog;
-import io.reactivex.disposables.CompositeDisposable;
-
 import chat.rocket.android.RocketChatCache;
 import chat.rocket.android.helper.TextUtils;
-import chat.rocket.persistence.realm.models.ddp.RealmRoom;
-import chat.rocket.persistence.realm.RealmHelper;
+import chat.rocket.android.log.RCLog;
 import chat.rocket.android.service.Registrable;
+import chat.rocket.persistence.realm.RealmHelper;
+import chat.rocket.persistence.realm.models.ddp.RealmRoom;
+import io.reactivex.disposables.CompositeDisposable;
 
 public abstract class AbstractRocketChatCacheObserver implements Registrable {
   private final Context context;
@@ -50,6 +49,7 @@ public abstract class AbstractRocketChatCacheObserver implements Registrable {
     compositeDisposable.add(
         new RocketChatCache(context)
             .getSelectedRoomIdPublisher()
+            .filter(Optional::isPresent)
             .map(Optional::get)
             .subscribe(this::updateRoomIdWith, RCLog::e)
     );

app/src/main/res/layout/item_room_file.xml

@@ -3,20 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/margin_16">
+    android:paddingRight="@dimen/margin_16"
+    android:paddingStart="@dimen/margin_16"
+    android:paddingLeft="@dimen/margin_16"
+    android:paddingEnd="@dimen/margin_16"
+    android:paddingBottom="@dimen/margin_16">
 
-    <chat.rocket.android.widget.message.RocketChatMessageLayout
-        android:id="@+id/fileLink"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/margin_16"
-        android:layout_marginStart="@dimen/margin_16" />
+    <include
+        android:id="@+id/dayLayout"
+        layout="@layout/day" />
 
-    <View
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_weight="1"
-        android:background="@color/colorDivider"
-        android:layout_marginTop="@dimen/margin_8"
-        app:layout_constraintTop_toBottomOf="@+id/fileLink" />
+    <chat.rocket.android.widget.message.RocketChatMessageAttachmentsLayout
+        android:id="@+id/attachment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_16"
+        app:layout_constraintTop_toBottomOf="@+id/dayLayout" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

app/src/main/res/menu/menu_room.xml

@@ -10,9 +10,9 @@
         android:title="@string/menu_favorite_messages"
         app:showAsAction="never" />
 
-    <!--<item android:id="@+id/action_file_list"-->
-        <!--android:title="@string/menu_file_list"-->
-        <!--app:showAsAction="never" />-->
+    <item android:id="@+id/action_file_list"
+        android:title="@string/menu_file_list"
+        app:showAsAction="never" />
 
     <item android:id="@+id/action_member_list"
         android:title="@string/menu_member_list"

app/src/test/kotlin/chat/rocket/android/helper/UrlHelperTest.kt

@@ -21,20 +21,17 @@ class UrlHelperTest {
 
     @Test
     fun getUrlTest() {
-        assertEquals("https://demo.rocket.chat/GENERAL/file.txt", UrlHelper.getUrl("https://demo.rocket.chat/GENERAL/file.txt"))
-        assertEquals("http://demo.rocket.chat/GENERAL/file.txt", UrlHelper.getUrl("http://demo.rocket.chat/GENERAL/file.txt"))
-        assertEquals("demo.rocket.chat/GENERAL/file.txt", UrlHelper.getUrl("demo.rocket.chat/GENERAL/file.txt"))
-        assertEquals("demo.rocket.chat/GENERAL/a%20sample%20file.txt", UrlHelper.getUrl("demo.rocket.chat/GENERAL/a sample file.txt"))
-        assertEquals("demo.rocket.chat/GENERAL/file.txt", UrlHelper.getUrl("demo.rocket.chat\\/GENERAL\\/file.txt"))
+        assertEquals("https://demo.rocket.chat/GENERAL/file.txt", UrlHelper.getSafeUrl("https://demo.rocket.chat/GENERAL/file.txt"))
+        assertEquals("http://demo.rocket.chat/GENERAL/file.txt", UrlHelper.getSafeUrl("http://demo.rocket.chat/GENERAL/file.txt"))
+        assertEquals("demo.rocket.chat/GENERAL/file.txt", UrlHelper.getSafeUrl("demo.rocket.chat/GENERAL/file.txt"))
+        assertEquals("demo.rocket.chat/GENERAL/a%20sample%20file.txt", UrlHelper.getSafeUrl("demo.rocket.chat/GENERAL/a sample file.txt"))
+        assertEquals("demo.rocket.chat/GENERAL/file.txt", UrlHelper.getSafeUrl("demo.rocket.chat\\/GENERAL\\/file.txt"))
     }
 
     @Test
-    fun getUrlForFileTest() {
-        assertEquals("https://demo.rocket.chat/GENERAL/file.txt?rc_uid=userId&rc_token=token", UrlHelper.getUrlForFile("https://demo.rocket.chat/GENERAL/file.txt","userId", "token"))
-        assertEquals("https://demo.rocket.chat/GENERAL/file.txt?rc_uid=userId&rc_token=token", UrlHelper.getUrlForFile("http://demo.rocket.chat/GENERAL/file.txt","userId", "token"))
-        assertEquals("https://demo.rocket.chat/GENERAL/file.txt?rc_uid=userId&rc_token=token", UrlHelper.getUrlForFile("demo.rocket.chat/GENERAL/file.txt","userId", "token"))
-
-        assertEquals("https://demo.rocket.chat/GENERAL/a%20sample%20file.txt?rc_uid=userId&rc_token=token", UrlHelper.getUrlForFile("demo.rocket.chat/GENERAL/a sample file.txt","userId", "token"))
-        assertEquals("https://demo.rocket.chat/GENERAL/file.txt?rc_uid=userId&rc_token=token", UrlHelper.getUrlForFile("demo.rocket.chat\\/GENERAL\\/file.txt","userId", "token"))
+    fun getAttachmentLinkTest() {
+        assertEquals("https://demo.rocket.chat/file-upload/aFileId/aFileName.txt", UrlHelper.getAttachmentLink("https://demo.rocket.chat", "aFileId", "aFileName.txt"))
+        assertEquals("https://demo.rocket.chat/file-upload/aFileId/aFileName.txt", UrlHelper.getAttachmentLink("http://demo.rocket.chat", "aFileId", "aFileName.txt"))
+        assertEquals("https://demo.rocket.chat/file-upload/aFileId/aFileName.txt", UrlHelper.getAttachmentLink("demo.rocket.chat", "aFileId", "aFileName.txt"))
     }
 }
\ No newline at end of file

build.gradle

@@ -20,10 +20,7 @@ ext {
     compileSdkVersion = 26
     targetSdkVersion = 26
     buildToolsVersion = "26.0.0"
-    supportLibraryVersion = "25.4.0"
-    constraintLayoutVersion = "1.0.2"
-    kotlinVersion = "1.1.4-3"
-    okHttpVersion = "3.9.0"
+
 }
 
 task clean(type: Delete) {

dependencies.gradle

 ext {
     preDexLibs = "true" != System.getenv("CI")
+    supportLibraryVersion = "25.4.0"
+    constraintLayoutVersion = "1.0.2"
+    kotlinVersion = "1.1.4-2"
+    okHttpVersion = "3.9.0"
+    rxbindingVersion = '2.0.0'
+    supportDependencies = [
+            designSupportLibrary: "com.android.support:design:${supportLibraryVersion}",
+            annotation          : "com.android.support:support-annotations:${supportLibraryVersion}",
+            constrainLayout     : "com.android.support.constraint:constraint-layout:${constraintLayoutVersion}",
+            kotlin              : "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}",
+            cardView            : "com.android.support:cardview-v7:${supportLibraryVersion}",
+    ]
+    extraDependencies = [
+            okHTTP         : "com.squareup.okhttp3:okhttp:3.8.0",
+            rxJava         : "io.reactivex.rxjava2:rxjava:2.1.0",
+            boltTask       : "com.parse.bolts:bolts-tasks:1.4.0",
+            textDrawable   : "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1",
+            rxAndroid      : "io.reactivex.rxjava2:rxandroid:2.0.1"
+    ]
+    rxbindingDependencies = [
+            rxBinding          : "com.jakewharton.rxbinding2:rxbinding:${rxbindingVersion}",
+            rxBindingSupport   : "com.jakewharton.rxbinding2:rxbinding-support-v4:${rxbindingVersion}",
+            rxBindingAppcompact: "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:${rxbindingVersion}",
+    ]
 }
-
 subprojects {
     project.plugins.whenPluginAdded { plugin ->
         if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
@@ -10,4 +33,5 @@ subprojects {
             project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
         }
     }
-}
+}
\ No newline at end of file
+

log-wrapper/build.gradle

@@ -8,11 +8,9 @@ buildscript {
         classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
-
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion

persistence-realm/build.gradle

@@ -44,30 +44,20 @@ android {
         androidTest.java.srcDirs += 'src/androidTest/kotlin'
     }
 }
-
 dependencies {
     compile project(':log-wrapper')
     compile project(':rocket-chat-core')
-
-    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
-
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
+    compile extraDependencies.rxJava
+    compile extraDependencies.boltTask
+    compile supportDependencies.annotation
+    compile supportDependencies.designSupportLibrary
+    compile supportDependencies.kotlin
+    compile extraDependencies.rxAndroid
     testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
-
     testCompile 'org.json:json:20170516'
     testCompile 'org.skyscreamer:jsonassert:1.5.0'
-
-    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-
     compile 'com.github.akarnokd:rxjava2-interop:0.10.0'
-
-    compile 'com.parse.bolts:bolts-tasks:1.4.0'
-
     provided 'com.hadisatrio:Optional:v1.0.1'
-
     testCompile 'junit:junit:4.12'
 }

rocket-chat-android-widgets/build.gradle

@@ -12,7 +12,6 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
     }
 }
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -43,41 +42,25 @@ ext {
     frescoVersion = '1.4.0'
     rxbindingVersion = '2.0.0'
 }
-
 dependencies {
     compile project(':rocket-chat-core')
-
-    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:recyclerview-v7:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:cardview-v7:$rootProject.ext.supportLibraryVersion"
+    compile extraDependencies.okHTTP;
+    compile supportDependencies.annotation
+    compile supportDependencies.cardView
+    compile supportDependencies.designSupportLibrary
+    compile supportDependencies.constrainLayout
+    compile supportDependencies.kotlin
+    compile extraDependencies.textDrawable
+    compile rxbindingDependencies.rxBinding
+    compile rxbindingDependencies.rxBindingSupport
     compile "com.android.support:support-v13:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
-
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
-
     compile 'org.nibor.autolink:autolink:0.6.0'
-
-    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-
-    compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
-
     compile 'com.github.yusukeiwaki.android-widget:widget-fontawesome:0.0.1'
-
     compile "com.facebook.fresco:fresco:$frescoVersion"
-    compile "com.facebook.fresco:animated-gif:$frescoVersion"
-    compile "com.facebook.fresco:animated-webp:$frescoVersion"
-    compile "com.facebook.fresco:webpsupport:$frescoVersion"
     compile "com.facebook.fresco:imagepipeline-okhttp3:$frescoVersion"
-
     compile 'com.caverock:androidsvg:1.2.1'
-
-    compile "com.jakewharton.rxbinding2:rxbinding:$rxbindingVersion"
-    compile "com.jakewharton.rxbinding2:rxbinding-support-v4:$rxbindingVersion"
-
     testCompile 'junit:junit:4.12'
     testCompile "org.mockito:mockito-core:2.7.19"
 }

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

@@ -6,6 +6,7 @@ import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import chat.rocket.android.widget.AbsoluteUrl
 import com.amulyakhare.textdrawable.TextDrawable
+
 import java.net.URLEncoder
 
 /**

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

@@ -6,7 +6,9 @@ import android.support.graphics.drawable.VectorDrawableCompat
 import chat.rocket.android.widget.R
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.drawable.ProgressBarDrawable
+import com.facebook.drawee.drawable.ScalingUtils
 import com.facebook.drawee.generic.GenericDraweeHierarchy
+import com.facebook.drawee.generic.RoundingParams
 import com.facebook.drawee.view.SimpleDraweeView
 
 object FrescoHelper {
@@ -31,6 +33,8 @@ object FrescoHelper {
         val hierarchy: GenericDraweeHierarchy = draweeView.hierarchy
         hierarchy.setPlaceholderImage(VectorDrawableCompat.create(draweeView.resources, R.drawable.image_dummy, null))
         hierarchy.setFailureImage(VectorDrawableCompat.create(draweeView.resources, R.drawable.image_error, null))
+        hierarchy.roundingParams = RoundingParams().setCornersRadii(5F, 5F, 5F, 5F)
+        hierarchy.actualImageScaleType = ScalingUtils.ScaleType.FIT_CENTER
         hierarchy.setProgressBarImage(ProgressBarDrawable())
 
         val controller = Fresco.newDraweeControllerBuilder()

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

@@ -51,7 +51,7 @@ public class MarkDown {
 
 
   private static final Pattern LINK_PATTERN = Pattern.compile(
-      "\\[([^\\]]+)\\]\\(((?:http|https):\\/\\/[^\\)]+)\\)", Pattern.MULTILINE);
+          "\\[(.*?)\\]\\(((https?):\\/\\/[-a-zA-Z0-9+&@#\\/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#\\/%=~_|]?)\\)", Pattern.MULTILINE);
   private static void highlightLink1(SpannableString inputText) {
     final Matcher matcher = LINK_PATTERN.matcher(inputText);
     while (matcher.find()) {

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

@@ -4,6 +4,7 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v13.view.inputmethod.InputContentInfoCompat;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -15,10 +16,20 @@ import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
+import com.facebook.drawee.view.SimpleDraweeView;
+
+import chat.rocket.android.widget.AbsoluteUrl;
 import chat.rocket.android.widget.R;
 import chat.rocket.android.widget.helper.DebouncingOnClickListener;
+import chat.rocket.android.widget.helper.FrescoHelper;
+import chat.rocket.core.models.Attachment;
+import chat.rocket.core.models.AttachmentTitle;
+import chat.rocket.core.models.Message;
 
 public class MessageFormLayout extends LinearLayout {
 
@@ -27,6 +38,12 @@ public class MessageFormLayout extends LinearLayout {
   private ImageButton attachButton;
   private ImageButton sendButton;
 
+  private RelativeLayout replyBar;
+  private ImageView replyCancelButton;
+  private SimpleDraweeView replyThumb;
+  private TextView replyMessageText;
+  private TextView replyUsernameText;
+
   private ExtraActionSelectionClickListener extraActionSelectionClickListener;
   private SubmitTextListener submitTextListener;
   private ImageKeyboardEditText.OnCommitContentListener listener;
@@ -65,6 +82,12 @@ public class MessageFormLayout extends LinearLayout {
       }
     });
 
+    replyCancelButton = composer.findViewById(R.id.reply_cancel);
+    replyMessageText = composer.findViewById(R.id.reply_message);
+    replyUsernameText = composer.findViewById(R.id.reply_username);
+    replyThumb = composer.findViewById(R.id.reply_thumb);
+    replyBar = composer.findViewById(R.id.reply_bar);
+
     sendButton = composer.findViewById(R.id.button_send);
 
     sendButton.setOnClickListener(new DebouncingOnClickListener() {
@@ -73,6 +96,7 @@ public class MessageFormLayout extends LinearLayout {
         String messageText = getText();
         if (messageText.length() > 0 && submitTextListener != null) {
           submitTextListener.onSubmitText(messageText);
+          clearReplyContent();
         }
       }
     });
@@ -118,6 +142,20 @@ public class MessageFormLayout extends LinearLayout {
     addView(composer);
   }
 
+  public void clearReplyContent() {
+    replyBar.setVisibility(View.GONE);
+    replyThumb.setVisibility(View.GONE);
+    replyMessageText.setText("");
+    replyUsernameText.setText("");
+  }
+  public void showReplyThumb() {
+    replyThumb.setVisibility(View.VISIBLE);
+  }
+
+  public void setReplyCancelListener(OnClickListener onClickListener) {
+    replyCancelButton.setOnClickListener(onClickListener);
+  }
+
   public EditText getEditText() {
     return (EditText) composer.findViewById(R.id.editor);
   }
@@ -154,10 +192,7 @@ public class MessageFormLayout extends LinearLayout {
         if (text.length() > 0) {
           editor.setSelection(text.length());
 
-          InputMethodManager inputMethodManager = (InputMethodManager) editor.getContext()
-              .getSystemService(Context.INPUT_METHOD_SERVICE);
-          editor.requestFocus();
-          inputMethodManager.showSoftInput(editor, 0);
+          requestFocusAndShowKeyboard();
         }
       }
     });
@@ -173,6 +208,61 @@ public class MessageFormLayout extends LinearLayout {
     this.listener = listener;
   }
 
+  public void setReplyContent(@NonNull AbsoluteUrl absoluteUrl, @NonNull Message message) {
+    String text = message.getMessage();
+    replyUsernameText.setText(message.getUser().getUsername());
+    if (!TextUtils.isEmpty(text)) {
+      replyMessageText.setText(text);
+    } else {
+      if (message.getAttachments() != null && message.getAttachments().size() > 0) {
+        Attachment attachment = message.getAttachments().get(0);
+        AttachmentTitle attachmentTitle = attachment.getAttachmentTitle();
+        String imageUrl = null;
+        if (attachment.getImageUrl() != null) {
+          imageUrl = absoluteUrl.from(attachment.getImageUrl());
+        }
+        if (attachmentTitle != null) {
+          text = attachmentTitle.getTitle();
+        }
+        if (TextUtils.isEmpty(text)) {
+          text = "Unknown";
+        }
+        if (imageUrl != null) {
+          FrescoHelper.INSTANCE.loadImageWithCustomization(replyThumb, imageUrl);
+          showReplyThumb();
+        }
+        replyMessageText.setText(text);
+      }
+    }
+    replyBar.setVisibility(View.VISIBLE);
+    requestFocusAndShowKeyboard();
+  }
+
+  public void hideKeyboard() {
+    final EditText editor = getEditor();
+    editor.post(new Runnable() {
+      @Override
+      public void run() {
+        InputMethodManager inputMethodManager = (InputMethodManager) editor.getContext()
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+        inputMethodManager.hideSoftInputFromWindow(editor.getWindowToken(), 0);
+      }
+    });
+  }
+
+  private void requestFocusAndShowKeyboard() {
+    final EditText editor = getEditor();
+    editor.post(new Runnable() {
+      @Override
+      public void run() {
+        InputMethodManager inputMethodManager = (InputMethodManager) editor.getContext()
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+        editor.requestFocus();
+        inputMethodManager.showSoftInput(editor, 0);
+      }
+    });
+  }
+
   private void animateHide(final View view) {
     view.animate().scaleX(0).scaleY(0).setDuration(150).withEndAction(new Runnable() {
       @Override

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

@@ -71,21 +71,21 @@ public class RocketChatMessageAttachmentsLayout extends LinearLayout {
       return;
     }
     this.attachments = attachments;
-    removeAllViews();
 
     for (int i = 0, size = attachments.size(); i < size; i++) {
-      appendAttachmentView(attachments.get(i), autoloadImages);
+      appendAttachmentView(attachments.get(i), autoloadImages, true);
     }
   }
 
-  private void appendAttachmentView(Attachment attachment, boolean autoloadImages) {
+  public void appendAttachmentView(Attachment attachment, boolean autoloadImages, boolean showAttachmentStrip) {
     if (attachment == null) {
       return;
     }
 
+    removeAllViews();
     View attachmentView = inflater.inflate(R.layout.message_inline_attachment, this, false);
 
-    colorizeAttachmentBar(attachment, attachmentView);
+    colorizeAttachmentBar(attachment, attachmentView, showAttachmentStrip);
     showAuthorAttachment(attachment, attachmentView);
     showTitleAttachment(attachment, attachmentView);
     showReferenceAttachment(attachment, attachmentView);
@@ -97,19 +97,23 @@ public class RocketChatMessageAttachmentsLayout extends LinearLayout {
     addView(attachmentView);
   }
 
-  private void colorizeAttachmentBar(Attachment attachment, View attachmentView) {
+  private void colorizeAttachmentBar(Attachment attachment, View attachmentView, boolean showAttachmentStrip) {
     final View attachmentStrip = attachmentView.findViewById(R.id.attachment_strip);
 
-    final String colorString = attachment.getColor();
-    if (TextUtils.isEmpty(colorString)) {
-      attachmentStrip.setBackgroundResource(R.color.inline_attachment_quote_line);
-      return;
-    }
+    if (showAttachmentStrip) {
+      final String colorString = attachment.getColor();
+      if (TextUtils.isEmpty(colorString)) {
+        attachmentStrip.setBackgroundResource(R.color.inline_attachment_quote_line);
+        return;
+      }
 
-    try {
-      attachmentStrip.setBackgroundColor(Color.parseColor(colorString));
-    } catch (Exception e) {
-      attachmentStrip.setBackgroundResource(R.color.inline_attachment_quote_line);
+      try {
+        attachmentStrip.setBackgroundColor(Color.parseColor(colorString));
+      } catch (Exception e) {
+        attachmentStrip.setBackgroundResource(R.color.inline_attachment_quote_line);
+      }
+    } else {
+      attachmentStrip.setVisibility(GONE);
     }
   }
 
@@ -204,8 +208,7 @@ public class RocketChatMessageAttachmentsLayout extends LinearLayout {
     }
   }
 
-  private void showImageAttachment(Attachment attachment, View attachmentView,
-                                   boolean autoloadImages) {
+  private void showImageAttachment(Attachment attachment, View attachmentView, boolean autoloadImages) {
     final View imageContainer = attachmentView.findViewById(R.id.image_container);
     if (attachment.getImageUrl() == null) {
       imageContainer.setVisibility(GONE);

rocket-chat-android-widgets/src/main/res/drawable/ic_close.xml

+<!-- drawable/close.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
+</vector>
\ No newline at end of file

rocket-chat-android-widgets/src/main/res/drawable/ic_reply.xml

+<!-- drawable/reply.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#000" android:pathData="M10,9V5L3,12L10,19V14.9C15,14.9 18.5,16.5 21,20C20,15 17,10 10,9Z" />
+</vector>
\ No newline at end of file

rocket-chat-android-widgets/src/main/res/drawable/inline_attachment_background.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
+
     <stroke
-            android:color="@color/inline_attachment_box_outline"
-            android:width="1dp"/>
-    <solid android:color="@color/inline_attachment_box_background"/>
-    <corners android:radius="2dp"/>
+        android:width="1dp"
+        android:color="@color/inline_attachment_box_outline" />
+
+    <solid
+        android:color="@color/inline_attachment_box_background" />
+
+    <corners
+        android:radius="2dp" />
 </shape>
\ No newline at end of file

rocket-chat-android-widgets/src/main/res/layout/message_composer.xml

 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:minHeight="48dp"
-  android:background="@drawable/top_shadow"
-  tools:context="chat.rocket.android.widget.message.MessageFormLayout">
-
-    <chat.rocket.android.widget.message.ImageKeyboardEditText
-      android:id="@+id/editor"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="16dp"
-      android:layout_marginStart="16dp"
-      android:inputType="textCapSentences|textMultiLine"
-      android:hint="@string/message_composer_message_hint"
-      android:textSize="14sp"
-      android:minLines="1"
-      android:maxLines="4"
-      android:background="@null"
-      app:layout_constraintTop_toTopOf="parent"
-      app:layout_constraintLeft_toLeftOf="parent"
-      app:layout_constraintRight_toLeftOf="@+id/container"
-      app:layout_constraintBottom_toBottomOf="parent"/>
-
-    <FrameLayout
-      android:id="@+id/container"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="16dp"
-      android:layout_marginStart="16dp"
-      android:layout_marginRight="16dp"
-      android:layout_marginEnd="16dp"
-      app:layout_constraintTop_toTopOf="@+id/editor"
-      app:layout_constraintRight_toRightOf="parent"
-      app:layout_constraintLeft_toRightOf="@+id/editor"
-      app:layout_constraintBottom_toBottomOf="@+id/editor">
-
-        <ImageButton
-          android:id="@+id/button_attach"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:tint="@color/color_icon_composer"
-          app:srcCompat="@drawable/ic_attach_file_black_24dp"
-          android:background="?attr/selectableItemBackgroundBorderless"/>
-
-        <ImageButton
-          android:id="@+id/button_send"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:tint="@color/color_accent"
-          app:srcCompat="@drawable/ic_send_black_24dp"
-          android:background="?attr/selectableItemBackgroundBorderless"/>
-    </FrameLayout>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:fresco="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/top_shadow"
+    android:minHeight="48dp"
+    tools:context="chat.rocket.android.widget.message.MessageFormLayout">
+
+    <RelativeLayout
+        android:id="@+id/reply_bar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/keyboard_container"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:layout_editor_absoluteX="8dp"
+        tools:layout_editor_absoluteY="8dp"
+        tools:visibility="visible">
+
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/reply_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:adjustViewBounds="true"
+            app:srcCompat="@drawable/ic_reply"
+            app:tint="@color/color_accent" />
+
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/reply_cancel"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:adjustViewBounds="true"
+            app:srcCompat="@drawable/ic_close"
+            app:tint="@color/color_icon_composer" />
+
+        <TextView
+            android:id="@+id/reply_username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@id/reply_username"
+            android:layout_toLeftOf="@+id/reply_cancel"
+            android:layout_toStartOf="@id/reply_cancel"
+            android:layout_toRightOf="@+id/reply_thumb"
+            android:layout_toEndOf="@+id/reply_thumb"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@color/color_accent"
+            android:textStyle="bold"
+            tools:text="jane.doe" />
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/reply_thumb"
+            android:layout_width="32dp"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
+            android:layout_toRightOf="@+id/reply_icon"
+            android:layout_toEndOf="@+id/reply_icon"
+            android:layout_alignBottom="@+id/reply_message"
+            android:layout_alignTop="@+id/reply_username"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            fresco:actualImageScaleType="fitCenter" />
+
+        <TextView
+            android:id="@+id/reply_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/reply_username"
+            android:layout_toLeftOf="@+id/reply_cancel"
+            android:layout_toStartOf="@id/reply_cancel"
+            android:layout_toRightOf="@+id/reply_thumb"
+            android:layout_toEndOf="@+id/reply_thumb"
+            android:ellipsize="end"
+            android:maxLines="1"
+            tools:text="Message" />
+
+    </RelativeLayout>
+
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/keyboard_container"
+        android:layout_width="0dp"
+        android:layout_height="48dp"
+        android:background="@drawable/top_shadow"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/reply_bar">
+
+        <chat.rocket.android.widget.message.ImageKeyboardEditText
+            android:id="@+id/editor"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:background="@null"
+            android:hint="@string/message_composer_message_hint"
+            android:inputType="textCapSentences|textMultiLine"
+            android:maxLines="4"
+            android:minLines="1"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/container"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <FrameLayout
+            android:id="@+id/container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
+            app:layout_constraintBottom_toBottomOf="@+id/editor"
+            app:layout_constraintLeft_toRightOf="@+id/editor"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/editor">
+
+            <ImageButton
+                android:id="@+id/button_attach"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:tint="@color/color_icon_composer"
+                app:srcCompat="@drawable/ic_attach_file_black_24dp" />
+
+            <ImageButton
+                android:id="@+id/button_send"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:tint="@color/color_accent"
+                app:srcCompat="@drawable/ic_send_black_24dp" />
+        </FrameLayout>
+    </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

rocket-chat-android-widgets/src/main/res/layout/message_inline_attachment.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:fresco="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp">
+    xmlns:fresco="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingBottom="4dp"
+    android:paddingTop="4dp">
 
     <View
-            android:id="@+id/attachment_strip"
-            android:layout_width="3dp"
-            android:layout_height="match_parent"
-            android:layout_marginRight="5dp"
-            android:background="@color/inline_attachment_quote_line" />
+        android:id="@+id/attachment_strip"
+        android:layout_width="3dp"
+        android:layout_height="match_parent"
+        android:layout_marginEnd="5dp"
+        android:layout_marginRight="5dp"
+        android:background="@color/inline_attachment_quote_line" />
 
     <LinearLayout
-            android:id="@+id/attachment_content"
-            android:layout_width="0px"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
+        android:id="@+id/attachment_content"
+        android:layout_width="0px"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
         <LinearLayout
-                android:id="@+id/author_box"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:layout_marginBottom="8dp">
+            android:id="@+id/author_box"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <com.facebook.drawee.view.SimpleDraweeView
-                    android:id="@+id/author_icon"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    tools:src="@drawable/circle_black"
-                    fresco:actualImageScaleType="fitCenter" />
+                android:id="@+id/author_icon"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                fresco:actualImageScaleType="fitCenter"
+                tools:src="@drawable/circle_black" />
 
             <android.support.v4.widget.Space
-                    android:layout_width="8dp"
-                    android:layout_height="8dp" />
+                android:layout_width="8dp"
+                android:layout_height="8dp" />
 
             <TextView
-                    android:id="@+id/author_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/TextAppearance.RocketChat.MessageAttachment.Title.Link"
-                    tools:text="Bradley Hilton" />
+                android:id="@+id/author_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextAppearance.RocketChat.MessageAttachment.Title.Link"
+                tools:text="Bradley Hilton" />
 
             <android.support.v4.widget.Space
-                    android:layout_width="8dp"
-                    android:layout_height="8dp" />
+                android:layout_width="8dp"
+                android:layout_height="8dp" />
 
             <TextView
-                    android:id="@+id/timestamp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="14:53" />
+                android:id="@+id/timestamp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="14:53" />
 
         </LinearLayout>
 
         <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:textAppearance="@style/TextAppearance.RocketChat.MessageAttachment.Title"
-                android:background="?attr/selectableItemBackground"
-                tools:text="Attachment Example" />
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="?attr/selectableItemBackground"
+            android:textAppearance="@style/TextAppearance.RocketChat.MessageAttachment.Title"
+            tools:text="Attachment Example" />
 
         <LinearLayout
-                android:id="@+id/ref_box"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:layout_marginBottom="8dp">
+            android:id="@+id/ref_box"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <com.facebook.drawee.view.SimpleDraweeView
-                    android:id="@+id/thumb"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    tools:src="@drawable/circle_black"
-                    fresco:actualImageScaleType="fitCenter" />
+                android:id="@+id/thumb"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                fresco:actualImageScaleType="fitCenter"
+                tools:src="@drawable/circle_black" />
 
             <android.support.v4.widget.Space
-                    android:layout_width="8dp"
-                    android:layout_height="8dp" />
+                android:layout_width="8dp"
+                android:layout_height="8dp" />
 
             <TextView
-                    android:id="@+id/text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="Bradley Hilton" />
-
+                android:id="@+id/text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="Bradley Hilton" />
         </LinearLayout>
 
         <FrameLayout
-                android:id="@+id/image_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:id="@+id/image_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="8dp"
+            android:padding="5dp"
+            android:background="@drawable/inline_attachment_background">
 
             <com.facebook.drawee.view.SimpleDraweeView
-                    android:id="@+id/image"
-                    android:layout_width="match_parent"
-                    android:layout_height="150dp"
-                    android:layout_marginBottom="8dp"
-                    fresco:actualImageScaleType="fitStart" />
+                android:id="@+id/image"
+                android:layout_width="200dp"
+                android:layout_height="200dp"/>
 
             <TextView
-                    android:id="@+id/image_load"
-                    android:layout_width="match_parent"
-                    android:layout_height="150dp"
-                    android:gravity="center_horizontal|bottom"
-                    android:paddingBottom="16dp"
-                    android:text="@string/click_to_load" />
-
+                android:id="@+id/image_load"
+                android:layout_width="200dp"
+                android:layout_height="200dp"
+                android:gravity="center_horizontal|bottom"
+                android:paddingBottom="16dp"
+                android:text="@string/click_to_load" />
         </FrameLayout>
 
         <!-- audio -->
         <!-- video -->
-
     </LinearLayout>
 </LinearLayout>

rocket-chat-core/build.gradle

@@ -4,15 +4,14 @@ plugins {
 
 apply plugin: 'idea'
 apply plugin: 'java'
-
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-
+    compile extraDependencies.rxJava
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
 
     compile 'com.google.code.findbugs:jsr305:3.0.1'
 
-    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
+
 
     compile 'com.hadisatrio:Optional:v1.0.1'
 
@@ -23,6 +22,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile "org.mockito:mockito-inline:2.8.9"
 }
-
 sourceCompatibility = "1.7"
 targetCompatibility = "1.7"
\ No newline at end of file

rocket-chat-core/src/main/java/chat/rocket/core/models/Room.java

@@ -6,7 +6,7 @@ import com.google.auto.value.AutoValue;
 public abstract class Room {
 
   public static final String TYPE_CHANNEL = "c";
-  public static final String TYPE_PRIVATE = "p";
+  public static final String TYPE_GROUP = "p";
   public static final String TYPE_DIRECT_MESSAGE = "d";
   public static final String TYPE_LIVECHAT = "l";
 
@@ -35,7 +35,7 @@ public abstract class Room {
   }
 
   public boolean isPrivate() {
-    return TYPE_PRIVATE.equals(getType());
+    return TYPE_GROUP.equals(getType());
   }
 
   public boolean isDirectMessage() {

rocket-chat-core/src/main/java/chat/rocket/core/models/RoomSidebar.kt

@@ -2,9 +2,10 @@ package chat.rocket.core.models
 
 class RoomSidebar {
     lateinit var id: String
-    lateinit var roomId: String
     lateinit var roomName: String
-    lateinit var type: String
+    lateinit var roomId: String
+    var type: String? = null
+        get() = RoomType.get(field) ?: Room.TYPE_GROUP
     var userStatus: String? = null
     var isAlert: Boolean = false
     var isFavorite: Boolean = false

rocket-chat-core/src/main/java/chat/rocket/core/models/RoomType.java

+package chat.rocket.core.models;
+
+import org.jetbrains.annotations.Nullable;
+
+public enum RoomType {
+    CHANNEL("c"),
+    GROUP("p"),
+    DIRECT_MESSAGE("d"),
+    LIVECHAT("l")
+    ;
+
+    private final String type;
+    RoomType(String type) {
+        this.type = type;
+    }
+
+    @Nullable
+    public static String get(@Nullable String type) {
+        for (RoomType roomType : RoomType.values()) {
+            if (roomType.type.equals(type)) {
+                return roomType.type;
+            }
+        }
+        return null;
+    }
+}

rocket-chat-core/src/main/java/chat/rocket/core/models/SpotlightRoom.java

@@ -16,7 +16,7 @@ public abstract class SpotlightRoom {
   }
 
   public boolean isPrivate() {
-    return Room.TYPE_PRIVATE.equals(getType());
+    return Room.TYPE_GROUP.equals(getType());
   }
 
   public boolean isDirectMessage() {