WIP - linter

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>

Author: rapterjet2004

app/src/main/java/com/nextcloud/talk/contacts/ContactsViewModel.kt

@@ -119,29 +119,29 @@ class ContactsViewModel @Inject constructor(private val repository: ContactsRepo
         }
     }
 
-    suspend fun getBlockingContactsFromSearchParams(query: String = "") = withContext(Dispatchers.IO) {
-        _contactsViewState.value = ContactsUiState.Loading
-        try {
-            val contacts = repository.getContacts(
-                if (query != "") query else searchQuery.value,
-                shareTypeList
-            )
-            val contactsList: MutableList<AutocompleteUser>? = contacts.ocs!!.data?.toMutableList()
-
-            if (hideAlreadyAddedParticipants && !_clickAddButton.value) {
-                contactsList?.removeAll(selectedParticipants.value)
-            }
-            if (_clickAddButton.value) {
-                contactsList?.removeAll(selectedParticipants.value)
-                contactsList?.addAll(_selectedContacts.value)
+    suspend fun getBlockingContactsFromSearchParams(query: String = "") =
+        withContext(Dispatchers.IO) {
+            _contactsViewState.value = ContactsUiState.Loading
+            try {
+                val contacts = repository.getContacts(
+                    if (query != "") query else searchQuery.value,
+                    shareTypeList
+                )
+                val contactsList: MutableList<AutocompleteUser>? = contacts.ocs!!.data?.toMutableList()
+
+                if (hideAlreadyAddedParticipants && !_clickAddButton.value) {
+                    contactsList?.removeAll(selectedParticipants.value)
+                }
+                if (_clickAddButton.value) {
+                    contactsList?.removeAll(selectedParticipants.value)
+                    contactsList?.addAll(_selectedContacts.value)
+                }
+                _contactsViewState.value = ContactsUiState.Success(contactsList)
+            } catch (exception: Exception) {
+                _contactsViewState.value = ContactsUiState.Error(exception.message ?: "")
             }
-            _contactsViewState.value = ContactsUiState.Success(contactsList)
-        } catch (exception: Exception) {
-            _contactsViewState.value = ContactsUiState.Error(exception.message ?: "")
         }
 
-    }
-
     @Suppress("Detekt.TooGenericExceptionCaught")
     fun createRoom(roomType: String, sourceType: String?, userId: String, conversationName: String?) {
         viewModelScope.launch {

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -483,7 +483,6 @@ class ConversationsListActivity :
 
                             searchableConversationItems.addAll(openConversationItems)
                         }
-
                     }
                     is ConversationsListViewModel.OpenConversationsUiState.Error -> {
                         handleHttpExceptions(state.exception)
@@ -1560,18 +1559,6 @@ class ConversationsListActivity :
             }
     }
 
-    private suspend fun startBlockingMessageSearch(search: String?) = withContext(Dispatchers.IO) {
-        searchHelper?.startMessageSearch(search!!)
-            ?.subscribeOn(Schedulers.io())
-            ?.observeOn(AndroidSchedulers.mainThread())
-            ?.blockingSubscribe({ results: MessageSearchResults -> onMessageSearchResult(results) }) { throwable:
-            Throwable ->
-                onMessageSearchError(
-                    throwable
-                )
-            }
-    }
-
     @SuppressLint("CheckResult") // handled by helper
     private fun loadMoreMessages() {
         binding.swipeRefreshLayoutView.isRefreshing = true

app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt

@@ -201,27 +201,31 @@ class ConversationsListViewModel @Inject constructor(
         }
     }
 
-    suspend fun fetchOpenConversations(searchTerm: String) = withContext(Dispatchers.IO) {
-        _openConversationsState.value = OpenConversationsUiState.None
-
-        if (!hasSpreedFeatureCapability(currentUser.capabilities?.spreedCapability, SpreedFeatures.LISTABLE_ROOMS)) {
-            return@withContext
-        }
-
-        openConversationsRepository.fetchConversations(searchTerm)
-            .onSuccess { conversations ->
-                if (conversations.isEmpty()) {
-                    _openConversationsState.value = OpenConversationsUiState.None
-                } else {
-                    _openConversationsState.value = OpenConversationsUiState.Success(conversations)
-                }
-            }
-            .onFailure { exception ->
-                Log.e(TAG, "Failed to fetch conversations", exception)
-                _openConversationsState.value = OpenConversationsUiState.Error(exception)
+    suspend fun fetchOpenConversations(searchTerm: String) =
+        withContext(Dispatchers.IO) {
+            _openConversationsState.value = OpenConversationsUiState.None
+
+            if (!hasSpreedFeatureCapability(
+                    currentUser.capabilities?.spreedCapability,
+                    SpreedFeatures.LISTABLE_ROOMS
+                )
+            ) {
+                return@withContext
             }
 
-    }
+            openConversationsRepository.fetchConversations(searchTerm)
+                .onSuccess { conversations ->
+                    if (conversations.isEmpty()) {
+                        _openConversationsState.value = OpenConversationsUiState.None
+                    } else {
+                        _openConversationsState.value = OpenConversationsUiState.Success(conversations)
+                    }
+                }
+                .onFailure { exception ->
+                    Log.e(TAG, "Failed to fetch conversations", exception)
+                    _openConversationsState.value = OpenConversationsUiState.Error(exception)
+                }
+        }
 
     inner class FederatedInvitationsObserver : Observer<InvitationsModel> {
         override fun onSubscribe(d: Disposable) {