Room upgrade: add rx flux and handle failures more precisely

vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt

@@ -30,12 +30,16 @@ class ErrorFormatter @Inject constructor(val stringProvider: StringProvider) {
     }
 
     fun toHumanReadable(throwable: Throwable?): String {
-
         return when (throwable) {
             null                         -> ""
             is Failure.NetworkConnection -> stringProvider.getString(R.string.error_no_network)
+            is Failure.ServerError       -> {
+                throwable.error.message.takeIf { it.isNotEmpty() }
+                ?: throwable.error.code.takeIf { it.isNotEmpty() }
+                ?: stringProvider.getString(R.string.unknown_error)
+            }
             else                         -> throwable.localizedMessage
+                                            ?: stringProvider.getString(R.string.unknown_error)
         }
-
     }
 }

vector/src/main/java/im/vector/riotx/features/home/createdirect/CreateDirectRoomActivity.kt

@@ -29,6 +29,7 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.viewModel
+import im.vector.matrix.android.api.session.room.failure.CreateRoomFailure
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.error.ErrorFormatter
@@ -38,6 +39,7 @@ import im.vector.riotx.core.extensions.observeEvent
 import im.vector.riotx.core.platform.SimpleFragmentActivity
 import im.vector.riotx.core.platform.WaitingViewData
 import kotlinx.android.synthetic.main.activity.*
+import timber.log.Timber
 import javax.inject.Inject
 
 class CreateDirectRoomActivity : SimpleFragmentActivity() {
@@ -91,10 +93,13 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
 
     private fun renderCreationFailure(error: Throwable) {
         hideWaitingView()
-        AlertDialog.Builder(this)
-                .setMessage(errorFormatter.toHumanReadable(error))
-                .setPositiveButton(R.string.ok) { dialog, id -> dialog.cancel() }
-                .show()
+        if (error is CreateRoomFailure.CreatedWithTimeout) {
+            finish()
+        } else
+            AlertDialog.Builder(this)
+                    .setMessage(errorFormatter.toHumanReadable(error))
+                    .setPositiveButton(R.string.ok) { dialog, id -> dialog.cancel() }
+                    .show()
     }
 
     private fun renderCreationSuccess(roomId: String?) {

vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt

@@ -65,6 +65,7 @@ import com.otaliastudios.autocomplete.CharPolicy
 import im.vector.matrix.android.api.permalinks.PermalinkFactory
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.events.model.Event
+import im.vector.matrix.android.api.session.room.failure.JoinRoomFailure
 import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.message.*
@@ -608,7 +609,7 @@ class RoomDetailFragment :
                 // TODO Better handling progress
                 vectorBaseActivity.showWaitingView()
                 vectorBaseActivity.waiting_view_status_text.visibility = View.VISIBLE
-                vectorBaseActivity.waiting_view_status_text.text = getString(R.string.join)
+                vectorBaseActivity.waiting_view_status_text.text = getString(R.string.joining_room)
             }
             is Success -> {
                 navigator.openRoom(vectorBaseActivity, async())

vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt

@@ -140,8 +140,8 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
                                ?: return
 
         val roomId = tombstoneContent.replacementRoom
-        // TODO replace with rx flux
-        if (session.getRoom(roomId)?.roomSummary()?.membership == Membership.JOIN) {
+        val isRoomJoined = session.getRoom(roomId)?.roomSummary()?.membership == Membership.JOIN
+        if (isRoomJoined) {
             setState { copy(tombstoneEventHandling = Success(roomId)) }
         } else {
             val viaServer = MatrixPatterns.extractServerNameFromId(action.event.senderId).let {
@@ -151,17 +151,12 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
                     listOf(it)
                 }
             }
-            setState { copy(tombstoneEventHandling = Loading()) }
-            session.joinRoom(roomId, viaServer, object : MatrixCallback<Unit> {
-                override fun onSuccess(data: Unit) {
-                    setState { copy(tombstoneEventHandling = Success(roomId)) }
-
-                }
-
-                override fun onFailure(failure: Throwable) {
-                    setState { copy(tombstoneEventHandling = Fail(failure)) }
-                }
-            })
+            session.rx()
+                    .joinRoom(roomId, viaServer)
+                    .map { roomId }
+                    .execute {
+                        copy(tombstoneEventHandling = it)
+                    }
         }
 
     }

vector/src/main/res/values/strings_riotX.xml

@@ -7,4 +7,6 @@
     <string name="direct_room_no_known_users">"No result found, use Add by matrix ID to search on server."</string>
     <string name="direct_room_start_search">"Start typing to get results"</string>
     <string name="direct_room_filter_hint">"Filter by username or ID…"</string>
+
+    <string name="joining_room">"Joining room…"</string>
 </resources>