diff --git a/app/build.gradle b/app/build.gradle index 0325e93aa..47880efac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -114,8 +114,8 @@ dependencies { implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion" implementation "org.greenrobot:eventbus:$eventbusVersion" annotationProcessor "org.greenrobot:eventbus-annotation-processor:$eventbusVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" implementation 'com.github.ByteHamster:SearchPreference:v2.5.0' implementation 'com.github.skydoves:balloon:1.5.3' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 911ea0098..8f4c40a06 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -100,7 +100,7 @@ android:windowSoftInputMode="stateAlwaysHidden" android:launchMode="singleTask" android:exported="true"> - + @@ -111,7 +111,7 @@ android:pathPrefix="/deeplink/main" android:scheme="https" /> - + diff --git a/app/src/main/java/de/danoeh/antennapod/RxJavaErrorHandlerSetup.java b/app/src/main/java/de/danoeh/antennapod/RxJavaErrorHandlerSetup.java index e909702ce..03addf7a1 100644 --- a/app/src/main/java/de/danoeh/antennapod/RxJavaErrorHandlerSetup.java +++ b/app/src/main/java/de/danoeh/antennapod/RxJavaErrorHandlerSetup.java @@ -1,8 +1,8 @@ package de.danoeh.antennapod; import android.util.Log; -import io.reactivex.exceptions.UndeliverableException; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.exceptions.UndeliverableException; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; public class RxJavaErrorHandlerSetup { private static final String TAG = "RxJavaErrorHandler"; diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java index d879042cf..7c1c85d55 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java @@ -33,10 +33,10 @@ import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.storage.importexport.OpmlElement; import de.danoeh.antennapod.storage.importexport.OpmlReader; import de.danoeh.antennapod.ui.common.ToolbarActivity; -import io.reactivex.Completable; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.apache.commons.io.ByteOrderMark; import org.apache.commons.io.input.BOMInputStream; diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java index 5b0269816..2b1108056 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/SelectSubscriptionActivity.java @@ -31,10 +31,10 @@ import de.danoeh.antennapod.storage.database.NavDrawerData; import de.danoeh.antennapod.databinding.SubscriptionSelectionActivityBinding; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.storage.preferences.UserPreferences; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; public class SelectSubscriptionActivity extends AppCompatActivity { diff --git a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java index 4ea33ca3e..c4670f9bd 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/SplashActivity.java @@ -9,9 +9,9 @@ import android.widget.Toast; import androidx.annotation.Nullable; import de.danoeh.antennapod.CrashReportWriter; import de.danoeh.antennapod.storage.database.PodDBAdapter; -import io.reactivex.Completable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Shows the AntennaPod logo while waiting for the main activity to start. diff --git a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodesListFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodesListFragment.java index 28b124579..b9fcf560f 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodesListFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodesListFragment.java @@ -50,11 +50,11 @@ import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedItemFilter; import de.danoeh.antennapod.ui.view.EmptyViewHandler; import de.danoeh.antennapod.ui.view.LiftOnScrollListener; -import io.reactivex.Completable; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Shows unread or recently published episodes diff --git a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/MediaSizeLoader.java b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/MediaSizeLoader.java index 57b29f3b3..0ef4e0e99 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/MediaSizeLoader.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/MediaSizeLoader.java @@ -5,10 +5,10 @@ import de.danoeh.antennapod.net.common.AntennapodHttpClient; import de.danoeh.antennapod.storage.database.DBWriter; import de.danoeh.antennapod.net.common.NetworkUtils; import de.danoeh.antennapod.model.feed.FeedMedia; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; import okhttp3.OkHttpClient; import okhttp3.Request; import android.util.Log; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/AddFeedFragment.java index 437466afc..3a4375444 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/AddFeedFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/AddFeedFragment.java @@ -43,9 +43,9 @@ import de.danoeh.antennapod.ui.appstartintent.OnlineFeedviewActivityStarter; import de.danoeh.antennapod.ui.discovery.OnlineSearchFragment; import de.danoeh.antennapod.ui.screen.feed.FeedItemlistFragment; import de.danoeh.antennapod.ui.view.LiftOnScrollListener; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import java.util.Collections; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/SearchFragment.java index d0cbb6fb1..554a0e7ce 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/SearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/SearchFragment.java @@ -47,10 +47,10 @@ import de.danoeh.antennapod.ui.episodeslist.EpisodeItemListRecyclerView; import de.danoeh.antennapod.ui.view.FloatingSelectMenu; import de.danoeh.antennapod.ui.view.LiftOnScrollListener; import de.danoeh.antennapod.ui.episodeslist.EpisodeItemViewHolder; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/chapter/ChaptersFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/chapter/ChaptersFragment.java index 45838d845..df8102d65 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/chapter/ChaptersFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/chapter/ChaptersFragment.java @@ -26,10 +26,10 @@ import de.danoeh.antennapod.model.playback.Playable; import de.danoeh.antennapod.playback.base.PlayerStatus; import de.danoeh.antennapod.playback.service.PlaybackController; import de.danoeh.antennapod.ui.chapters.ChapterUtils; -import io.reactivex.Maybe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/download/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/download/CompletedDownloadsFragment.java index c0827fb21..ab0e28596 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/download/CompletedDownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/download/CompletedDownloadsFragment.java @@ -47,10 +47,10 @@ import de.danoeh.antennapod.ui.episodeslist.EpisodeItemListRecyclerView; import de.danoeh.antennapod.ui.view.FloatingSelectMenu; import de.danoeh.antennapod.ui.view.LiftOnScrollListener; import de.danoeh.antennapod.ui.episodeslist.EpisodeItemViewHolder; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/download/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/download/DownloadLogFragment.java index b6c8875e1..993018a33 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/download/DownloadLogFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/download/DownloadLogFragment.java @@ -18,10 +18,10 @@ import de.danoeh.antennapod.storage.database.DBWriter; import de.danoeh.antennapod.databinding.DownloadLogFragmentBinding; import de.danoeh.antennapod.model.download.DownloadResult; import de.danoeh.antennapod.ui.view.EmptyViewHandler; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/BottomNavigation.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/BottomNavigation.java index afffe0812..e1443ee1a 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/BottomNavigation.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/BottomNavigation.java @@ -18,10 +18,10 @@ import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.model.feed.FeedItemFilter; import de.danoeh.antennapod.storage.database.DBReader; import de.danoeh.antennapod.storage.preferences.UserPreferences; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavDrawerFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavDrawerFragment.java index 116a46010..74089b9b8 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavDrawerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/NavDrawerFragment.java @@ -65,10 +65,10 @@ import de.danoeh.antennapod.storage.preferences.UserPreferences; import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter; import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.ui.screen.home.HomeFragment; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; public class NavDrawerFragment extends Fragment implements SharedPreferences.OnSharedPreferenceChangeListener { @VisibleForTesting diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemFragment.java index 9cabd04bd..7ebf5045b 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemFragment.java @@ -62,10 +62,10 @@ import de.danoeh.antennapod.ui.cleaner.ShownotesCleaner; import de.danoeh.antennapod.ui.episodes.ImageResourceUtils; import de.danoeh.antennapod.ui.screen.feed.FeedItemlistFragment; import de.danoeh.antennapod.ui.view.ShownotesWebView; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemPagerFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemPagerFragment.java index abf4ef591..0a211595e 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemPagerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/episode/ItemPagerFragment.java @@ -26,10 +26,10 @@ import de.danoeh.antennapod.event.FeedItemEvent; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.storage.database.DBReader; import de.danoeh.antennapod.ui.episodeslist.FeedItemMenuHandler; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java index baf5722a1..1ce9cb742 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedInfoFragment.java @@ -46,12 +46,12 @@ import de.danoeh.antennapod.ui.screen.feed.preferences.EditUrlSettingsDialog; import de.danoeh.antennapod.ui.statistics.StatisticsFragment; import de.danoeh.antennapod.ui.statistics.feed.FeedStatisticsDialogFragment; import de.danoeh.antennapod.ui.statistics.feed.FeedStatisticsFragment; -import io.reactivex.Completable; -import io.reactivex.Maybe; -import io.reactivex.MaybeOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.MaybeOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.apache.commons.lang3.StringUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java index 13f785bc9..0184ade98 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java @@ -67,12 +67,12 @@ import de.danoeh.antennapod.ui.screen.episode.ItemPagerFragment; import de.danoeh.antennapod.ui.screen.feed.preferences.FeedSettingsFragment; import de.danoeh.antennapod.ui.screen.subscriptions.FeedMenuHandler; import de.danoeh.antennapod.ui.swipeactions.SwipeActions; -import io.reactivex.Completable; -import io.reactivex.Maybe; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RemoveFeedDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RemoveFeedDialog.java index 52bb36867..9ea62aa68 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RemoveFeedDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RemoveFeedDialog.java @@ -14,9 +14,9 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.ui.common.ConfirmationDialog; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.storage.database.DBWriter; -import io.reactivex.Completable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; public class RemoveFeedDialog { private static final String TAG = "RemoveFeedDialog"; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsFragment.java index 6427f9cb2..b343ce974 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsFragment.java @@ -12,11 +12,11 @@ import com.google.android.material.appbar.MaterialToolbar; import de.danoeh.antennapod.R; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.storage.database.DBReader; -import io.reactivex.Maybe; -import io.reactivex.MaybeOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.MaybeOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Container fragment for feed settings fragment. diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsPreferenceFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsPreferenceFragment.java index 74dfbc490..b06db3f53 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsPreferenceFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsPreferenceFragment.java @@ -34,11 +34,11 @@ import de.danoeh.antennapod.storage.database.DBReader; import de.danoeh.antennapod.storage.database.DBWriter; import de.danoeh.antennapod.storage.preferences.UserPreferences; import de.danoeh.antennapod.ui.preferences.screen.synchronization.AuthenticationDialog; -import io.reactivex.Maybe; -import io.reactivex.MaybeOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.MaybeOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import java.util.Collections; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/TagSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/TagSettingsDialog.java index accc5cc60..5e5d59527 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/TagSettingsDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/TagSettingsDialog.java @@ -30,9 +30,9 @@ import de.danoeh.antennapod.model.feed.FeedCounter; import de.danoeh.antennapod.model.feed.FeedOrder; import de.danoeh.antennapod.model.feed.FeedPreferences; import de.danoeh.antennapod.ui.view.ItemOffsetDecoration; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; public class TagSettingsDialog extends DialogFragment { public static final String TAG = "TagSettingsDialog"; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/HomeFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/HomeFragment.java index eb8b7da04..081916584 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/HomeFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/HomeFragment.java @@ -32,10 +32,10 @@ import de.danoeh.antennapod.ui.screen.home.sections.SubscriptionsSection; import de.danoeh.antennapod.ui.screen.home.settingsdialog.HomePreferences; import de.danoeh.antennapod.ui.screen.home.settingsdialog.HomeSectionsSettingsDialog; import de.danoeh.antennapod.ui.view.LiftOnScrollListener; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/DownloadsSection.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/DownloadsSection.java index 6ff6ef7a6..7d8d3a903 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/DownloadsSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/DownloadsSection.java @@ -28,10 +28,10 @@ import de.danoeh.antennapod.ui.episodeslist.EpisodeItemViewHolder; import de.danoeh.antennapod.ui.screen.download.CompletedDownloadsFragment; import de.danoeh.antennapod.ui.screen.home.HomeSection; import de.danoeh.antennapod.ui.swipeactions.SwipeActions; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/EchoSection.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/EchoSection.java index d8df470f0..11db359e1 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/EchoSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/EchoSection.java @@ -17,10 +17,10 @@ import de.danoeh.antennapod.storage.database.StatisticsItem; import de.danoeh.antennapod.ui.echo.EchoActivity; import de.danoeh.antennapod.ui.echo.EchoConfig; import de.danoeh.antennapod.ui.screen.home.HomeFragment; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; public class EchoSection extends Fragment { private HomeSectionEchoBinding viewBinding; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/EpisodesSurpriseSection.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/EpisodesSurpriseSection.java index c552f35a6..89cbfb9cf 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/EpisodesSurpriseSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/EpisodesSurpriseSection.java @@ -24,10 +24,10 @@ import de.danoeh.antennapod.ui.episodeslist.HorizontalItemListAdapter; import de.danoeh.antennapod.ui.episodeslist.HorizontalItemViewHolder; import de.danoeh.antennapod.ui.screen.AllEpisodesFragment; import de.danoeh.antennapod.ui.screen.home.HomeSection; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/InboxSection.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/InboxSection.java index 1fe56643d..bd31f9fcd 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/InboxSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/InboxSection.java @@ -35,10 +35,10 @@ import de.danoeh.antennapod.ui.episodeslist.EpisodeItemListAdapter; import de.danoeh.antennapod.ui.screen.InboxFragment; import de.danoeh.antennapod.ui.screen.home.HomeSection; import de.danoeh.antennapod.ui.swipeactions.SwipeActions; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; public class InboxSection extends HomeSection { public static final String TAG = "InboxSection"; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/QueueSection.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/QueueSection.java index f467edb0e..78779be92 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/QueueSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/QueueSection.java @@ -24,10 +24,10 @@ import de.danoeh.antennapod.ui.screen.queue.QueueFragment; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.ui.screen.home.HomeSection; import de.danoeh.antennapod.ui.episodeslist.HorizontalItemViewHolder; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/SubscriptionsSection.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/SubscriptionsSection.java index 80885b5ef..8bcfbe2fe 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/SubscriptionsSection.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/sections/SubscriptionsSection.java @@ -22,10 +22,10 @@ import de.danoeh.antennapod.ui.screen.subscriptions.SubscriptionFragment; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.ui.screen.home.HomeSection; import de.danoeh.antennapod.ui.statistics.StatisticsFragment; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java index 62b902236..f920c350f 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java @@ -49,11 +49,11 @@ import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.ui.preferences.screen.synchronization.AuthenticationDialog; import de.danoeh.antennapod.ui.screen.download.DownloadErrorLabel; import de.danoeh.antennapod.ui.screen.feed.FeedItemlistFragment; -import io.reactivex.Maybe; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/TranscriptDialogFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/TranscriptDialogFragment.java index e289d6e61..40873d341 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/TranscriptDialogFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/TranscriptDialogFragment.java @@ -31,10 +31,10 @@ import de.danoeh.antennapod.model.feed.TranscriptSegment; import de.danoeh.antennapod.model.playback.Playable; import de.danoeh.antennapod.playback.service.PlaybackController; import de.danoeh.antennapod.ui.transcript.TranscriptUtils; -import io.reactivex.Maybe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/AudioPlayerFragment.java index dfa446770..2a9e2f0b7 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/AudioPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/AudioPlayerFragment.java @@ -64,10 +64,10 @@ import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.model.playback.Playable; import de.danoeh.antennapod.playback.cast.CastEnabledActivity; import de.danoeh.antennapod.storage.preferences.UserPreferences; -import io.reactivex.Maybe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Shows the audio player. diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/CoverFragment.java index d4b84bda4..532bb92fd 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/CoverFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/CoverFragment.java @@ -44,10 +44,10 @@ import de.danoeh.antennapod.model.feed.EmbeddedChapterImage; import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.model.playback.Playable; import de.danoeh.antennapod.ui.episodes.ImageResourceUtils; -import io.reactivex.Maybe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.apache.commons.lang3.StringUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/ExternalPlayerFragment.java index 67514697f..72e55b76b 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/ExternalPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/ExternalPlayerFragment.java @@ -26,10 +26,10 @@ import de.danoeh.antennapod.playback.service.PlaybackController; import de.danoeh.antennapod.playback.service.PlaybackService; import de.danoeh.antennapod.ui.episodes.ImageResourceUtils; import de.danoeh.antennapod.ui.screen.playback.PlayButton; -import io.reactivex.Maybe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/ItemDescriptionFragment.java index 274d4fd16..fc28422b2 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/ItemDescriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/audio/ItemDescriptionFragment.java @@ -20,10 +20,10 @@ import de.danoeh.antennapod.ui.cleaner.ShownotesCleaner; import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.model.playback.Playable; import de.danoeh.antennapod.ui.view.ShownotesWebView; -import io.reactivex.Maybe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Maybe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Displays the description of a Playable object in a Webview. diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/video/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/video/VideoplayerActivity.java index e7f33406c..009774655 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/video/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/video/VideoplayerActivity.java @@ -68,10 +68,10 @@ import de.danoeh.antennapod.ui.screen.playback.MediaPlayerErrorDialog; import de.danoeh.antennapod.ui.screen.playback.PlaybackControlsDialog; import de.danoeh.antennapod.ui.screen.playback.SleepTimerDialog; import de.danoeh.antennapod.ui.screen.playback.VariableSpeedDialog; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.apache.commons.lang3.StringUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ImportExportPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ImportExportPreferencesFragment.java index 8166ba683..dae4254fe 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ImportExportPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ImportExportPreferencesFragment.java @@ -37,11 +37,11 @@ import de.danoeh.antennapod.storage.importexport.HtmlWriter; import de.danoeh.antennapod.storage.importexport.OpmlWriter; import de.danoeh.antennapod.storage.preferences.UserPreferences; import de.danoeh.antennapod.ui.preferences.screen.AnimatedPreferenceFragment; -import io.reactivex.Completable; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.io.File; import java.io.FileOutputStream; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java index dd1e712a8..a9e40c342 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java @@ -28,10 +28,10 @@ import de.danoeh.antennapod.net.common.AntennapodHttpClient; import de.danoeh.antennapod.model.download.ProxyConfig; import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.ui.preferences.databinding.ProxySettingsBinding; -import io.reactivex.Completable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import okhttp3.Credentials; import okhttp3.OkHttpClient; import okhttp3.Request; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/queue/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/queue/QueueFragment.java index 75a20345e..fe938eddd 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/queue/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/queue/QueueFragment.java @@ -69,10 +69,10 @@ import de.danoeh.antennapod.ui.view.EmptyViewHandler; import de.danoeh.antennapod.ui.episodeslist.EpisodeItemListRecyclerView; import de.danoeh.antennapod.ui.view.LiftOnScrollListener; import de.danoeh.antennapod.ui.episodeslist.EpisodeItemViewHolder; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Shows all items in the queue. diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/rating/RatingDialogManager.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/rating/RatingDialogManager.java index 89a984e42..246bc7a16 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/rating/RatingDialogManager.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/rating/RatingDialogManager.java @@ -10,10 +10,10 @@ import androidx.fragment.app.FragmentActivity; import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.storage.database.DBReader; import de.danoeh.antennapod.storage.database.StatisticsItem; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import kotlin.Pair; public class RatingDialogManager { diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/FeedMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/FeedMenuHandler.java index 9b57f9716..99db78b6b 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/FeedMenuHandler.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/FeedMenuHandler.java @@ -15,9 +15,9 @@ import de.danoeh.antennapod.ui.screen.feed.RenameFeedDialog; import de.danoeh.antennapod.ui.screen.feed.preferences.TagSettingsDialog; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.ui.share.ShareUtils; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.Collections; import java.util.concurrent.Callable; diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionFragment.java index 513adf758..1f00251d0 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/SubscriptionFragment.java @@ -52,10 +52,10 @@ import de.danoeh.antennapod.storage.preferences.UserPreferences; import de.danoeh.antennapod.ui.statistics.StatisticsFragment; import de.danoeh.antennapod.ui.view.EmptyViewHandler; import de.danoeh.antennapod.ui.view.LiftOnScrollListener; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Fragment for displaying feed subscriptions diff --git a/build.gradle b/build.gradle index 3e5b365d2..6d697830e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.agpVersion = "8.6.0" + ext.agpVersion = "8.11.0" } plugins { id 'com.android.application' version "$agpVersion" apply false @@ -10,28 +10,28 @@ plugins { project.ext { // AndroidX - annotationVersion = "1.4.0" - appcompatVersion = "1.5.1" - coreVersion = "1.9.0" - fragmentVersion = "1.8.4" + annotationVersion = "1.9.1" + appcompatVersion = "1.7.1" + coreVersion = "1.16.0" + fragmentVersion = "1.8.9" mediaVersion = "1.6.0" media3Version = "1.1.1" paletteVersion = "1.0.0" - preferenceVersion = "1.1.1" - recyclerViewVersion = "1.2.1" - viewPager2Version = "1.1.0-beta01" - workManagerVersion = "2.7.1" + preferenceVersion = "1.2.1" + recyclerViewVersion = "1.4.0" + viewPager2Version = "1.1.0" + workManagerVersion = "2.10.3" googleMaterialVersion = "1.12.0" // Third-party - commonslangVersion = "3.6" - commonsioVersion = "2.5" + commonslangVersion = "3.18.0" + commonsioVersion = "2.20.0" jsoupVersion = "1.15.1" - glideVersion = "4.13.2" + glideVersion = "4.16.0" okhttpVersion = "4.12.0" eventbusVersion = "3.3.1" - rxAndroidVersion = "2.1.1" - rxJavaVersion = "2.2.2" + rxAndroidVersion = "3.0.2" + rxJavaVersion = "3.1.5" //Tests awaitilityVersion = "3.1.6" diff --git a/common.gradle b/common.gradle index 74b68b3b9..699ed0a54 100644 --- a/common.gradle +++ b/common.gradle @@ -45,7 +45,7 @@ android { } lint { - disable "GradleDependency", "OutdatedLibrary" + disable "GradleDependency", "OutdatedLibrary", "AndroidGradlePluginVersion" checkDependencies true warningsAsErrors true abortOnError true diff --git a/config/spotbugs/exclude.xml b/config/spotbugs/exclude.xml index 295123e6b..8e3626d33 100644 --- a/config/spotbugs/exclude.xml +++ b/config/spotbugs/exclude.xml @@ -52,10 +52,6 @@ - - - - @@ -68,8 +64,10 @@ - - + + + + @@ -86,4 +84,5 @@ + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b8..68f6c2ca1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ +#Sun Aug 17 17:07:23 CEST 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/net/discovery/build.gradle b/net/discovery/build.gradle index ffed5485b..dc0625b65 100644 --- a/net/discovery/build.gradle +++ b/net/discovery/build.gradle @@ -26,9 +26,9 @@ dependencies { annotationProcessor "androidx.annotation:annotation:$annotationVersion" - implementation 'com.github.mfietz:fyydlin:0.5.0' + implementation 'com.github.mfietz:fyydlin:e1d25f347641fe5e26c4c2b9756d4e9001a398dd' - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" } diff --git a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/CombinedSearcher.java b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/CombinedSearcher.java index 6cbf8eb2e..084f938d3 100644 --- a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/CombinedSearcher.java +++ b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/CombinedSearcher.java @@ -2,11 +2,11 @@ package de.danoeh.antennapod.net.discovery; import android.text.TextUtils; import android.util.Log; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.ArrayList; import java.util.Collections; diff --git a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/FyydPodcastSearcher.java b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/FyydPodcastSearcher.java index 2899af677..d086a720e 100644 --- a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/FyydPodcastSearcher.java +++ b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/FyydPodcastSearcher.java @@ -4,10 +4,10 @@ import de.danoeh.antennapod.net.common.AntennapodHttpClient; import de.mfietz.fyydlin.FyydClient; import de.mfietz.fyydlin.FyydResponse; import de.mfietz.fyydlin.SearchHit; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.ArrayList; import java.util.List; diff --git a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/ItunesPodcastSearcher.java b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/ItunesPodcastSearcher.java index a50a33452..bca275479 100644 --- a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/ItunesPodcastSearcher.java +++ b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/ItunesPodcastSearcher.java @@ -1,10 +1,10 @@ package de.danoeh.antennapod.net.discovery; import de.danoeh.antennapod.net.common.AntennapodHttpClient; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; diff --git a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastIndexPodcastSearcher.java b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastIndexPodcastSearcher.java index c777827df..520c6a3a9 100644 --- a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastIndexPodcastSearcher.java +++ b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastIndexPodcastSearcher.java @@ -17,10 +17,10 @@ import java.util.List; import java.util.Locale; import java.util.TimeZone; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; diff --git a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastSearcher.java b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastSearcher.java index 76edbf843..d9dfe9caf 100644 --- a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastSearcher.java +++ b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastSearcher.java @@ -1,6 +1,6 @@ package de.danoeh.antennapod.net.discovery; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; import java.util.List; public interface PodcastSearcher { diff --git a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastSearcherRegistry.java b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastSearcherRegistry.java index ee869287f..6f7a38cec 100644 --- a/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastSearcherRegistry.java +++ b/net/discovery/src/main/java/de/danoeh/antennapod/net/discovery/PodcastSearcherRegistry.java @@ -1,6 +1,6 @@ package de.danoeh.antennapod.net.discovery; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Single; import java.util.ArrayList; import java.util.List; diff --git a/net/download/service/build.gradle b/net/download/service/build.gradle index 4aee1acd3..d957e6112 100644 --- a/net/download/service/build.gradle +++ b/net/download/service/build.gradle @@ -36,8 +36,8 @@ dependencies { implementation "org.apache.commons:commons-lang3:$commonslangVersion" implementation "org.greenrobot:eventbus:$eventbusVersion" implementation "com.github.bumptech.glide:glide:$glideVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" implementation "com.google.guava:guava:31.0.1-android" testImplementation "junit:junit:$junitVersion" diff --git a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/DownloadServiceInterfaceImpl.java b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/DownloadServiceInterfaceImpl.java index 8581b7281..20b26f8aa 100644 --- a/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/DownloadServiceInterfaceImpl.java +++ b/net/download/service/src/main/java/de/danoeh/antennapod/net/download/service/feed/DownloadServiceInterfaceImpl.java @@ -15,8 +15,8 @@ import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.net.download.serviceinterface.DownloadServiceInterface; import de.danoeh.antennapod.storage.preferences.UserPreferences; -import io.reactivex.Observable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/net/sync/gpoddernet/build.gradle b/net/sync/gpoddernet/build.gradle index 3eec12b58..9090a3ea5 100644 --- a/net/sync/gpoddernet/build.gradle +++ b/net/sync/gpoddernet/build.gradle @@ -16,8 +16,8 @@ dependencies { implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" implementation "org.apache.commons:commons-lang3:$commonslangVersion" implementation "commons-io:commons-io:$commonsioVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" testImplementation "junit:junit:$junitVersion" } diff --git a/net/sync/gpoddernet/src/main/java/de/danoeh/antennapod/net/sync/nextcloud/NextcloudLoginFlow.java b/net/sync/gpoddernet/src/main/java/de/danoeh/antennapod/net/sync/nextcloud/NextcloudLoginFlow.java index 254be269f..3ecc42146 100644 --- a/net/sync/gpoddernet/src/main/java/de/danoeh/antennapod/net/sync/nextcloud/NextcloudLoginFlow.java +++ b/net/sync/gpoddernet/src/main/java/de/danoeh/antennapod/net/sync/nextcloud/NextcloudLoginFlow.java @@ -4,10 +4,10 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import de.danoeh.antennapod.net.sync.HostnameParser; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import okhttp3.MediaType; import okhttp3.OkHttpClient; import okhttp3.Request; diff --git a/net/sync/service-interface/build.gradle b/net/sync/service-interface/build.gradle index fd170b36a..97dcbcf11 100644 --- a/net/sync/service-interface/build.gradle +++ b/net/sync/service-interface/build.gradle @@ -12,6 +12,6 @@ dependencies { implementation project(':storage:preferences') annotationProcessor "androidx.annotation:annotation:$annotationVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" } diff --git a/net/sync/service/build.gradle b/net/sync/service/build.gradle index 03b81a39c..d89ec3fd4 100644 --- a/net/sync/service/build.gradle +++ b/net/sync/service/build.gradle @@ -27,8 +27,8 @@ dependencies { implementation "org.greenrobot:eventbus:$eventbusVersion" implementation "org.apache.commons:commons-lang3:$commonslangVersion" implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" implementation "com.google.guava:guava:31.0.1-android" testImplementation "junit:junit:$junitVersion" diff --git a/net/sync/service/src/main/java/de/danoeh/antennapod/net/sync/service/LockingAsyncExecutor.java b/net/sync/service/src/main/java/de/danoeh/antennapod/net/sync/service/LockingAsyncExecutor.java index 83bbfe8b9..a78d4e72d 100644 --- a/net/sync/service/src/main/java/de/danoeh/antennapod/net/sync/service/LockingAsyncExecutor.java +++ b/net/sync/service/src/main/java/de/danoeh/antennapod/net/sync/service/LockingAsyncExecutor.java @@ -2,8 +2,8 @@ package de.danoeh.antennapod.net.sync.service; import java.util.concurrent.locks.ReentrantLock; -import io.reactivex.Completable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.schedulers.Schedulers; public class LockingAsyncExecutor { diff --git a/playback/service/build.gradle b/playback/service/build.gradle index 573d9a96b..5363bb2b9 100644 --- a/playback/service/build.gradle +++ b/playback/service/build.gradle @@ -33,8 +33,8 @@ dependencies { implementation "androidx.media3:media3-exoplayer:$media3Version" implementation "androidx.media3:media3-ui:$media3Version" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" implementation "org.greenrobot:eventbus:$eventbusVersion" implementation "com.github.bumptech.glide:glide:$glideVersion" implementation "org.apache.commons:commons-lang3:$commonslangVersion" diff --git a/playback/service/src/main/AndroidManifest.xml b/playback/service/src/main/AndroidManifest.xml index cbeda1fb7..b03e3cc0a 100644 --- a/playback/service/src/main/AndroidManifest.xml +++ b/playback/service/src/main/AndroidManifest.xml @@ -46,7 +46,8 @@ android:exported="true" android:label="@string/app_name" android:icon="@drawable/ic_notification" - android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"> + android:permission="android.permission.BIND_QUICK_SETTINGS_TILE" + tools:targetApi="24"> diff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java index 6a810383c..e8f4dd948 100644 --- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java +++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java @@ -66,7 +66,7 @@ import de.danoeh.antennapod.playback.service.internal.PlaybackVolumeUpdater; import de.danoeh.antennapod.playback.service.internal.WearMediaSession; import de.danoeh.antennapod.ui.notifications.NotificationUtils; import de.danoeh.antennapod.ui.widget.WidgetUpdater; -import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.rxjava3.disposables.CompositeDisposable; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -109,12 +109,12 @@ import de.danoeh.antennapod.playback.cast.CastStateListener; import de.danoeh.antennapod.storage.preferences.UserPreferences; import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter; import de.danoeh.antennapod.ui.appstartintent.VideoPlayerActivityStarter; -import io.reactivex.Completable; -import io.reactivex.Observable; -import io.reactivex.Single; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -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.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; /** * Controls the MediaPlayer that plays a FeedMedia-file diff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/ExoPlayerWrapper.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/ExoPlayerWrapper.java index 53a254c88..a8b510fdb 100644 --- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/ExoPlayerWrapper.java +++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/ExoPlayerWrapper.java @@ -50,9 +50,9 @@ import de.danoeh.antennapod.playback.service.R; import de.danoeh.antennapod.net.common.HttpCredentialEncoder; import de.danoeh.antennapod.net.common.NetworkUtils; import de.danoeh.antennapod.model.playback.Playable; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; import java.io.File; import java.util.ArrayList; diff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/PlaybackServiceTaskManager.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/PlaybackServiceTaskManager.java index 204f4436d..0b79515a2 100644 --- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/PlaybackServiceTaskManager.java +++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/PlaybackServiceTaskManager.java @@ -8,16 +8,16 @@ import android.util.Log; import de.danoeh.antennapod.ui.chapters.ChapterUtils; import de.danoeh.antennapod.ui.widget.WidgetUpdater; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import de.danoeh.antennapod.model.playback.Playable; -import io.reactivex.Completable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; /** diff --git a/storage/importexport/build.gradle b/storage/importexport/build.gradle index 8f3599dc0..187be4b15 100644 --- a/storage/importexport/build.gradle +++ b/storage/importexport/build.gradle @@ -23,8 +23,8 @@ dependencies { implementation "androidx.work:work-runtime:$workManagerVersion" implementation "commons-io:commons-io:$commonsioVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" implementation "org.greenrobot:eventbus:$eventbusVersion" implementation "com.google.guava:guava:31.0.1-android" } diff --git a/ui/discovery/build.gradle b/ui/discovery/build.gradle index 60b04984b..a70df62c2 100644 --- a/ui/discovery/build.gradle +++ b/ui/discovery/build.gradle @@ -19,8 +19,8 @@ dependencies { annotationProcessor "androidx.annotation:annotation:$annotationVersion" implementation "androidx.appcompat:appcompat:$appcompatVersion" implementation "com.google.android.material:material:$googleMaterialVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" implementation "com.github.bumptech.glide:glide:$glideVersion" implementation "org.greenrobot:eventbus:$eventbusVersion" } diff --git a/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/DiscoveryFragment.java b/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/DiscoveryFragment.java index 9cdcdbcb9..61b50f1b4 100644 --- a/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/DiscoveryFragment.java +++ b/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/DiscoveryFragment.java @@ -26,10 +26,10 @@ import de.danoeh.antennapod.event.DiscoveryDefaultUpdateEvent; import de.danoeh.antennapod.net.discovery.ItunesTopListLoader; import de.danoeh.antennapod.net.discovery.PodcastSearchResult; import de.danoeh.antennapod.ui.appstartintent.OnlineFeedviewActivityStarter; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import java.util.ArrayList; diff --git a/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/OnlineSearchFragment.java b/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/OnlineSearchFragment.java index 6b38a5f25..4c9300034 100644 --- a/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/OnlineSearchFragment.java +++ b/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/OnlineSearchFragment.java @@ -26,7 +26,7 @@ import de.danoeh.antennapod.net.discovery.PodcastSearchResult; import de.danoeh.antennapod.net.discovery.PodcastSearcher; import de.danoeh.antennapod.net.discovery.PodcastSearcherRegistry; import de.danoeh.antennapod.ui.appstartintent.OnlineFeedviewActivityStarter; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.disposables.Disposable; public class OnlineSearchFragment extends Fragment { diff --git a/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/QuickFeedDiscoveryFragment.java b/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/QuickFeedDiscoveryFragment.java index 3e2c7d4e7..3f991644d 100644 --- a/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/QuickFeedDiscoveryFragment.java +++ b/ui/discovery/src/main/java/de/danoeh/antennapod/ui/discovery/QuickFeedDiscoveryFragment.java @@ -19,10 +19,10 @@ import de.danoeh.antennapod.net.discovery.PodcastSearchResult; import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter; import de.danoeh.antennapod.ui.appstartintent.OnlineFeedviewActivityStarter; import de.danoeh.antennapod.ui.discovery.databinding.QuickFeedDiscoveryBinding; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/ui/echo/build.gradle b/ui/echo/build.gradle index 847164448..a768e29b1 100644 --- a/ui/echo/build.gradle +++ b/ui/echo/build.gradle @@ -22,7 +22,7 @@ dependencies { annotationProcessor "androidx.annotation:annotation:$annotationVersion" implementation "androidx.appcompat:appcompat:$appcompatVersion" implementation "com.google.android.material:material:$googleMaterialVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" implementation "com.github.bumptech.glide:glide:$glideVersion" } diff --git a/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/EchoActivity.java b/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/EchoActivity.java index 33bf85aaa..a0def88d6 100644 --- a/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/EchoActivity.java +++ b/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/EchoActivity.java @@ -17,11 +17,11 @@ import de.danoeh.antennapod.ui.echo.screen.IntroScreen; import de.danoeh.antennapod.ui.echo.screen.QueueScreen; import de.danoeh.antennapod.ui.echo.screen.ThanksScreen; import de.danoeh.antennapod.ui.echo.screen.TimeReleasePlayScreen; -import io.reactivex.Flowable; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.Collections; import java.util.List; diff --git a/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/FinalShareScreen.java b/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/FinalShareScreen.java index 770ca7766..ed8d7fb64 100644 --- a/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/FinalShareScreen.java +++ b/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/FinalShareScreen.java @@ -21,10 +21,10 @@ import de.danoeh.antennapod.ui.echo.EchoConfig; import de.danoeh.antennapod.ui.echo.R; import de.danoeh.antennapod.ui.echo.background.FinalShareBackground; import de.danoeh.antennapod.ui.echo.databinding.SimpleEchoScreenBinding; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.io.File; import java.io.FileOutputStream; diff --git a/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/QueueScreen.java b/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/QueueScreen.java index 4b192997c..af2da2af2 100644 --- a/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/QueueScreen.java +++ b/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/QueueScreen.java @@ -13,10 +13,10 @@ import de.danoeh.antennapod.ui.echo.R; import de.danoeh.antennapod.ui.echo.background.StripesBackground; import de.danoeh.antennapod.ui.echo.databinding.SimpleEchoScreenBinding; import de.danoeh.antennapod.ui.episodes.PlaybackSpeedUtils; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.Calendar; diff --git a/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/TimeReleasePlayScreen.java b/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/TimeReleasePlayScreen.java index 126522782..06f208b0d 100644 --- a/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/TimeReleasePlayScreen.java +++ b/ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/screen/TimeReleasePlayScreen.java @@ -10,10 +10,10 @@ import de.danoeh.antennapod.ui.echo.EchoConfig; import de.danoeh.antennapod.ui.echo.R; import de.danoeh.antennapod.ui.echo.background.RotatingSquaresBackground; import de.danoeh.antennapod.ui.echo.databinding.SimpleEchoScreenBinding; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; public class TimeReleasePlayScreen extends EchoScreen { private static final String TAG = "TimeReleasePlayScreen"; diff --git a/ui/preferences/build.gradle b/ui/preferences/build.gradle index d3e81b338..b4fc79f6d 100644 --- a/ui/preferences/build.gradle +++ b/ui/preferences/build.gradle @@ -40,8 +40,8 @@ dependencies { implementation "androidx.preference:preference:$preferenceVersion" implementation "androidx.work:work-runtime:$workManagerVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" implementation "com.github.bumptech.glide:glide:$glideVersion" implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion" diff --git a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/DevelopersFragment.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/DevelopersFragment.java index c10ca4280..269981518 100644 --- a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/DevelopersFragment.java +++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/DevelopersFragment.java @@ -9,11 +9,11 @@ import androidx.annotation.Nullable; import androidx.fragment.app.ListFragment; import de.danoeh.antennapod.ui.common.IntentUtils; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/LicensesFragment.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/LicensesFragment.java index e4595d08d..0a2c6d236 100644 --- a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/LicensesFragment.java +++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/LicensesFragment.java @@ -12,11 +12,11 @@ import androidx.fragment.app.ListFragment; import com.google.android.material.transition.MaterialSharedAxis; import de.danoeh.antennapod.ui.common.IntentUtils; import de.danoeh.antennapod.ui.preferences.R; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.NodeList; diff --git a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/SpecialThanksFragment.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/SpecialThanksFragment.java index 32335880c..07b524fe1 100644 --- a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/SpecialThanksFragment.java +++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/SpecialThanksFragment.java @@ -9,11 +9,11 @@ import androidx.annotation.Nullable; import androidx.fragment.app.ListFragment; import de.danoeh.antennapod.ui.common.IntentUtils; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/TranslatorsFragment.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/TranslatorsFragment.java index 3d2079fce..5528e0294 100644 --- a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/TranslatorsFragment.java +++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/about/TranslatorsFragment.java @@ -6,11 +6,11 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.ListFragment; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleOnSubscribe; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/GpodderAuthenticationFragment.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/GpodderAuthenticationFragment.java index 3aa76a0d9..9c7029495 100644 --- a/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/GpodderAuthenticationFragment.java +++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/synchronization/GpodderAuthenticationFragment.java @@ -26,10 +26,10 @@ import de.danoeh.antennapod.storage.preferences.SynchronizationSettings; import de.danoeh.antennapod.net.sync.gpoddernet.GpodnetService; import de.danoeh.antennapod.net.sync.gpoddernet.model.GpodnetDevice; import de.danoeh.antennapod.ui.preferences.R; -import io.reactivex.Completable; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.List; import java.util.Locale; diff --git a/ui/statistics/build.gradle b/ui/statistics/build.gradle index be86665a7..4b1ae2a1f 100644 --- a/ui/statistics/build.gradle +++ b/ui/statistics/build.gradle @@ -26,6 +26,6 @@ dependencies { implementation "org.greenrobot:eventbus:$eventbusVersion" implementation "com.github.bumptech.glide:glide:$glideVersion" - implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" - implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "io.reactivex.rxjava3:rxandroid:$rxAndroidVersion" + implementation "io.reactivex.rxjava3:rxjava:$rxJavaVersion" } diff --git a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/StatisticsFragment.java b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/StatisticsFragment.java index ef3cc4ef5..be27fb9b8 100644 --- a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/StatisticsFragment.java +++ b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/StatisticsFragment.java @@ -27,10 +27,10 @@ import de.danoeh.antennapod.ui.echo.EchoConfig; import de.danoeh.antennapod.ui.statistics.downloads.DownloadStatisticsFragment; import de.danoeh.antennapod.ui.statistics.subscriptions.SubscriptionStatisticsFragment; import de.danoeh.antennapod.ui.statistics.years.YearsStatisticsFragment; -import io.reactivex.Completable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; /** diff --git a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/downloads/DownloadStatisticsFragment.java b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/downloads/DownloadStatisticsFragment.java index 7a845d6e6..8d69d75ad 100644 --- a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/downloads/DownloadStatisticsFragment.java +++ b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/downloads/DownloadStatisticsFragment.java @@ -16,10 +16,10 @@ import androidx.recyclerview.widget.RecyclerView; import de.danoeh.antennapod.storage.database.DBReader; import de.danoeh.antennapod.ui.statistics.R; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.Collections; diff --git a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/feed/FeedStatisticsFragment.java b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/feed/FeedStatisticsFragment.java index 16bf06ed5..1f41e547b 100644 --- a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/feed/FeedStatisticsFragment.java +++ b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/feed/FeedStatisticsFragment.java @@ -20,10 +20,10 @@ import de.danoeh.antennapod.model.feed.SortOrder; import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.ui.statistics.R; import de.danoeh.antennapod.ui.statistics.databinding.FeedStatisticsBinding; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.ArrayList; import java.util.Calendar; diff --git a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/subscriptions/SubscriptionStatisticsFragment.java b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/subscriptions/SubscriptionStatisticsFragment.java index fca8b903f..8264aeb55 100644 --- a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/subscriptions/SubscriptionStatisticsFragment.java +++ b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/subscriptions/SubscriptionStatisticsFragment.java @@ -19,10 +19,10 @@ import de.danoeh.antennapod.event.StatisticsEvent; import de.danoeh.antennapod.storage.database.DBReader; import de.danoeh.antennapod.ui.statistics.R; import de.danoeh.antennapod.ui.statistics.StatisticsFragment; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/years/YearsStatisticsFragment.java b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/years/YearsStatisticsFragment.java index 296bc14fd..b0a47ea6b 100644 --- a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/years/YearsStatisticsFragment.java +++ b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/years/YearsStatisticsFragment.java @@ -15,10 +15,10 @@ import androidx.recyclerview.widget.RecyclerView; import de.danoeh.antennapod.event.StatisticsEvent; import de.danoeh.antennapod.storage.database.DBReader; import de.danoeh.antennapod.ui.statistics.R; -import io.reactivex.Observable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode;