Convert rotation to FlowPreference, remove some unused subscriptions code

Also remove EH lock code(was broken because of RxController changes)

(cherry picked from commit d46a742a43)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -92,7 +92,7 @@ class PreferencesHelper(val context: Context) {
 
     fun themeDark() = flowPrefs.getString(Keys.themeDark, Values.THEME_DARK_DEFAULT)
 
-    fun rotation() = rxPrefs.getInteger(Keys.rotation, 1)
+    fun rotation() = flowPrefs.getInt(Keys.rotation, 1)
 
     fun pageTransitions() = flowPrefs.getBoolean(Keys.enableTransitions, true)
 

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt

@@ -10,25 +10,7 @@ import rx.subscriptions.CompositeSubscription
 
 abstract class RxController<VB : ViewBinding>(bundle: Bundle? = null) : BaseController<VB>(bundle) {
 
-    var untilDetachSubscriptions = CompositeSubscription()
-        private set
-
-    var untilDestroySubscriptions = CompositeSubscription()
-        private set
-
-    @CallSuper
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        if (untilDetachSubscriptions.isUnsubscribed) {
-            untilDetachSubscriptions = CompositeSubscription()
-        }
-    }
-
-    @CallSuper
-    override fun onDetach(view: View) {
-        super.onDetach(view)
-        untilDetachSubscriptions.unsubscribe()
-    }
+    private var untilDestroySubscriptions = CompositeSubscription()
 
     @CallSuper
     override fun onViewCreated(view: View) {
@@ -43,49 +25,7 @@ abstract class RxController<VB : ViewBinding>(bundle: Bundle? = null) : BaseCont
         untilDestroySubscriptions.unsubscribe()
     }
 
-    fun <T> Observable<T>.subscribeUntilDetach(): Subscription {
-        return subscribe().also { untilDetachSubscriptions.add(it) }
-    }
-
-    fun <T> Observable<T>.subscribeUntilDetach(onNext: (T) -> Unit): Subscription {
-        return subscribe(onNext).also { untilDetachSubscriptions.add(it) }
-    }
-
-    fun <T> Observable<T>.subscribeUntilDetach(
-        onNext: (T) -> Unit,
-        onError: (Throwable) -> Unit
-    ): Subscription {
-        return subscribe(onNext, onError).also { untilDetachSubscriptions.add(it) }
-    }
-
-    fun <T> Observable<T>.subscribeUntilDetach(
-        onNext: (T) -> Unit,
-        onError: (Throwable) -> Unit,
-        onCompleted: () -> Unit
-    ): Subscription {
-        return subscribe(onNext, onError, onCompleted).also { untilDetachSubscriptions.add(it) }
-    }
-
-    fun <T> Observable<T>.subscribeUntilDestroy(): Subscription {
-        return subscribe().also { untilDestroySubscriptions.add(it) }
-    }
-
     fun <T> Observable<T>.subscribeUntilDestroy(onNext: (T) -> Unit): Subscription {
         return subscribe(onNext).also { untilDestroySubscriptions.add(it) }
     }
-
-    fun <T> Observable<T>.subscribeUntilDestroy(
-        onNext: (T) -> Unit,
-        onError: (Throwable) -> Unit
-    ): Subscription {
-        return subscribe(onNext, onError).also { untilDestroySubscriptions.add(it) }
-    }
-
-    fun <T> Observable<T>.subscribeUntilDestroy(
-        onNext: (T) -> Unit,
-        onError: (Throwable) -> Unit,
-        onCompleted: () -> Unit
-    ): Subscription {
-        return subscribe(onNext, onError, onCompleted).also { untilDestroySubscriptions.add(it) }
-    }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -30,6 +30,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.asImmediateFlow
 import eu.kanade.tachiyomi.databinding.ReaderActivityBinding
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
@@ -64,6 +65,7 @@ import java.io.File
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
 import kotlin.math.roundToLong
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.observeOn
@@ -226,7 +228,6 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
         super.onDestroy()
         viewer?.destroy()
         viewer = null
-        config?.destroy()
         config = null
         progressDialog?.dismiss()
         progressDialog = null
@@ -852,22 +853,17 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
      */
     private inner class ReaderConfig {
 
-        /**
-         * List of subscriptions to keep while the reader is alive.
-         */
-        private val subscriptions = CompositeSubscription()
-
         /**
          * Initializes the reader subscriptions.
          */
         init {
-            val sharedRotation = preferences.rotation().asObservable().share()
-            val initialRotation = sharedRotation.take(1)
-            val rotationUpdates = sharedRotation.skip(1)
-                .delay(250, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
-
-            subscriptions += Observable.merge(initialRotation, rotationUpdates)
-                .subscribe { setOrientation(it) }
+            preferences.rotation().asImmediateFlow { setOrientation(it) }
+                .drop(1)
+                .onEach {
+                    delay(250)
+                    setOrientation(it)
+                }
+                .launchIn(scope)
 
             preferences.readerTheme().asFlow()
                 .drop(1) // We only care about updates
@@ -905,13 +901,6 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
                 .launchIn(scope)
         }
 
-        /**
-         * Called when the reader is being destroyed. It cleans up all the subscriptions.
-         */
-        fun destroy() {
-            subscriptions.unsubscribe()
-        }
-
         /**
          * Forces the user preferred [orientation] on the activity.
          */