Merge pull request #1189 from nextcloud/rxjava3

upgrade to rxjava3
nextcloud · Apr 13, 2023 · d47b381 · d47b381
2 parents 184cbaf + e72dbf1
commit d47b381
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 62 deletions.
diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle
@@ -130,8 +130,7 @@ dependencies {
     // implementation 'com.google.android.gms:play-services:4.2.42'
     // implementation project(path: ':MaterialShowcaseView:library', configuration: 'default')
     // implementation project(':Android-SingleSignOn:lib')
-    implementation 'com.github.nextcloud:Android-SingleSignOn:0.6.1'
-
+    implementation 'com.github.nextcloud:Android-SingleSignOn:0.7.0'
     implementation "androidx.core:core:1.9.0"
     implementation 'androidx.annotation:annotation:1.3.0'
     implementation "androidx.appcompat:appcompat:1.6.1"
@@ -177,11 +176,11 @@ dependencies {
     implementation "com.google.dagger:dagger:${DAGGER_VERSION}"
     annotationProcessor "com.google.dagger:dagger-compiler:${DAGGER_VERSION}"
 
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
-    implementation "com.squareup.retrofit2:adapter-rxjava2:$RETROFIT_VERSION"
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.5'
+    implementation "com.squareup.retrofit2:adapter-rxjava3:$RETROFIT_VERSION"
 
     implementation "com.squareup.retrofit2:retrofit:$RETROFIT_VERSION"
     implementation "com.squareup.retrofit2:converter-gson:$RETROFIT_VERSION"

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/AddFolderDialogFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/AddFolderDialogFragment.java
@@ -22,8 +22,8 @@
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
 import de.luhmer.owncloudnewsreader.databinding.FragmentDialogAddFolderBinding;
 import de.luhmer.owncloudnewsreader.di.ApiProvider;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 public class AddFolderDialogFragment extends DialogFragment {

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/FolderOptionsDialogFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/FolderOptionsDialogFragment.java
@@ -26,11 +26,11 @@
 import de.luhmer.owncloudnewsreader.databinding.FragmentDialogFolderoptionsBinding;
 import de.luhmer.owncloudnewsreader.di.ApiProvider;
 import de.luhmer.owncloudnewsreader.reader.nextcloud.NewsAPI;
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 public class FolderOptionsDialogFragment extends DialogFragment {

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogActivity.java
@@ -69,11 +69,11 @@
 import de.luhmer.owncloudnewsreader.model.NextcloudNewsVersion;
 import de.luhmer.owncloudnewsreader.ssl.MemorizingTrustManager;
 import de.luhmer.owncloudnewsreader.ssl.OkHttpSSLClient;
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * Activity which displays a login screen to the user, offering registration as

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java
@@ -82,7 +82,7 @@
 import de.luhmer.owncloudnewsreader.helper.PostDelayHandler;
 import de.luhmer.owncloudnewsreader.helper.Search;
 import de.luhmer.owncloudnewsreader.helper.StopWatch;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 
 /**
  * A fragment representing a single NewsReader detail screen. This fragment is

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
@@ -116,11 +116,11 @@
 import de.luhmer.owncloudnewsreader.services.events.SyncStartedEvent;
 import de.luhmer.owncloudnewsreader.ssl.OkHttpSSLClient;
 import de.luhmer.owncloudnewsreader.view.PodcastSlidingUpPanelLayout;
-import io.reactivex.Completable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Action;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 /**
  * An activity representing a list of NewsReader. This activity has different
@@ -1174,15 +1174,14 @@ public boolean onQueryTextSubmit(String query) {
 	@Override
 	public boolean onQueryTextChange(String newText) {
         if (searchPublishSubject == null) {
-            searchPublishSubject = PublishSubject.create();
-            searchPublishSubject
-                    .debounce(400, TimeUnit.MILLISECONDS)
-                    .distinctUntilChanged()
-                    .map(s -> getNewsReaderDetailFragment().performSearch(s))
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribeWith(getNewsReaderDetailFragment().searchResultObserver)
-                    .isDisposed();
+			searchPublishSubject = PublishSubject.create();
+			searchPublishSubject
+					.debounce(400, TimeUnit.MILLISECONDS)
+					.distinctUntilChanged()
+					.map(s -> getNewsReaderDetailFragment().performSearch(s))
+					.subscribeOn(Schedulers.io())
+					.observeOn(AndroidSchedulers.mainThread())
+					.subscribeWith(getNewsReaderDetailFragment().searchResultObserver);
 
         }
         searchPublishSubject.onNext(newText);

diff --git a/...-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListDialogFragment.java b/...-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListDialogFragment.java
@@ -28,9 +28,9 @@
 import de.luhmer.owncloudnewsreader.databinding.FragmentDialogFeedoptionsBinding;
 import de.luhmer.owncloudnewsreader.di.ApiProvider;
 import de.luhmer.owncloudnewsreader.helper.FavIconHandler;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 public class NewsReaderListDialogFragment extends DialogFragment {

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java
@@ -21,6 +21,9 @@
 
 package de.luhmer.owncloudnewsreader;
 
+import static de.luhmer.owncloudnewsreader.Constants.USER_INFO_STRING;
+import static de.luhmer.owncloudnewsreader.LoginDialogActivity.RESULT_LOGIN;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -59,14 +62,10 @@
 import de.luhmer.owncloudnewsreader.model.ConcreteFeedItem;
 import de.luhmer.owncloudnewsreader.model.OcsUser;
 import de.luhmer.owncloudnewsreader.reader.nextcloud.OcsAPI;
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-
-
-import static de.luhmer.owncloudnewsreader.Constants.USER_INFO_STRING;
-import static de.luhmer.owncloudnewsreader.LoginDialogActivity.RESULT_LOGIN;
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * A list fragment representing a list of NewsReader. This fragment also

diff --git a/...id-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderOPMLImportDialogFragment.java b/...id-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderOPMLImportDialogFragment.java
@@ -13,7 +13,7 @@
 
 import de.luhmer.owncloudnewsreader.databinding.FragmentDialogOpmlImportBinding;
 import de.luhmer.owncloudnewsreader.di.ApiProvider;
-import io.reactivex.annotations.NonNull;
+import io.reactivex.rxjava3.annotations.NonNull;
 
 
 public class NewsReaderOPMLImportDialogFragment extends DialogFragment {

diff --git a/...id-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/OwnCloudSyncAdapter.java b/...id-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/OwnCloudSyncAdapter.java
@@ -41,11 +41,11 @@
 import de.luhmer.owncloudnewsreader.services.events.SyncStartedEvent;
 import de.luhmer.owncloudnewsreader.ssl.OkHttpSSLClient;
 import de.luhmer.owncloudnewsreader.widget.WidgetProvider;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class OwnCloudSyncAdapter extends AbstractThreadedSyncAdapter {
 
@@ -90,7 +90,7 @@ public void onPerformSync(Account account, Bundle extras, String authority, Cont
         EventBus.getDefault().post(new SyncFinishedEvent());
 
         syncStopWatch.stop();
-        Log.v(TAG, "Finished sync - time needed (synchronization): " + syncStopWatch.toString());
+        Log.v(TAG, "Finished sync - time needed (synchronization): " + syncStopWatch);
     }
 
     private static class NextcloudSyncResult {

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/di/ApiProvider.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/di/ApiProvider.java
@@ -22,7 +22,7 @@
 import okhttp3.OkHttpClient;
 import retrofit2.NextcloudRetrofitApiBuilder;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
@@ -75,7 +75,7 @@ public void initApi(@NonNull NextcloudAPI.ApiConnectedListener apiConnectedListe
                 HttpUrl baseUrl = HttpUrl.parse(baseUrlStr).newBuilder()
                         .addPathSegments("index.php/apps/news/api/v1-2/")
                         .build();
-                Log.d("ApiModule", "HttpUrl: " + baseUrl.toString());
+                Log.d("ApiModule", "HttpUrl: " + baseUrl);
                 OkHttpClient client = OkHttpSSLClient.GetSslClient(baseUrl, username, password, mPrefs, mMemorizingTrustManager);
                 // initImageLoader(mPrefs, client, context);
                 initRetrofitApi(baseUrl, client);
@@ -89,7 +89,7 @@ public void initApi(@NonNull NextcloudAPI.ApiConnectedListener apiConnectedListe
     private void initRetrofitApi(HttpUrl baseUrl, OkHttpClient client) {
         Retrofit retrofit = new Retrofit.Builder()
                 .addConverterFactory(GsonConverterFactory.create(GsonConfig.GetGson()))
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
                 .baseUrl(baseUrl)
                 .client(client)
                 .build();

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/NewsAPI.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/NewsAPI.java
@@ -8,8 +8,8 @@
 import de.luhmer.owncloudnewsreader.database.model.RssItem;
 import de.luhmer.owncloudnewsreader.model.NextcloudNewsVersion;
 import de.luhmer.owncloudnewsreader.model.NextcloudStatus;
-import io.reactivex.Completable;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.http.Body;

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/OcsAPI.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/OcsAPI.java
@@ -1,7 +1,7 @@
 package de.luhmer.owncloudnewsreader.reader.nextcloud;
 
 import de.luhmer.owncloudnewsreader.model.OcsUser;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import retrofit2.http.GET;
 
 public interface OcsAPI {

diff --git a/...id-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/RssItemObservable.java b/...id-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/RssItemObservable.java
@@ -21,12 +21,12 @@
 import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
 import de.luhmer.owncloudnewsreader.database.model.RssItem;
 import de.luhmer.owncloudnewsreader.reader.FeedItemTags;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Observer;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Function;
 import okhttp3.ResponseBody;
 import okio.BufferedSource;