From eb88c9c94b4e7a0d37a0d68831d4e1557225d671 Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 6 Apr 2021 22:31:26 -0400 Subject: [PATCH] Flip crop borders and orientation toggles (cherry picked from commit 6222b47a4f518a7c92631aa6962b42624f41ac4b) # Conflicts: # app/src/main/res/layout/reader_activity.xml --- .../java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt index ce760e03d..19cb1886e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt @@ -41,7 +41,7 @@ private suspend fun Observable.awaitOne(): T = suspendCancellableCoroutin } override fun onError(e: Throwable) { - /* + /* * Rx1 observable throws NoSuchElementException if cancellation happened before * element emission. To mitigate this we try to atomically resume continuation with exception: * if resume failed, then we know that continuation successfully cancelled itself