Merge pull request #1509 from RocketChat/fix/fix-crashes-2.5.0-beta

[FIX] fix crashes 2.5.0 beta

app/src/main/java/chat/rocket/android/chatrooms/domain/FetchChatRoomsInteractor.kt

@@ -3,7 +3,6 @@ package chat.rocket.android.chatrooms.domain
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.model.ChatRoomEntity
 import chat.rocket.android.db.model.UserEntity
-import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.chatRooms

app/src/main/java/chat/rocket/android/db/DatabaseManager.kt

@@ -154,14 +154,14 @@ class DatabaseManager(val context: Application,
                 val chatRoom = current.chatRoom
 
                 lastMessage?.sender?.let { user ->
-                    if (findUser(user.id!!) == null) {
+                    if (findUser(user.id) == null) {
                         Timber.d("Missing last message user, inserting: ${user.id}")
                         insert(UserEntity(user.id!!, user.username, user.name))
                     }
                 }
 
                 user?.let { user ->
-                    if (findUser(user.id!!) == null) {
+                    if (findUser(user.id) == null) {
                         Timber.d("Missing owner user, inserting: ${user.id}")
                         insert(UserEntity(user.id!!, user.username, user.name))
                     }
@@ -260,15 +260,16 @@ class DatabaseManager(val context: Application,
             Timber.d("Missing user, inserting: $userId")
             insert(UserEntity(userId))
         }
+
         room.lastMessage?.sender?.let { user ->
-            if (findUser(user.id!!) == null) {
+            if (findUser(user.id) == null) {
                 Timber.d("Missing last message user, inserting: ${user.id}")
                 insert(UserEntity(user.id!!, user.username, user.name))
             }
         }
 
         room.user?.let { user ->
-            if (findUser(user.id!!) == null) {
+            if (findUser(user.id) == null) {
                 Timber.d("Missing owner user, inserting: ${user.id}")
                 insert(UserEntity(user.id!!, user.username, user.name))
             }
@@ -312,13 +313,13 @@ class DatabaseManager(val context: Application,
         }
     }
 
-    fun findUser(userId: String): String? = userDao().findUser(userId)
+    fun findUser(userId: String?): String? = if (userId != null) userDao().findUser(userId) else null
 }
 
 fun User.toEntity(): BaseUserEntity? {
     return if (name == null && username == null && utcOffset == null && status != null) {
         UserStatus(id = id, status = status.toString())
-    } else if (username != null){
+    } else if (username != null) {
         UserEntity(id, username, name, status?.toString() ?: "offline", utcOffset)
     } else {
         null

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

@@ -14,6 +14,7 @@ import chat.rocket.android.profile.presentation.ProfileView
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extensions.*
 import dagger.android.support.AndroidSupportInjection
+import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import io.reactivex.rxkotlin.Observables
 import kotlinx.android.synthetic.main.avatar_profile.*
@@ -28,7 +29,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     private lateinit var currentEmail: String
     private lateinit var currentAvatar: String
     private var actionMode: ActionMode? = null
-    private lateinit var editTextsDisposable: Disposable
+    private val editTextsDisposable = CompositeDisposable()
 
     companion object {
         fun newInstance() = ProfileFragment()
@@ -170,7 +171,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     }
 
     private fun subscribeEditTexts() {
-        editTextsDisposable = Observables.combineLatest(
+        editTextsDisposable.add(Observables.combineLatest(
             text_name.asObservable(),
             text_username.asObservable(),
             text_email.asObservable(),
@@ -186,11 +187,11 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
             } else {
                 finishActionMode()
             }
-        }
+        })
     }
 
     private fun unsubscribeEditTexts() {
-        editTextsDisposable.dispose()
+        editTextsDisposable.clear()
     }
 
     private fun startActionMode() {

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/layout_container"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -20,7 +20,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar_layout">
 
-        <android.support.design.chip.ChipGroup
+        <com.google.android.material.chip.ChipGroup
             android:id="@+id/members_chips"
             style="@style/Widget.MaterialComponents.Chip.Entry"
             android:layout_width="match_parent"
@@ -31,7 +31,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-        </android.support.design.chip.ChipGroup>
+        </com.google.android.material.chip.ChipGroup>
 
         <com.wang.avi.AVLoadingIndicatorView
             android:id="@+id/view_loading"
@@ -63,12 +63,12 @@
             android:background="@color/colorDividerMessageComposer"
             app:layout_constraintTop_toBottomOf="@id/text_search_member" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:scrollbars="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/separator_1" />
-    </android.support.constraint.ConstraintLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
@@ -41,4 +41,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="04/06/2018 14:18:36" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/toolbar_height"
@@ -29,6 +29,6 @@
             android:gravity="end"
             android:textSize="14sp" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file