Merge branch 'develop-2.x' into feature/multi-server

.circleci/config.yml

+version: 2
+jobs:
+  build-kotlin-sdk:
+    docker:
+      - image: circleci/android:api-27-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - run:
+          name: checkout Rocket.Chat.Kotlin.SDK
+          command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
+      - run:
+          name: ANDROID_HOME
+          command: echo "sdk.dir="$ANDROID_HOME > local.properties 
+      - run:
+          name: Build Kotlin.SDK
+          command: pushd app/ ; ./build-sdk.sh ; popd
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - save_cache:
+          paths:
+            - app/libs/
+            - ../Rocket.Chat.Kotlin.SDK/.last_commit_hash
+          key: kotlin-sdk-{{ .Revision }}
+      - store_artifacts:
+          path: app/libs/
+          destination: libs
+  code-analysis:
+    docker:
+      - image: circleci/android:api-27-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - run:
+          name: ANDROID_HOME
+          command: echo "sdk.dir="$ANDROID_HOME > local.properties 
+      - run:
+          name: checkout Rocket.Chat.Kotlin.SDK
+          command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
+      - restore_cache:
+          key: kotlin-sdk-{{ .Revision }}
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies --quiet --console=plain
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Run Lint #, Checkstyles, PMD, Findbugs...
+          command: ./gradlew lint
+      - run:
+          name: Run Unit test
+          command: echo ./gradlew test # TODO: Fix unit test errors soon...
+      - store_artifacts:
+          path: app/build/reports/
+          destination: reports
+  build-apk:
+    docker:
+      - image: circleci/android:api-27-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - run:
+          name: restore files from ENV
+          command: |
+            echo $ROCKET_JKS_BASE64 | base64 --decode > Rocket.jks
+            echo $ROCKET_PLAY_JSON | base64 --decode > app/rocket-chat.json
+      - run:
+          name: checkout Rocket.Chat.Kotlin.SDK
+          command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
+      - restore_cache:
+          key: kotlin-sdk-{{ .Revision }}
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies --quiet --console=plain
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Build APK
+          command: |
+            ./gradlew assembleRelease --quiet --console=plain --stacktrace
+      - store_artifacts:
+          path: app/build/outputs/apk
+          destination: apks
+
+workflows:
+  version: 2
+  build-deploy:
+    jobs:
+      - build-kotlin-sdk
+      - code-analysis:
+          requires:
+            - build-kotlin-sdk
+          filters:
+            branches:
+              ignore: # skip on merge commits.
+                - develop
+                - develop-2.x
+                - master
+      - build-apk:
+          requires:
+            - build-kotlin-sdk

app/build.gradle

@@ -110,6 +110,8 @@ dependencies {
     androidTestImplementation(libraries.expressoCore, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+
+    implementation 'com.android.support:customtabs:27.0.2'
 }
 
 kotlin {

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -71,13 +71,13 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                         client.messages(chatRoomId, roomTypeOf(chatRoomType), offset, 30).result
                 messagesRepository.saveAll(messages)
 
+                val messagesViewModels = mapper.map(messages)
+                view.showMessages(messagesViewModels)
+
                 // TODO: For now we are marking the room as read if we can get the messages (I mean, no exception occurs)
                 // but should mark only when the user see the first unread message.
                 markRoomAsRead(chatRoomId)
 
-                val messagesViewModels = mapper.map(messages)
-                view.showMessages(messagesViewModels)
-
                 subscribeMessages(chatRoomId)
             } catch (ex: Exception) {
                 ex.printStackTrace()
@@ -230,6 +230,9 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
     fun unsubscribeMessages(chatRoomId: String) {
         manager.removeStatusChannel(stateChannel)
         manager.unsubscribeRoomMessages(chatRoomId)
+        // All messages during the subscribed period are assumed to be read,
+        // and lastSeen is updated as the time when the user leaves the room
+        markRoomAsRead(chatRoomId)
     }
 
     /**

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt

@@ -86,11 +86,13 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
 
         isChatRoomSubscribed = intent.getBooleanExtra(INTENT_CHAT_IS_SUBSCRIBED, true)
 
+        if (supportFragmentManager.findFragmentByTag("ChatRoomFragment") == null) {
             addFragment("ChatRoomFragment", R.id.fragment_container) {
                 newInstance(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen,
                         isChatRoomSubscribed)
             }
         }
+    }
 
     override fun onBackPressed() {
         finishActivity()

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -131,6 +131,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         presenter.unsubscribeMessages(chatRoomId)
         handler.removeCallbacksAndMessages(null)
         unsubscribeTextMessage()
+
+        // Hides the keyboard (if it's opened) before going to any view.
+        activity?.apply {
+            hideKeyboard()
+        }
         super.onDestroyView()
     }
 

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt

@@ -73,6 +73,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
 
         val searchItem = menu.findItem(R.id.action_search)
         searchView = searchItem?.actionView as SearchView
+        searchView?.maxWidth = Integer.MAX_VALUE
         searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
                 return queryChatRoomsByName(query)

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

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.graphics.*
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.support.customtabs.CustomTabsIntent
 import android.provider.Browser
 import android.support.v4.content.ContextCompat
 import android.support.v4.content.res.ResourcesCompat
@@ -171,16 +172,12 @@ class MessageParser @Inject constructor(val context: Application, private val co
                 if (!link.startsWith("@") && link !in consumed) {
                     builder.setSpan(object : ClickableSpan() {
                         override fun onClick(view: View) {
-                            val uri = getUri(link)
-                            val context = view.context
-                            val intent = Intent(Intent.ACTION_VIEW, uri)
-                            intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.packageName)
-                            try {
-                                context.startActivity(intent)
-                            } catch (e: ActivityNotFoundException) {
-                                Timber.e("Actvity was not found for intent, $intent")
+                            with (view) {
+                                val tabsbuilder = CustomTabsIntent.Builder()
+                                tabsbuilder.setToolbarColor(ResourcesCompat.getColor(context.resources, R.color.colorPrimary, context.theme))
+                                val customTabsIntent = tabsbuilder.build()
+                                customTabsIntent.launchUrl(context, getUri(link))
                             }
-
                         }
                     }, matcher.start(0), matcher.end(0))
                     consumed.add(link)

app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt

@@ -15,7 +15,6 @@ import chat.rocket.android.members.adapter.MembersAdapter
 import chat.rocket.android.members.presentation.MembersPresenter
 import chat.rocket.android.members.presentation.MembersView
 import chat.rocket.android.members.viewmodel.MemberViewModel
-import chat.rocket.android.util.extensions.hideKeyboard
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.util.extensions.showToast
@@ -23,9 +22,6 @@ import chat.rocket.android.widget.DividerItemDecoration
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_members.*
 import javax.inject.Inject
-import android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY
-import android.app.Activity
-import android.view.inputmethod.InputMethodManager
 
 
 fun newInstance(chatRoomId: String, chatRoomType: String): Fragment {
@@ -65,8 +61,6 @@ class MembersFragment : Fragment(), MembersView {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val imm = activity?.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0)
 
         (activity as AppCompatActivity).supportActionBar?.title = ""
 

app/src/main/java/chat/rocket/android/util/extensions/Ui.kt

@@ -49,8 +49,10 @@ fun AppCompatActivity.addFragmentBackStack(tag: String, layoutId: Int,
 }
 
 fun Activity.hideKeyboard() {
+    if (currentFocus != null) {
         val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         imm.hideSoftInputFromWindow(currentFocus.windowToken, InputMethodManager.RESULT_UNCHANGED_SHOWN)
+    }
 }
 
 fun Activity.showToast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SHORT) =

app/src/main/java/chat/rocket/android/widget/emoji/CategoryPagerAdapter.kt

@@ -9,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import chat.rocket.android.R
+import chat.rocket.android.util.extensions.setVisible
 import java.util.*
 
 class CategoryPagerAdapter(val listener: EmojiKeyboardListener) : PagerAdapter() {
@@ -24,11 +25,18 @@ class CategoryPagerAdapter(val listener: EmojiKeyboardListener) : PagerAdapter()
         val recycler = view.findViewById(R.id.emojiRecyclerView) as RecyclerView
         val adapter = EmojiAdapter(layoutManager.spanCount, listener)
         val category = EmojiCategory.values().get(position)
+        val emojiNoRecentText : TextView = view.findViewById(R.id.text_no_recent_emoji)
         val emojis = if (category != EmojiCategory.RECENTS) {
             EmojiRepository.getEmojisByCategory(category)
         } else {
             EmojiRepository.getRecents()
         }
+        val recentEmojiSize = EmojiRepository.getRecents().size
+        if (category == EmojiCategory.RECENTS && recentEmojiSize == 0){
+            emojiNoRecentText.setVisible(true)
+        }else{
+            emojiNoRecentText.setVisible(false)
+        }
         adapter.addEmojis(emojis)
         recycler.layoutManager = layoutManager
         recycler.itemAnimator = DefaultItemAnimator()

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

@@ -15,4 +15,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/text_no_recent_emoji"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/msg_no_recent_emoji"
+        android:layout_gravity="center"
+        android:elevation="10dp"
+        android:textSize="16sp"
+        android:visibility="gone"/>
+
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file

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

@@ -35,13 +35,20 @@
             android:layout_height="1dp"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_marginRight="4dp"
+            android:layout_marginEnd="4dp"
             android:background="@color/red"/>
         <TextView
             android:layout_width="wrap_content"
             android:text="@string/msg_unread_messages"
             android:layout_height="wrap_content"
             android:textColor="@color/red" />
+        <View
+            android:layout_gravity="center"
+            android:layout_height="1dp"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_marginStart="4dp"
+            android:background="@color/red"/>
     </LinearLayout>
 
     <LinearLayout

app/src/main/res/values-pt-rBR/strings.xml

@@ -139,4 +139,6 @@
     <string name="Guggy_Command_Description">Gera um gif baseado no texto dado</string>
     <string name="Slash_Topic_Description">Definir tópico</string>
 
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">Nenhum emoji recente</string>
 </resources>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -140,4 +140,6 @@
     <string name="Guggy_Command_Description">Generates a gif based upon the provided text</string>
     <string name="Slash_Topic_Description">Set topic</string>
 
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">No recent emoji</string>
 </resources>
\ No newline at end of file

circle.yml

-#
-# Build configuration for Circle CI
-#
-# See this thread for speeding up and caching directories: https://discuss.circleci.com/t/installing-android-build-tools-23-0-2/924
-#
-
-machine:
-  environment:
-    ANDROID_HOME: /usr/local/android-sdk-linux
-    GRADLE_OPTS: '-Xmx1536M -Dorg.gradle.jvmargs="-Xmx1536M -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
-    JAVA_OPTS: "-Xms518m -Xmx1536M"
-  pre:
-    - git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git Rocket.Chat.Kotlin.SDK
-
-dependencies:
-  pre:
-    - sudo service mysql stop; sleep 5
-    - sudo service mongod stop; sleep 5
-    - sudo killall postgres; sleep 5
-
-    - git fetch --tags
-
-    - echo "sdk.dir="$ANDROID_HOME > local.properties
-
-    - echo $ROCKET_JKS_BASE64 | base64 --decode > Rocket.jks
-    - echo $ROCKET_PLAY_JSON | base64 --decode > app/rocket-chat.json
-
-    - mkdir -p app/src/release/res/values
-# TODO: remove the comment when using that file on the project
-#    - echo $GOOGLE_SERVICES_BASE64 | base64 --decode > app/src/release/google-services.json
-#   - echo $API_KEY_STRINGS_BASE64 | base64 --decode > app/src/release/res/values/api_key_strings.xml
-
-    - mkdir -p $ANDROID_HOME/licenses/  
-    - echo 8933bad161af4178b1185d1a37fbf41ea5269c55 >> $ANDROID_HOME/licenses/android-sdk-license
-    - echo d56f5187479451eabf01fb78af6dfcb131a6481e >> $ANDROID_HOME/licenses/android-sdk-license  
-    - echo y | android update sdk --no-ui --all --filter tools,platform-tools
-    - echo y | android update sdk --no-ui --all --filter android-27
-    - echo y | android update sdk --no-ui --all --filter extra-android-m2repository,extra-android-support
-    - echo y | android update sdk --no-ui --all --filter extra-google-m2repository,extra-google-google_play_services
-    - echo y | android update sdk --no-ui --all --filter build-tools-27.0.0
-      #- yes | sdkmanager --licenses  
-  cache_directories:
-          #- /usr/local/android-sdk-linux/tools
-          #- /usr/local/android-sdk-linux/build-tools/27.0.0
-
-test:
-  override:
-    - ./gradlew assembleRelease --stacktrace
-    - find . -name *.apk -exec mv {} $CIRCLE_ARTIFACTS/ \;
-
-deployment:
-  beta:
-    tag: /v\d+\.\d+\.\d+(?!.)/
-    owner: RocketChat
-    commands:
-      - ./gradlew publishListingRelease
-        -Dorg.gradle.project.track=beta
-  alpha:
-    tag: /v\d+\.\d+\.\d+/
-    owner: RocketChat
-    commands:
-      - ./gradlew publishListingRelease
-        -Dorg.gradle.pr oject.track=alpha

dependencies.gradle

@@ -4,14 +4,14 @@ ext {
         compileSdk        : 27,
         targetSdk         : 27,
         buildTools        : '27.0.3',
-        kotlin            : '1.2.30',
-        coroutine         : '0.22',
-        dokka             : '0.9.15',
+        kotlin            : '1.2.31',
+        coroutine         : '0.22.5',
+        dokka             : '0.9.16',
 
         // Main dependencies
         support                : '27.0.2',
         constraintLayout       : '1.0.2',
-        androidKtx             : '0.1',
+        androidKtx             : '0.2',
         dagger                 : '2.14.1',
         exoPlayer              : '2.6.0',
         playServices           : '11.8.0',
@@ -19,7 +19,7 @@ ext {
         rxKotlin               : '2.2.0',
         rxAndroid              : '2.0.2',
         moshi                  : '1.6.0-SNAPSHOT',
-        okhttp                 : '3.9.1',
+        okhttp                 : '3.10.0',
         timber                 : '4.6.1',
         threeTenABP            : '1.0.5',
         rxBinding              : '2.0.0',