From b25a7cc508e1828323794a01249f082b849b2fd8 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Thu, 10 Aug 2023 11:16:29 +0200
Subject: [PATCH 1/2] Custom time: apply corrections if NOT using it on
 episodes.

---
 .../battlelancer/seriesguide/shows/tools/AddUpdateShowTools.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddUpdateShowTools.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddUpdateShowTools.kt
index a152a3458a..a70f90d8e3 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddUpdateShowTools.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddUpdateShowTools.kt
@@ -342,7 +342,7 @@ class AddUpdateShowTools @Inject constructor(
                 releaseInfo.releaseCountry,
                 releaseInfo.network,
                 deviceTimeZone,
-                applyCorrections = usingCustomTime
+                applyCorrections = !usingCustomTime
             )
 
             val guestStars = tmdbEpisode.guest_stars?.mapNotNull { it.name } ?: emptyList()

From 8c961af69648b642b9b9b8715c029bf7115b50ad Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Thu, 10 Aug 2023 16:04:36 +0200
Subject: [PATCH 2/2] Prepare version 68.0.6 (2106807)

---
 CHANGELOG.md     | 6 ++++++
 build.gradle.kts | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ebb465f1a..8e69b195f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,12 @@ Version 68
 * 🔧 Use in-app browser only for websites related to the app.
 * 🔧 Design: update to latest Material version.
 
+#### 68.0.6
+*2023-08-11*
+
+* 🔨 Do not apply corrections (e.g. for US timezones) on episodes when a custom time is set and the
+  other way around.
+
 #### 68.0.5
 *2023-07-07*
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 74c0a26370..68c3fb6a43 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,8 +12,8 @@ buildscript {
     val sgTargetSdk by extra(33) // Android 13 (T)
 
     // version 21xxxyy -> min SDK 21, release xxx, build yy
-    val sgVersionCode by extra(2106806)
-    val sgVersionName by extra("68.0.5")
+    val sgVersionCode by extra(2106807)
+    val sgVersionName by extra("68.0.6")
 
     val isCiBuild by extra { System.getenv("CI") == "true" }