Migrate NetworkResult to Kotlin's Result

app/build.gradle

@@ -48,6 +48,7 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
 
             kotlinOptions {
                 freeCompilerArgs = [
@@ -145,7 +146,6 @@ dependencies {
     implementation libs.gson
 
     implementation libs.bundles.retrofit
-    implementation libs.networkresult.calladapter
 
     implementation libs.bundles.okhttp
 

app/proguard-rules.pro

@@ -61,14 +61,8 @@
 -keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
 -keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
 
-# Retain generic signatures of classes used in MastodonApi so Retrofit works
--keep,allowobfuscation,allowshrinking class retrofit2.Response
--keep,allowobfuscation,allowshrinking class kotlin.collections.List
--keep,allowobfuscation,allowshrinking class kotlin.collections.Map
--keep,allowobfuscation,allowshrinking class retrofit2.Call
-
-# https://github.com/square/retrofit/pull/3563
--keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+# TODO: Remove this after https://github.com/square/retrofit/pull/4018 is merged.
+-keep,allowobfuscation,allowshrinking class kotlin.Result
 
 # preserve line numbers for crash reporting
 -keepattributes SourceFile,LineNumberTable

app/src/main/java/com/keylesspalace/tusky/BottomSheetActivity.kt

@@ -23,7 +23,6 @@ import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.lifecycleScope
-import at.connyduck.calladapter.networkresult.fold
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.keylesspalace.tusky.components.account.AccountActivity
 import com.keylesspalace.tusky.components.viewthread.ViewThreadActivity

app/src/main/java/com/keylesspalace/tusky/MainActivity.kt

@@ -55,7 +55,6 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import androidx.viewpager2.widget.MarginPageTransformer
-import at.connyduck.calladapter.networkresult.fold
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.target.CustomTarget

app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt

@@ -23,7 +23,6 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
-import at.connyduck.calladapter.networkresult.fold
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.PreferenceChangedEvent

app/src/main/java/com/keylesspalace/tusky/components/account/AccountViewModel.kt

@@ -4,7 +4,6 @@ import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.appstore.BlockEvent
 import com.keylesspalace.tusky.appstore.DomainMuteEvent
 import com.keylesspalace.tusky.appstore.EventHub

app/src/main/java/com/keylesspalace/tusky/components/account/list/ListsForAccountViewModel.kt

@@ -18,10 +18,6 @@ package com.keylesspalace.tusky.components.account.list
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.getOrThrow
-import at.connyduck.calladapter.networkresult.onFailure
-import at.connyduck.calladapter.networkresult.onSuccess
-import at.connyduck.calladapter.networkresult.runCatching
 import com.keylesspalace.tusky.entity.MastoList
 import com.keylesspalace.tusky.network.MastodonApi
 import javax.inject.Inject

app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt

@@ -26,7 +26,6 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
-import at.connyduck.calladapter.networkresult.fold
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BottomSheetActivity
 import com.keylesspalace.tusky.PostLookupFallbackBehavior

app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsViewModel.kt

@@ -20,7 +20,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.appstore.AnnouncementReadEvent
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.components.instanceinfo.InstanceInfoRepository

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

@@ -20,7 +20,6 @@ import android.util.Log
 import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.components.compose.ComposeActivity.ComposeKind
 import com.keylesspalace.tusky.components.compose.ComposeActivity.QueuedMedia
 import com.keylesspalace.tusky.components.compose.ComposeAutoCompleteAdapter.AutocompleteResult

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt

@@ -23,7 +23,6 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
 import androidx.paging.map
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.network.MastodonApi

app/src/main/java/com/keylesspalace/tusky/components/domainblocks/DomainBlocksRepository.kt

@@ -22,8 +22,6 @@ import androidx.paging.InvalidatingPagingSourceFactory
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingSource
-import at.connyduck.calladapter.networkresult.NetworkResult
-import at.connyduck.calladapter.networkresult.onSuccess
 import com.keylesspalace.tusky.network.MastodonApi
 import javax.inject.Inject
 
@@ -49,14 +47,14 @@ class DomainBlocksRepository @Inject constructor(
         factory.invalidate()
     }
 
-    suspend fun block(domain: String): NetworkResult<Unit> {
+    suspend fun block(domain: String): Result<Unit> {
         return api.blockDomain(domain).onSuccess {
             domains.add(domain)
             factory.invalidate()
         }
     }
 
-    suspend fun unblock(domain: String): NetworkResult<Unit> {
+    suspend fun unblock(domain: String): Result<Unit> {
         return api.unblockDomain(domain).onSuccess {
             domains.remove(domain)
             factory.invalidate()

app/src/main/java/com/keylesspalace/tusky/components/domainblocks/DomainBlocksViewModel.kt

@@ -5,8 +5,6 @@ import androidx.annotation.StringRes
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.cachedIn
-import at.connyduck.calladapter.networkresult.fold
-import at.connyduck.calladapter.networkresult.onFailure
 import com.keylesspalace.tusky.R
 import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableSharedFlow

app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftsActivity.kt

@@ -25,7 +25,6 @@ import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
-import at.connyduck.calladapter.networkresult.fold
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity

app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftsViewModel.kt

@@ -20,7 +20,6 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
-import at.connyduck.calladapter.networkresult.NetworkResult
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.db.DraftEntity
@@ -64,7 +63,7 @@ class DraftsViewModel @Inject constructor(
         }
     }
 
-    suspend fun getStatus(statusId: String): NetworkResult<Status> {
+    suspend fun getStatus(statusId: String): Result<Status> {
         return api.status(statusId)
     }
 

app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterActivity.kt

@@ -12,7 +12,6 @@ import androidx.core.content.IntentCompat
 import androidx.core.view.size
 import androidx.core.widget.doAfterTextChanged
 import androidx.lifecycle.lifecycleScope
-import at.connyduck.calladapter.networkresult.fold
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.switchmaterial.SwitchMaterial

app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterViewModel.kt

@@ -3,7 +3,6 @@ package com.keylesspalace.tusky.components.filters
 import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.entity.Filter
 import com.keylesspalace.tusky.entity.FilterKeyword

app/src/main/java/com/keylesspalace/tusky/components/filters/FiltersViewModel.kt

@@ -3,7 +3,6 @@ package com.keylesspalace.tusky.components.filters
 import android.view.View
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.fold
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.PreferenceChangedEvent

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

@@ -15,7 +15,6 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
-import at.connyduck.calladapter.networkresult.fold
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R

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

@@ -7,7 +7,6 @@ import androidx.paging.ExperimentalPagingApi
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.components.compose.ComposeAutoCompleteAdapter
 import com.keylesspalace.tusky.components.search.SearchType
 import com.keylesspalace.tusky.di.Injectable

app/src/main/java/com/keylesspalace/tusky/components/instanceinfo/InstanceInfoRepository.kt

@@ -16,9 +16,6 @@
 package com.keylesspalace.tusky.components.instanceinfo
 
 import android.util.Log
-import at.connyduck.calladapter.networkresult.fold
-import at.connyduck.calladapter.networkresult.getOrElse
-import at.connyduck.calladapter.networkresult.onSuccess
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.db.EmojisEntity

app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt

@@ -27,7 +27,6 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
-import at.connyduck.calladapter.networkresult.fold
 import com.bumptech.glide.Glide
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.BuildConfig

app/src/main/java/com/keylesspalace/tusky/components/login/LoginWebViewViewModel.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky.components.login
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.isHttpNotFound
 import javax.inject.Inject

app/src/main/java/com/keylesspalace/tusky/components/notifications/PushNotificationHelper.kt

@@ -24,8 +24,6 @@ import android.util.Log
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.PreferenceManager
-import at.connyduck.calladapter.networkresult.onFailure
-import at.connyduck.calladapter.networkresult.onSuccess
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.components.login.LoginActivity

app/src/main/java/com/keylesspalace/tusky/components/report/ReportViewModel.kt

@@ -23,7 +23,6 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
 import androidx.paging.map
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.appstore.BlockEvent
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.MuteEvent

app/src/main/java/com/keylesspalace/tusky/components/report/adapter/StatusesPagingSource.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky.components.report.adapter
 import android.util.Log
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import at.connyduck.calladapter.networkresult.getOrThrow
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
 import kotlinx.coroutines.async

app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusPagingSource.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky.components.scheduled
 import android.util.Log
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import at.connyduck.calladapter.networkresult.getOrThrow
 import com.keylesspalace.tusky.entity.ScheduledStatus
 import com.keylesspalace.tusky.network.MastodonApi
 

app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusViewModel.kt

@@ -21,7 +21,6 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.entity.ScheduledStatus
 import com.keylesspalace.tusky.network.MastodonApi

app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt

@@ -21,9 +21,6 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
-import at.connyduck.calladapter.networkresult.NetworkResult
-import at.connyduck.calladapter.networkresult.fold
-import at.connyduck.calladapter.networkresult.onFailure
 import com.keylesspalace.tusky.components.search.adapter.SearchPagingSourceFactory
 import com.keylesspalace.tusky.db.AccountEntity
 import com.keylesspalace.tusky.db.AccountManager
@@ -180,7 +177,7 @@ class SearchViewModel @Inject constructor(
         }
     }
 
-    fun deleteStatusAsync(id: String): Deferred<NetworkResult<DeletedStatus>> {
+    fun deleteStatusAsync(id: String): Deferred<Result<DeletedStatus>> {
         return viewModelScope.async {
             timelineCases.delete(id)
         }

app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchPagingSource.kt

@@ -17,7 +17,6 @@ package com.keylesspalace.tusky.components.search.adapter
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import at.connyduck.calladapter.networkresult.getOrThrow
 import com.keylesspalace.tusky.components.search.SearchType
 import com.keylesspalace.tusky.entity.SearchResult
 import com.keylesspalace.tusky.network.MastodonApi

app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt

@@ -38,7 +38,6 @@ import androidx.paging.PagingDataAdapter
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
-import at.connyduck.calladapter.networkresult.fold
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R

app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt

@@ -20,9 +20,6 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
-import at.connyduck.calladapter.networkresult.fold
-import at.connyduck.calladapter.networkresult.getOrElse
-import at.connyduck.calladapter.networkresult.getOrThrow
 import com.keylesspalace.tusky.appstore.BlockEvent
 import com.keylesspalace.tusky.appstore.DomainMuteEvent
 import com.keylesspalace.tusky.appstore.Event

app/src/main/java/com/keylesspalace/tusky/components/trending/viewmodel/TrendingTagsViewModel.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky.components.trending.viewmodel
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.fold
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.PreferenceChangedEvent
 import com.keylesspalace.tusky.entity.Filter

app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadViewModel.kt

@@ -18,9 +18,6 @@ package com.keylesspalace.tusky.components.viewthread
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.fold
-import at.connyduck.calladapter.networkresult.getOrElse
-import at.connyduck.calladapter.networkresult.getOrThrow
 import com.google.gson.Gson
 import com.keylesspalace.tusky.appstore.BlockEvent
 import com.keylesspalace.tusky.appstore.EventHub

app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsViewModel.kt

@@ -17,7 +17,6 @@ package com.keylesspalace.tusky.components.viewthread.edits
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import at.connyduck.calladapter.networkresult.getOrElse
 import com.keylesspalace.tusky.components.viewthread.edits.EditsTagHandler.Companion.DELETED_TEXT_EL
 import com.keylesspalace.tusky.components.viewthread.edits.EditsTagHandler.Companion.INSERTED_TEXT_EL
 import com.keylesspalace.tusky.entity.StatusEdit

app/src/main/java/com/keylesspalace/tusky/di/NetworkModule.kt

@@ -19,7 +19,6 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.os.Build
 import android.util.Log
-import at.connyduck.calladapter.networkresult.NetworkResultCallAdapterFactory
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.keylesspalace.tusky.BuildConfig
@@ -45,6 +44,7 @@ import okhttp3.Cache
 import okhttp3.OkHttp
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.ResultCallAdapterFactory
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.create
@@ -117,7 +117,7 @@ class NetworkModule {
         return Retrofit.Builder().baseUrl("https://" + MastodonApi.PLACEHOLDER_DOMAIN)
             .client(httpClient)
             .addConverterFactory(GsonConverterFactory.create(gson))
-            .addCallAdapterFactory(NetworkResultCallAdapterFactory.create())
+            .addCallAdapterFactory(ResultCallAdapterFactory.create())
             .build()
     }
 

app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.kt

@@ -34,8 +34,6 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.app.ActivityOptionsCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import at.connyduck.calladapter.networkresult.fold
-import at.connyduck.calladapter.networkresult.onFailure
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.BottomSheetActivity