Catch cancellation exceptions for chat room live data

app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt

@@ -24,8 +24,6 @@ import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.android.UI
 import timber.log.Timber
 import java.lang.IllegalArgumentException
-import kotlin.coroutines.experimental.coroutineContext
-
 
 class ChatRoomsViewModel(
     private val connectionManager: ConnectionManager,
@@ -45,20 +43,23 @@ class ChatRoomsViewModel(
 
             return@switchMap if (query.isSearch()) {
                 this@ChatRoomsViewModel.query.wrap(runContext) { _, data: MutableLiveData<RoomsModel> ->
-                    val string = (query as Query.Search).query
-
-                    // debounce, to not query while the user is writing
-                    delay(200)
-                    yield()
-                    val rooms = repository.search(string).let { mapper.map(it, showLastMessage = this.showLastMessage) }
-                    data.postValue(rooms.toMutableList() + LoadingItemHolder())
-                    yield()
-                    val spotlight = spotlight(query.query)?.let { mapper.map(it, showLastMessage = this.showLastMessage) }
-                    yield()
-                    spotlight?.let {
-                        data.postValue(rooms.toMutableList() + spotlight)
-                    }.ifNull {
-                        data.postValue(rooms)
+                    try {
+                        val string = (query as Query.Search).query
+
+                        // debounce, to not query while the user is writing
+                        delay(200)
+                        val rooms = repository.search(string).let { mapper.map(it, showLastMessage = this.showLastMessage) }
+                        data.postValue(rooms.toMutableList() + LoadingItemHolder())
+                        yield()
+                        val spotlight = spotlight(query.query)?.let { mapper.map(it, showLastMessage = this.showLastMessage) }
+                        yield()
+                        spotlight?.let {
+                            data.postValue(rooms.toMutableList() + spotlight)
+                        }.ifNull {
+                            data.postValue(rooms)
+                        }
+                    } catch (ignore: CancellationException) {
+
                     }
                 }
             } else {

app/src/main/java/chat/rocket/android/util/IO.kt

@@ -22,20 +22,17 @@ suspend fun <T> retryIO(
 {
     var currentDelay = initialDelay
     repeat(times - 1) { currentTry ->
-        if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
+        yield()
         try {
             return block()
         } catch (e: RocketChatNetworkErrorException) {
             Timber.d(e, "failed call($currentTry): $description")
             e.printStackTrace()
         }
-
-        if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
         delay(currentDelay)
         currentDelay = (currentDelay * factor).toLong().coerceAtMost(maxDelay)
     }
-
-    if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
+    yield()
     return block() // last attempt
 }