From 7873433977d2bdecf4ac07fcb4d070c307301a10 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 10 Jul 2020 23:06:41 -0700
Subject: [PATCH] Remove RxJava as dependency

---
 app/build.gradle.kts                                       | 7 +------
 .../main/java/com/topjohnwu/magisk/di/NetworkingModule.kt  | 2 --
 .../java/com/topjohnwu/magisk/model/events/ViewEvents.kt   | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e487dd1a6..7589d2b67 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -77,10 +77,6 @@ dependencies {
     implementation("com.github.topjohnwu:jtar:1.0.0")
     implementation("com.jakewharton.timber:timber:4.7.1")
 
-    implementation("io.reactivex.rxjava2:rxjava:2.2.19")
-    implementation("io.reactivex.rxjava2:rxkotlin:2.4.0")
-    implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
-
     implementation("org.jetbrains.kotlin:kotlin-stdlib:${Deps.vKotlin}")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Deps.vKotlin}")
 
@@ -108,7 +104,6 @@ dependencies {
     implementation("com.squareup.retrofit2:retrofit:${vRetrofit}")
     implementation("com.squareup.retrofit2:converter-moshi:${vRetrofit}")
     implementation("com.squareup.retrofit2:converter-scalars:${vRetrofit}")
-    implementation("com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}")
 
     val vOkHttp = "3.12.12"
     implementation("com.squareup.okhttp3:okhttp") {
@@ -132,7 +127,7 @@ dependencies {
     implementation("androidx.navigation:navigation-ui-ktx:${Deps.vNav}")
 
     implementation("androidx.biometric:biometric:1.0.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta7")
+    implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta8")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("androidx.browser:browser:1.2.0")
     implementation("androidx.preference:preference:1.1.1")
diff --git a/app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt b/app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt
index 791b35bbf..dfe194c0c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt
@@ -18,7 +18,6 @@ import okhttp3.OkHttpClient
 import okhttp3.dnsoverhttps.DnsOverHttps
 import org.koin.dsl.module
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import java.net.InetAddress
@@ -81,7 +80,6 @@ fun createRetrofit(okHttpClient: OkHttpClient): Retrofit.Builder {
     return Retrofit.Builder()
         .addConverterFactory(ScalarsConverterFactory.create())
         .addConverterFactory(createMoshiConverterFactory())
-        .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
         .client(okHttpClient)
 }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt b/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
index cb5825c2d..dc80ab2e7 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
@@ -16,7 +16,6 @@ import com.topjohnwu.magisk.view.MagiskDialog
 import com.topjohnwu.magisk.view.MarkDownWindow
 import com.topjohnwu.superuser.Shell
 import dalvik.system.DexFile
-import io.reactivex.subjects.PublishSubject
 import kotlinx.coroutines.*
 import org.json.JSONObject
 import org.koin.core.KoinComponent