From 628944a4f262614551566fe566a45866b926cf64 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 17 Apr 2023 12:59:05 +0300
Subject: [PATCH] Fix 'closed' error

---
 app/build.gradle                                            | 4 ++--
 .../kotatsu/core/network/MirrorSwitchInterceptor.kt         | 6 +++---
 .../main/java/org/koitharu/kotatsu/sync/data/SyncAuthApi.kt | 2 +-
 app/src/main/res/xml/sync_favourites.xml                    | 2 +-
 app/src/main/res/xml/sync_history.xml                       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 826ca1047..61c8bddd9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 535
-		versionName '5.0-b2'
+		versionCode 536
+		versionName '5.0-rc1'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/MirrorSwitchInterceptor.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/MirrorSwitchInterceptor.kt
index 909134479..aaf088c7e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/MirrorSwitchInterceptor.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/MirrorSwitchInterceptor.kt
@@ -23,9 +23,9 @@ class MirrorSwitchInterceptor @Inject constructor(
 		return try {
 			val response = chain.proceed(request)
 			if (response.isFailed) {
-				val responseCopy = response.newBuilder().build()
-				response.close()
-				trySwitchMirror(request, chain) ?: responseCopy
+				trySwitchMirror(request, chain)?.also {
+					response.close()
+				} ?: response
 			} else {
 				response
 			}
diff --git a/app/src/main/java/org/koitharu/kotatsu/sync/data/SyncAuthApi.kt b/app/src/main/java/org/koitharu/kotatsu/sync/data/SyncAuthApi.kt
index 22e8d9d78..69d2e9844 100644
--- a/app/src/main/java/org/koitharu/kotatsu/sync/data/SyncAuthApi.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/sync/data/SyncAuthApi.kt
@@ -2,7 +2,6 @@ package org.koitharu.kotatsu.sync.data
 
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.json.JSONObject
@@ -12,6 +11,7 @@ import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.parsers.util.parseJson
 import org.koitharu.kotatsu.parsers.util.removeSurrounding
 import org.koitharu.kotatsu.utils.ext.toRequestBody
+import javax.inject.Inject
 
 class SyncAuthApi @Inject constructor(
 	@ApplicationContext context: Context,
diff --git a/app/src/main/res/xml/sync_favourites.xml b/app/src/main/res/xml/sync_favourites.xml
index 8de3b0562..e7f1ee7a0 100644
--- a/app/src/main/res/xml/sync_favourites.xml
+++ b/app/src/main/res/xml/sync_favourites.xml
@@ -6,4 +6,4 @@
 	android:contentAuthority="@string/sync_authority_favourites"
 	android:isAlwaysSyncable="true"
 	android:supportsUploading="true"
-	android:userVisible="true" />
+	android:userVisible="@bool/is_sync_enabled" />
diff --git a/app/src/main/res/xml/sync_history.xml b/app/src/main/res/xml/sync_history.xml
index cfc96d27f..845417887 100644
--- a/app/src/main/res/xml/sync_history.xml
+++ b/app/src/main/res/xml/sync_history.xml
@@ -6,4 +6,4 @@
 	android:contentAuthority="@string/sync_authority_history"
 	android:isAlwaysSyncable="true"
 	android:supportsUploading="true"
-	android:userVisible="true" />
+	android:userVisible="@bool/is_sync_enabled" />