Update Reactive Java/Android to version 3

SailReal · SailReal · commit 8a8206e9f41b · 2025-08-06T14:57:53.000+02:00
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
@@ -57,9 +57,9 @@ ext {
 	// app frameworks and utilities
 
 	// todo updaten
-	rxJavaVersion = '2.2.21'
-	rxAndroidVersion = '2.1.1'
-	rxBindingVersion = '2.2.0'
+	rxJavaVersion = '3.1.11'
+	rxAndroidVersion = '3.0.2'
+	rxBindingVersion = '3.1.0'
 
 	daggerVersion = '2.57'
 
@@ -189,9 +189,9 @@ ext {
 			okHttpDigest                   : "io.github.rburgst:okhttp-digest:${okHttpDigestVersion}",
 			pcloud                         : "com.github.cryptomator.pcloud-sdk-java:java-core:${pcloudVersion}",
 			recyclerViewFastScroll         : "com.simplecityapps:recyclerview-fastscroll:${recyclerViewFastScrollVersion}",
-			rxJava                         : "io.reactivex.rxjava2:rxjava:${rxJavaVersion}",
-			rxAndroid                      : "io.reactivex.rxjava2:rxandroid:${rxAndroidVersion}",
-			rxBinding                      : "com.jakewharton.rxbinding2:rxbinding:${rxBindingVersion}",
+			rxJava                         : "io.reactivex.rxjava3:rxjava:${rxJavaVersion}",
+			rxAndroid                      : "io.reactivex.rxjava3:rxandroid:${rxAndroidVersion}",
+			rxBinding                      : "com.jakewharton.rxbinding3:rxbinding:${rxBindingVersion}",
 			stax                           : "stax:stax:${staxVersion}",
 			testingSupportLib              : "com.android.support.test:testing-support-lib:${testingSupportLibVersion}",
 			timber                         : "com.jakewharton.timber:timber:${timberVersion}",
diff --git a/domain/src/main/java/org/cryptomator/domain/executor/PostExecutionThread.java b/domain/src/main/java/org/cryptomator/domain/executor/PostExecutionThread.java
@@ -1,6 +1,6 @@
 package org.cryptomator.domain.executor;
 
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * Thread abstraction created to change the execution context from any thread to any other thread.
diff --git a/generator/src/main/resources/templates/UseCaseTemplate.vm b/generator/src/main/resources/templates/UseCaseTemplate.vm
@@ -17,7 +17,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
 
     private $implClassName impl;
     private org.cryptomator.domain.executor.BackgroundTasks.Registration registration;
-    private io.reactivex.disposables.Disposable disposable = io.reactivex.internal.disposables.EmptyDisposable.INSTANCE;
+    private io.reactivex.rxjava3.disposables.Disposable disposable = io.reactivex.rxjava3.disposables.Disposable.empty();
 
     @javax.inject.Inject
     public ${simpleName}(
@@ -36,7 +36,10 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
     @Override
     public void unsubscribe() {
         if (disposable != null && !disposable.isDisposed()) {
-            registration.unregister();
+			if (registration != null) {
+			   registration.unregister();
+			   registration = null;
+			}
             disposable.dispose();
             disposable = null;
 #if ( $hasCancelHandler )
@@ -101,7 +104,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
 #end
             );
 #if ( $hasProgressAware )
-            final io.reactivex.subscribers.DisposableSubscriber<org.cryptomator.domain.usecases.ResultWithProgress<$resultClassName,$progressStateName>> subscriber = new io.reactivex.subscribers.DisposableSubscriber<org.cryptomator.domain.usecases.ResultWithProgress<$resultClassName,$progressStateName>>(){
+            final io.reactivex.rxjava3.subscribers.DisposableSubscriber<org.cryptomator.domain.usecases.ResultWithProgress<$resultClassName,$progressStateName>> subscriber = new io.reactivex.rxjava3.subscribers.DisposableSubscriber<org.cryptomator.domain.usecases.ResultWithProgress<$resultClassName,$progressStateName>>(){
                 @Override
                 public void onComplete() {
                     resultHandler.onFinished();
@@ -120,7 +123,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
                 }
             };
             ${simpleName}.this.disposable = subscriber;
-            io.reactivex.Flowable.fromPublisher(new org.reactivestreams.Publisher<org.cryptomator.domain.usecases.ResultWithProgress<$resultClassName,$progressStateName>>(){
+            io.reactivex.rxjava3.core.Flowable.fromPublisher(new org.reactivestreams.Publisher<org.cryptomator.domain.usecases.ResultWithProgress<$resultClassName,$progressStateName>>(){
                 public void subscribe(final org.reactivestreams.Subscriber<? super org.cryptomator.domain.usecases.ResultWithProgress<$resultClassName,$progressStateName>> subscriber) {
                     org.cryptomator.domain.usecases.ProgressAware<$progressStateName> progressAware = new org.cryptomator.domain.usecases.ThrottlingProgressAware<$progressStateName>(new org.cryptomator.domain.usecases.ProgressAware<$progressStateName>() {
                         @Override
@@ -152,7 +155,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
                     }
                 }
 #else
-            final io.reactivex.subscribers.DisposableSubscriber<$subscriberResultClassName> subscriber = new io.reactivex.subscribers.DisposableSubscriber<$subscriberResultClassName>(){
+            final io.reactivex.rxjava3.subscribers.DisposableSubscriber<$subscriberResultClassName> subscriber = new io.reactivex.rxjava3.subscribers.DisposableSubscriber<$subscriberResultClassName>(){
                 @Override
                 public void onComplete() {
                     resultHandler.onFinished();
@@ -174,7 +177,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
                 }
             };
             ${simpleName}.this.disposable = subscriber;
-            io.reactivex.Flowable.fromCallable(new java.util.concurrent.Callable<$subscriberResultClassName>(){
+            io.reactivex.rxjava3.core.Flowable.fromCallable(new java.util.concurrent.Callable<$subscriberResultClassName>(){
                     public $subscriberResultClassName call() throws Exception {
                         final int id = EXECUTION_ID.getAndIncrement();
                         boolean failed = true;
@@ -200,7 +203,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
                     }
 #end
                 })
-                .subscribeOn(io.reactivex.schedulers.Schedulers.from(threadExecutor))
+                .subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.from(threadExecutor))
                 .onBackpressureLatest()
                 .observeOn(postExecutionThread.getScheduler())
                 .subscribe(subscriber);
@@ -229,7 +232,7 @@ public void run(final org.cryptomator.domain.usecases.ResultHandler<$resultClass
             #if( $foreach.hasNext ),#end
 #end
         );
-        final io.reactivex.subscribers.DisposableSubscriber<$subscriberResultClassName> subscriber = new io.reactivex.subscribers.DisposableSubscriber<$subscriberResultClassName>(){
+        final io.reactivex.rxjava3.subscribers.DisposableSubscriber<$subscriberResultClassName> subscriber = new io.reactivex.rxjava3.subscribers.DisposableSubscriber<$subscriberResultClassName>(){
             @Override
             public void onComplete() {
                 resultHandler.onFinished();
@@ -251,7 +254,7 @@ public void run(final org.cryptomator.domain.usecases.ResultHandler<$resultClass
             }
         };
         this.disposable = subscriber;
-        io.reactivex.Flowable.fromCallable(new java.util.concurrent.Callable<$subscriberResultClassName>(){
+        io.reactivex.rxjava3.core.Flowable.fromCallable(new java.util.concurrent.Callable<$subscriberResultClassName>(){
                 public $subscriberResultClassName call() throws Exception {
                     final int id = EXECUTION_ID.getAndIncrement();
                     boolean failed = true;
@@ -280,7 +283,7 @@ public void run(final org.cryptomator.domain.usecases.ResultHandler<$resultClass
 #end
                 }
             })
-            .subscribeOn(io.reactivex.schedulers.Schedulers.from(threadExecutor))
+            .subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.from(threadExecutor))
             .observeOn(postExecutionThread.getScheduler())
             .subscribe(subscriber);
     }
diff --git a/presentation/src/main/java/org/cryptomator/presentation/UIThread.kt b/presentation/src/main/java/org/cryptomator/presentation/UIThread.kt
@@ -3,8 +3,8 @@ package org.cryptomator.presentation
 import org.cryptomator.domain.executor.PostExecutionThread
 import javax.inject.Inject
 import javax.inject.Singleton
-import io.reactivex.Scheduler
-import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Scheduler
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 
 /**
  * MainThread (UI Thread) implementation based on a [io.reactivex.Scheduler]
diff --git a/presentation/src/main/java/org/cryptomator/presentation/util/PasswordStrengthUtil.java b/presentation/src/main/java/org/cryptomator/presentation/util/PasswordStrengthUtil.java
@@ -6,7 +6,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.jakewharton.rxbinding2.widget.RxTextView;
+import com.jakewharton.rxbinding3.widget.RxTextView;
 
 import java.util.List;
 
