migrate to RxJava3 (#2146)

* migrate to RxJava3

* remove unused import

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

@@ -28,7 +28,7 @@ import com.keylesspalace.tusky.entity.Emoji
 import com.keylesspalace.tusky.entity.Instance
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.*
-import io.reactivex.rxkotlin.Singles
+import io.reactivex.rxjava3.core.Single
 import javax.inject.Inject
 
 class AnnouncementsViewModel @Inject constructor(
@@ -45,25 +45,24 @@ class AnnouncementsViewModel @Inject constructor(
     val emojis: LiveData<List<Emoji>> = emojisMutable
 
     init {
-        Singles.zip(
-                mastodonApi.getCustomEmojis(),
+        Single.zip(mastodonApi.getCustomEmojis(),
                 appDatabase.instanceDao().loadMetadataForInstance(accountManager.activeAccount?.domain!!)
                         .map<Either<InstanceEntity, Instance>> { Either.Left(it) }
-                        .onErrorResumeNext(
-                                mastodonApi.getInstance()
-                                        .map { Either.Right(it) }
-                        )
-        ) { emojis, either ->
-            either.asLeftOrNull()?.copy(emojiList = emojis)
-                    ?: InstanceEntity(
-                            accountManager.activeAccount?.domain!!,
-                            emojis,
-                            either.asRight().maxTootChars,
-                            either.asRight().pollLimits?.maxOptions,
-                            either.asRight().pollLimits?.maxOptionChars,
-                            either.asRight().version
-                    )
-        }
+                        .onErrorResumeNext {
+                            mastodonApi.getInstance()
+                                    .map { Either.Right(it) }
+                        },
+                { emojis, either ->
+                    either.asLeftOrNull()?.copy(emojiList = emojis)
+                            ?: InstanceEntity(
+                                    accountManager.activeAccount?.domain!!,
+                                    emojis,
+                                    either.asRight().maxTootChars,
+                                    either.asRight().pollLimits?.maxOptions,
+                                    either.asRight().pollLimits?.maxOptionChars,
+                                    either.asRight().version
+                            )
+                })
                 .doOnSuccess {
                     appDatabase.instanceDao().insertOrReplace(it)
                 }

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

@@ -33,9 +33,9 @@ import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.service.ServiceClient
 import com.keylesspalace.tusky.service.TootToSend
 import com.keylesspalace.tusky.util.*
-import io.reactivex.Observable.just
-import io.reactivex.disposables.Disposable
-import io.reactivex.rxkotlin.Singles
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.disposables.Disposable
 import java.util.*
 import javax.inject.Inject
 
@@ -89,7 +89,7 @@ class ComposeViewModel @Inject constructor(
 
     init {
 
-        Singles.zip(api.getCustomEmojis(), api.getInstance()) { emojis, instance ->
+        Single.zip(api.getCustomEmojis(), api.getInstance(), { emojis, instance ->
             InstanceEntity(
                     instance = accountManager.activeAccount?.domain!!,
                     emojiList = emojis,
@@ -98,13 +98,13 @@ class ComposeViewModel @Inject constructor(
                     maxPollOptionLength = instance.pollLimits?.maxOptionChars,
                     version = instance.version
             )
-        }
+        })
                 .doOnSuccess {
                     db.instanceDao().insertOrReplace(it)
                 }
-                .onErrorResumeNext(
-                        db.instanceDao().loadMetadataForInstance(accountManager.activeAccount?.domain!!)
-                )
+                .onErrorResumeNext {
+                    db.instanceDao().loadMetadataForInstance(accountManager.activeAccount?.domain!!)
+                }
                 .subscribe({ instanceEntity ->
                     emoji.postValue(instanceEntity.emojiList)
                     instance.postValue(instanceEntity)
@@ -257,7 +257,7 @@ class ComposeViewModel @Inject constructor(
         val deletionObservable = if (isEditingScheduledToot) {
             api.deleteScheduledStatus(scheduledTootId.toString()).toObservable().map { }
         } else {
-            just(Unit)
+            Observable.just(Unit)
         }.toLiveData()
 
         val sendObservable = media

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

@@ -29,9 +29,9 @@ import com.keylesspalace.tusky.entity.Attachment
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.network.ProgressRequestBody
 import com.keylesspalace.tusky.util.*
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import java.io.File

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

@@ -11,8 +11,8 @@ import com.keylesspalace.tusky.entity.Conversation
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.Listing
 import com.keylesspalace.tusky.util.NetworkState
-import io.reactivex.Single
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

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

@@ -11,7 +11,7 @@ import com.keylesspalace.tusky.network.TimelineCases
 import com.keylesspalace.tusky.util.Listing
 import com.keylesspalace.tusky.util.NetworkState
 import com.keylesspalace.tusky.util.RxAwareViewModel
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 import javax.inject.Inject
 
 class ConversationsViewModel @Inject constructor(

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

@@ -28,10 +28,10 @@ import com.keylesspalace.tusky.db.DraftEntity
 import com.keylesspalace.tusky.entity.NewPoll
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.util.IOUtils
-import io.reactivex.Completable
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.*
@@ -124,7 +124,9 @@ class DraftHelper @Inject constructor(
     fun deleteDraftAndAttachments(draftId: Int): Completable {
         return draftDao.find(draftId)
                 .flatMapCompletable { draft ->
-                    deleteDraftAndAttachments(draft)
+                    draft?.let {
+                        deleteDraftAndAttachments(it)
+                    }
                 }
     }
 

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

@@ -24,6 +24,8 @@ import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
+import autodispose2.androidx.lifecycle.AndroidLifecycleScopeProvider.from
+import autodispose2.autoDispose
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.BaseActivity
@@ -34,8 +36,7 @@ import com.keylesspalace.tusky.db.DraftEntity
 import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
-import com.uber.autodispose.android.lifecycle.autoDispose
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import retrofit2.HttpException
 import javax.inject.Inject
 
@@ -91,7 +92,7 @@ class DraftsActivity : BaseActivity(), DraftActionListener {
             bottomSheet.state = BottomSheetBehavior.STATE_COLLAPSED
             viewModel.getToot(draft.inReplyToId)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .autoDispose(this)
+                    .autoDispose(from(this))
                     .subscribe({ status ->
                         val composeOptions = ComposeActivity.ComposeOptions(
                                 draftId = draft.id,

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

@@ -22,7 +22,7 @@ import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.db.DraftEntity
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 import javax.inject.Inject
 
 class DraftsViewModel @Inject constructor(

app/src/main/java/com/keylesspalace/tusky/components/instancemute/fragment/InstanceListFragment.kt

@@ -8,6 +8,8 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import autodispose2.androidx.lifecycle.AndroidLifecycleScopeProvider.from
+import autodispose2.autoDispose
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.components.instancemute.adapter.DomainMutesAdapter
@@ -20,9 +22,7 @@ import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.view.EndlessOnScrollListener
-import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider.from
-import com.uber.autodispose.autoDispose
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java

@@ -70,8 +70,8 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Single;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 import static com.keylesspalace.tusky.viewdata.PollViewDataKt.buildDescription;
 

app/src/main/java/com/keylesspalace/tusky/components/preference/EmojiPreference.kt

@@ -25,8 +25,8 @@ import com.keylesspalace.tusky.util.EmojiCompatFont.Companion.SYSTEM_DEFAULT
 import com.keylesspalace.tusky.util.EmojiCompatFont.Companion.TWEMOJI
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.disposables.Disposable
 import okhttp3.OkHttpClient
 import kotlin.system.exitProcess
 

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

@@ -28,8 +28,8 @@ import com.keylesspalace.tusky.entity.Relationship
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.*
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 import javax.inject.Inject
 
 class ReportViewModel @Inject constructor(

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

@@ -21,8 +21,8 @@ import androidx.paging.ItemKeyedDataSource
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.NetworkState
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.functions.BiFunction
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.functions.BiFunction
 import java.util.concurrent.Executor
 
 class StatusesDataSource(private val accountId: String,

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

@@ -19,7 +19,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.paging.DataSource
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.concurrent.Executor
 
 class StatusesDataSourceFactory(

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

@@ -21,7 +21,7 @@ import androidx.paging.toLiveData
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.BiListing
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.concurrent.Executors
 import javax.inject.Inject
 import javax.inject.Singleton

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

@@ -22,8 +22,8 @@ import androidx.paging.ItemKeyedDataSource
 import com.keylesspalace.tusky.entity.ScheduledStatus
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.NetworkState
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.addTo
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.addTo
 
 class ScheduledTootDataSourceFactory(
         private val mastodonApi: MastodonApi,

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

@@ -23,7 +23,7 @@ import com.keylesspalace.tusky.appstore.StatusScheduledEvent
 import com.keylesspalace.tusky.entity.ScheduledStatus
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.RxAwareViewModel
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import javax.inject.Inject
 
 class ScheduledTootViewModel @Inject constructor(

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

@@ -13,8 +13,9 @@ import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.network.TimelineCases
 import com.keylesspalace.tusky.util.*
 import com.keylesspalace.tusky.viewdata.StatusViewData
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Single
+
 import javax.inject.Inject
 
 class SearchViewModel @Inject constructor(

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

@@ -21,8 +21,8 @@ import com.keylesspalace.tusky.components.search.SearchType
 import com.keylesspalace.tusky.entity.SearchResult
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.NetworkState
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.addTo
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.kotlin.addTo
 import java.util.concurrent.Executor
 
 class SearchDataSource<T>(

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

@@ -20,7 +20,7 @@ import androidx.paging.DataSource
 import com.keylesspalace.tusky.components.search.SearchType
 import com.keylesspalace.tusky.entity.SearchResult
 import com.keylesspalace.tusky.network.MastodonApi
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.concurrent.Executor
 
 class SearchDataSourceFactory<T>(

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

@@ -22,7 +22,7 @@ import com.keylesspalace.tusky.components.search.SearchType
 import com.keylesspalace.tusky.entity.SearchResult
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.Listing
-import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.util.concurrent.Executors
 
 class SearchRepository<T>(private val mastodonApi: MastodonApi) {

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

@@ -38,6 +38,8 @@ import androidx.paging.PagedListAdapter
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
+import autodispose2.androidx.lifecycle.AndroidLifecycleScopeProvider.from
+import autodispose2.autoDispose
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.MainActivity
 import com.keylesspalace.tusky.R
@@ -60,9 +62,7 @@ import com.keylesspalace.tusky.util.StatusDisplayOptions
 import com.keylesspalace.tusky.view.showMuteAccountDialog
 import com.keylesspalace.tusky.viewdata.AttachmentViewData
 import com.keylesspalace.tusky.viewdata.StatusViewData
-import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider.from
-import com.uber.autodispose.autoDispose
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 
 class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concrete>>(), StatusActionListener {