put back sync network methods / avoid runBlocking

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt

@@ -53,7 +53,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 
 class ComposeViewModel @Inject constructor(
@@ -431,17 +430,14 @@ class ComposeViewModel @Inject constructor(
 
     fun searchAutocompleteSuggestions(token: String): List<AutocompleteResult> {
         return when (token[0]) {
-            '@' -> runBlocking {
+            '@' -> api.searchAccountsSync(query = token.substring(1), limit = 10)
-                api.searchAccounts(query = token.substring(1), limit = 10)
                 .fold({ accounts ->
                     accounts.map { AutocompleteResult.AccountResult(it) }
                 }, { e ->
                     Log.e(TAG, "Autocomplete search for $token failed.", e)
                     emptyList()
                 })
-            }
+            '#' -> api.searchSync(
-            '#' -> runBlocking {
-                api.search(
                 query = token,
                 type = SearchType.Hashtag.apiParameter,
                 limit = 10
@@ -452,7 +448,6 @@ class ComposeViewModel @Inject constructor(
                     Log.e(TAG, "Autocomplete search for $token failed.", e)
                     emptyList()
                 })
-            }
             ':' -> {
                 val emojiList = emoji.replayCache.firstOrNull() ?: return emptyList()
                 val incomplete = token.substring(1)

app/src/main/java/com/keylesspalace/tusky/components/followedtags/FollowedTagsViewModel.kt

@@ -14,7 +14,6 @@ import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.entity.HashTag
 import com.keylesspalace.tusky.network.MastodonApi
 import javax.inject.Inject
-import kotlinx.coroutines.runBlocking
 
 class FollowedTagsViewModel @Inject constructor(
     private val api: MastodonApi
@@ -39,8 +38,7 @@ class FollowedTagsViewModel @Inject constructor(
     fun searchAutocompleteSuggestions(
         token: String
     ): List<ComposeAutoCompleteAdapter.AutocompleteResult> {
-        return runBlocking {
+        return api.searchSync(query = token, type = SearchType.Hashtag.apiParameter, limit = 10)
-            api.search(query = token, type = SearchType.Hashtag.apiParameter, limit = 10)
             .fold({ searchResult ->
                 searchResult.hashtags.map {
                     ComposeAutoCompleteAdapter.AutocompleteResult.HashtagResult(
@@ -52,7 +50,6 @@ class FollowedTagsViewModel @Inject constructor(
                 emptyList()
             })
     }
-    }
 
     companion object {
         private const val TAG = "FollowedTagsViewModel"

app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt

@@ -314,6 +314,12 @@ interface MastodonApi {
         @Query("following") following: Boolean? = null
     ): NetworkResult<List<TimelineAccount>>
 
+    @GET("api/v1/accounts/search")
+    fun searchAccountsSync(
+        @Query("q") query: String,
+        @Query("limit") limit: Int? = null
+    ): NetworkResult<List<TimelineAccount>>
+
     @GET("api/v1/accounts/{id}")
     suspend fun account(@Path("id") accountId: String): NetworkResult<Account>
 
@@ -643,6 +649,16 @@ interface MastodonApi {
         @Query("following") following: Boolean? = null
     ): NetworkResult<SearchResult>
 
+    @GET("api/v2/search")
+    fun searchSync(
+        @Query("q") query: String?,
+        @Query("type") type: String? = null,
+        @Query("resolve") resolve: Boolean? = null,
+        @Query("limit") limit: Int? = null,
+        @Query("offset") offset: Int? = null,
+        @Query("following") following: Boolean? = null
+    ): NetworkResult<SearchResult>
+
     @FormUrlEncoded
     @POST("api/v1/accounts/{id}/note")
     suspend fun updateAccountNote(