Upgraded RxJava from version 2 to 3

build.gradle

@@ -74,9 +74,9 @@ ext {
     supportConstraintLayout = 'androidx.constraintlayout:constraintlayout:2.0.1'
 
     androidxPreference = 'androidx.preference:preference:1.1.1'
-    androidRoom = 'androidx.room:room-runtime:2.2.5'
-    androidRoomRxJava = 'androidx.room:room-rxjava2:2.2.5'
-    supportRoom = 'androidx.room:room-compiler:2.2.5'
+    androidRoom = 'androidx.room:room-runtime:2.4.2'
+    androidRoomRxJava = 'androidx.room:room-rxjava3:2.4.2'
+    supportRoom = 'androidx.room:room-compiler:2.4.2'
 
 
     def lifecycle_version = "2.2.0"
@@ -102,11 +102,11 @@ ext {
     retrofit2 = "com.squareup.retrofit2:retrofit:$retrofit_version"
     retrofitGson2 = "com.squareup.retrofit2:converter-gson:$retrofit_version"
     retrofitAdapters2 = "com.squareup.retrofit2:retrofit-adapters:$retrofit_version"
-    retrofitRxJava2 = "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version"
+    retrofitRxJava3 = "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
 
     // RxJava dependencies.
-    rxJava = 'io.reactivex.rxjava2:rxjava:2.2.21'
-    rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    rxJava = 'io.reactivex.rxjava3:rxjava:3.0.0'
+    rxAndroid = 'io.reactivex.rxjava3:rxandroid:3.0.0'
     rxPreferences = 'com.f2prateek.rx.preferences2:rx-preferences:2.0.1'
 
     // RxBindings

gradle.properties

@@ -11,4 +11,5 @@
 sdk.dir=/home/matthes/opt/android/sdk
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiYWthc2hyYW1qeW90aGkiLCJhIjoiY2wxODc5ZGZlMGFueTNrcnp6Z3Q5aG9zcCJ9.a4WxmdZTsH8h_jzqfcWSqQ

org.envirocar.algorithm/src/main/java/org/envirocar/algorithm/MeasurementProvider.java

@@ -22,7 +22,7 @@
 import org.envirocar.obd.events.PropertyKeyEvent;
 import org.envirocar.obd.events.Timestamped;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 /**
  * TODO JavaDoc

org.envirocar.app/src/org/envirocar/app/BaseApplication.java

@@ -55,6 +55,7 @@
 import javax.inject.Inject;
 
 import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
 
 
 /**
@@ -119,17 +120,17 @@ public void onCreate() {
 
         // debug logging setting listener
         this.disposables.add(
-                ApplicationSettings.getDebugLoggingObservable(this)
+                (Disposable) ApplicationSettings.getDebugLoggingObservable(this)
                         .doOnNext(this::setDebugLogging)
                         .doOnError(LOG::error)
-                        .subscribe());
+                        .doOnSubscribe());
 
         // obfuscation setting changed listener
         this.disposables.add(
-                ApplicationSettings.getObfuscationObservable(this)
+                (Disposable) ApplicationSettings.getObfuscationObservable(this)
                         .doOnNext(bool -> LOG.info("Obfuscation enabled: %s", bool.toString()))
                         .doOnError(LOG::error)
-                        .subscribe());
+                        .doOnSubscribe());
 
         // register Intentfilter for logging screen changes
         IntentFilter screenIntentFilter = new IntentFilter();
@@ -147,7 +148,7 @@ public void onCreate() {
                             }
                         })
                         .doOnError(LOG::error)
-                        .subscribe());
+                        .doOnSubscribe());
     }
 
     @Override

org.envirocar.app/src/org/envirocar/app/handler/ApplicationSettings.java

@@ -31,7 +31,7 @@
 import org.envirocar.app.R;
 import org.envirocar.app.recording.RecordingType;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 /**
  * TODO JavaDoc

org.envirocar.app/src/org/envirocar/app/handler/BluetoothHandler.java

@@ -51,11 +51,11 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.Scheduler;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall

org.envirocar.app/src/org/envirocar/app/handler/InterpolationMeasurementProvider.java

@@ -38,7 +38,7 @@
 import java.util.List;
 import java.util.Map;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**

org.envirocar.app/src/org/envirocar/app/handler/TrackDAOHandler.java

@@ -37,8 +37,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * TODO JavaDoc

org.envirocar.app/src/org/envirocar/app/handler/TrackRecordingHandler.java

@@ -48,11 +48,11 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Completable;
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.Single;
 import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 
 /**

org.envirocar.app/src/org/envirocar/app/handler/TrackUploadHandler.java

@@ -42,12 +42,12 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableOperator;
 import io.reactivex.ObservableTransformer;
 import io.reactivex.Observer;
 import io.reactivex.functions.Function;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 
 
 /**

org.envirocar.app/src/org/envirocar/app/handler/agreement/AgreementManager.java

@@ -44,12 +44,12 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.ObservableTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * TODO JavaDoc

org.envirocar.app/src/org/envirocar/app/handler/preferences/CarPreferenceHandler.java

@@ -60,7 +60,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 /**

org.envirocar.app/src/org/envirocar/app/handler/preferences/UserPreferenceHandler.java

@@ -40,7 +40,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 
 /**
  * TODO JavaDoc

org.envirocar.app/src/org/envirocar/app/handler/userstatistics/UserStatisticsProcessor.java

@@ -45,7 +45,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 
 
 /**

org.envirocar.app/src/org/envirocar/app/injection/modules/SchedulerModule.java

@@ -24,9 +24,9 @@
 
 import dagger.Module;
 import dagger.Provides;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @Module
 public class SchedulerModule {

org.envirocar.app/src/org/envirocar/app/interactor/UploadAllTracks.java

@@ -37,10 +37,10 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableOperator;
-import io.reactivex.Scheduler;
-import io.reactivex.observers.DisposableObserver;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.observers.DisposableObserver;
 
 /**
  * @author dewall

org.envirocar.app/src/org/envirocar/app/interactor/UploadTrack.java

@@ -29,8 +29,8 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * @author dewall

org.envirocar.app/src/org/envirocar/app/interactor/ValidateAcceptedTerms.java

@@ -43,10 +43,10 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.ObservableTransformer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.functions.Function;
 
 /**

org.envirocar.app/src/org/envirocar/app/notifications/AutomaticUploadNotificationHandler.java

@@ -42,7 +42,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * @author dewall

org.envirocar.app/src/org/envirocar/app/recording/RecordingService.java

@@ -46,7 +46,7 @@
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
@@ -119,7 +119,7 @@ public void onCreate() {
                     }
                 })
                 .doOnError(LOG::error)
-                .subscribe());
+                .doOnSubscribe());
     }
 
     @Override

org.envirocar.app/src/org/envirocar/app/recording/notification/SpeechOutput.java

@@ -35,7 +35,7 @@
 
 import java.util.Locale;
 
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 
 /**

org.envirocar.app/src/org/envirocar/app/recording/provider/LocationProvider.java

@@ -43,7 +43,7 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 
 /**
  * @author dewall

org.envirocar.app/src/org/envirocar/app/recording/provider/RecordingDetailsProvider.java

@@ -41,7 +41,7 @@
 import org.envirocar.core.events.recording.RecordingNewMeasurementEvent;
 import org.envirocar.core.logging.Logger;
 
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
 

org.envirocar.app/src/org/envirocar/app/recording/provider/TrackDatabaseSink.java

@@ -39,8 +39,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.ObservableTransformer;
 
 /**

org.envirocar.app/src/org/envirocar/app/recording/strategy/GPSRecordingStrategy.java

@@ -59,17 +59,17 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.ObservableTransformer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.functions.Consumer;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
@@ -192,7 +192,7 @@ public void startRecording(Service service, RecordingListener listener) {
         // subscribe for preference changes
         disposables.add(ApplicationSettings.getTrackTrimDurationObservable(context)
                 .doOnNext(newDuration -> this.trackTrimDuration = newDuration)
-                .subscribe());
+                .doOnSubscribe());
     }
 
     @Override

org.envirocar.app/src/org/envirocar/app/recording/strategy/OBDRecordingStrategy.java

@@ -61,14 +61,14 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.ObservableTransformer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.observers.DisposableObserver;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.observers.DisposableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
  * @author dewall
@@ -163,7 +163,7 @@ public void startRecording(Service service, RecordingListener listener) {
         // subscribe for preference changes
         disposables.add(ApplicationSettings.getCampaignProfileObservable(context)
                 .doOnNext(campaign -> this.cycleCommandProfile = getCycleCommandProfile(campaign))
-                .subscribe());
+                .doOnSubscribe());
     }
 
     @Override

org.envirocar.app/src/org/envirocar/app/recording/strategy/obd/OBDConnectionHandler.java

@@ -38,11 +38,11 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.functions.Cancellable;