Revert the rxjava2 to rxjava3 upgrade of 02f57d4

SailReal · SailReal · commit a100bd00c11a · 2025-10-01T10:22:25.000+02:00
This changed the timing when dialogs are shown, ready and when they could be updated. Need to be further investigated before we update it to not crash half the app.
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
@@ -56,9 +56,9 @@ ext {
 
 	// app frameworks and utilities
 
-	rxJavaVersion = '3.1.11'
-	rxAndroidVersion = '3.0.2'
-	rxBindingVersion = '3.1.0'
+	rxJavaVersion = '2.2.21'
+	rxAndroidVersion = '2.1.1'
+	rxBindingVersion = '2.2.0'
 
 	daggerVersion = '2.57'
 
@@ -188,9 +188,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.rxjava3:rxjava:${rxJavaVersion}",
-			rxAndroid                      : "io.reactivex.rxjava3:rxandroid:${rxAndroidVersion}",
-			rxBinding                      : "com.jakewharton.rxbinding3:rxbinding:${rxBindingVersion}",
+			rxJava                         : "io.reactivex.rxjava2:rxjava:${rxJavaVersion}",
+			rxAndroid                      : "io.reactivex.rxjava2:rxandroid:${rxAndroidVersion}",
+			rxBinding                      : "com.jakewharton.rxbinding2: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.rxjava3.core.Scheduler;
+import io.reactivex.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.rxjava3.disposables.Disposable disposable = io.reactivex.rxjava3.disposables.Disposable.empty();
+    private io.reactivex.disposables.Disposable disposable = io.reactivex.internal.disposables.EmptyDisposable.INSTANCE;
 
     @javax.inject.Inject
     public ${simpleName}(
@@ -36,10 +36,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
     @Override
     public void unsubscribe() {
         if (disposable != null && !disposable.isDisposed()) {
-			if (registration != null) {
-			   registration.unregister();
-			   registration = null;
-			}
+            registration.unregister();
             disposable.dispose();
             disposable = null;
 #if ( $hasCancelHandler )
@@ -104,7 +101,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
 #end
             );
 #if ( $hasProgressAware )
-            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>>(){
+            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>>(){
                 @Override
                 public void onComplete() {
                     resultHandler.onFinished();
@@ -123,7 +120,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
                 }
             };
             ${simpleName}.this.disposable = subscriber;
-            io.reactivex.rxjava3.core.Flowable.fromPublisher(new org.reactivestreams.Publisher<org.cryptomator.domain.usecases.ResultWithProgress<$resultClassName,$progressStateName>>(){
+            io.reactivex.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
@@ -155,7 +152,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
                     }
                 }
 #else
-            final io.reactivex.rxjava3.subscribers.DisposableSubscriber<$subscriberResultClassName> subscriber = new io.reactivex.rxjava3.subscribers.DisposableSubscriber<$subscriberResultClassName>(){
+            final io.reactivex.subscribers.DisposableSubscriber<$subscriberResultClassName> subscriber = new io.reactivex.subscribers.DisposableSubscriber<$subscriberResultClassName>(){
                 @Override
                 public void onComplete() {
                     resultHandler.onFinished();
@@ -177,7 +174,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
                 }
             };
             ${simpleName}.this.disposable = subscriber;
-            io.reactivex.rxjava3.core.Flowable.fromCallable(new java.util.concurrent.Callable<$subscriberResultClassName>(){
+            io.reactivex.Flowable.fromCallable(new java.util.concurrent.Callable<$subscriberResultClassName>(){
                     public $subscriberResultClassName call() throws Exception {
                         final int id = EXECUTION_ID.getAndIncrement();
                         boolean failed = true;
@@ -203,7 +200,7 @@ public class $simpleName implements org.cryptomator.generator.Unsubscribable {
                     }
 #end
                 })
-                .subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.from(threadExecutor))
+                .subscribeOn(io.reactivex.schedulers.Schedulers.from(threadExecutor))
                 .onBackpressureLatest()
                 .observeOn(postExecutionThread.getScheduler())
                 .subscribe(subscriber);
@@ -232,7 +229,7 @@ public void run(final org.cryptomator.domain.usecases.ResultHandler<$resultClass
             #if( $foreach.hasNext ),#end
 #end
         );
-        final io.reactivex.rxjava3.subscribers.DisposableSubscriber<$subscriberResultClassName> subscriber = new io.reactivex.rxjava3.subscribers.DisposableSubscriber<$subscriberResultClassName>(){
+        final io.reactivex.subscribers.DisposableSubscriber<$subscriberResultClassName> subscriber = new io.reactivex.subscribers.DisposableSubscriber<$subscriberResultClassName>(){
             @Override
             public void onComplete() {
                 resultHandler.onFinished();
@@ -254,7 +251,7 @@ public void run(final org.cryptomator.domain.usecases.ResultHandler<$resultClass
             }
         };
         this.disposable = subscriber;
-        io.reactivex.rxjava3.core.Flowable.fromCallable(new java.util.concurrent.Callable<$subscriberResultClassName>(){
+        io.reactivex.Flowable.fromCallable(new java.util.concurrent.Callable<$subscriberResultClassName>(){
                 public $subscriberResultClassName call() throws Exception {
                     final int id = EXECUTION_ID.getAndIncrement();
                     boolean failed = true;
@@ -283,7 +280,7 @@ public void run(final org.cryptomator.domain.usecases.ResultHandler<$resultClass
 #end
                 }
             })
-            .subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.from(threadExecutor))
+            .subscribeOn(io.reactivex.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.rxjava3.core.Scheduler
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.Scheduler
+import io.reactivex.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.rxbinding3.widget.RxTextView;
+import com.jakewharton.rxbinding2.widget.RxTextView;
 
 import java.util.List;
 
