remove new timezone handling

fixes 15746
MorenoTropical · Apr 5, 2024 · 1506d50 · 1506d50
1 parent 512c2e9
commit 1506d50
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 30 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt b/AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt
@@ -459,7 +459,6 @@ object UsageAnalytics {
         "timeLimit", // Timebox time limit
         "timeoutAnswer", // Automatic display answer
         "keepScreenOn", // Disable screen timeout
-        "newTimezoneHandling", // New timezone handling
         "doubleTapTimeInterval", // Double tap time interval (milliseconds)
         // Sync
         "syncFetchMedia", // Fetch media on sync

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewingSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ReviewingSettingsFragment.kt
@@ -15,7 +15,6 @@
  */
 package com.ichi2.anki.preferences
 
-import androidx.preference.SwitchPreferenceCompat
 import com.ichi2.anki.CollectionManager.withCol
 import com.ichi2.anki.R
 import com.ichi2.anki.launchCatchingTask
@@ -60,20 +59,5 @@ class ReviewingSettingsFragment : SettingsFragment() {
                 launchCatchingTask { setDayOffset(requireContext(), newValue as Int) }
             }
         }
-
-        // New timezone handling
-        requirePreference<SwitchPreferenceCompat>(R.string.new_timezone_handling_preference).apply {
-            launchCatchingTask {
-                isChecked = withCol { sched.newTimezoneEnabled() }
-                isEnabled = withCol { schedVer() > 1 }
-            }
-            setOnPreferenceChangeListener { newValue ->
-                if (newValue == true) {
-                    launchCatchingTask { withCol { sched.setCreationOffset() } }
-                } else {
-                    launchCatchingTask { withCol { sched.clearCreationOffset() } }
-                }
-            }
-        }
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.kt
@@ -27,6 +27,9 @@ import anki.card_rendering.EmptyCardsReport
 import anki.collection.OpChanges
 import anki.collection.OpChangesWithCount
 import anki.config.ConfigKey
+import anki.config.Preferences
+import anki.config.copy
+import anki.config.preferences
 import anki.search.SearchNode
 import anki.sync.SyncAuth
 import anki.sync.SyncStatusResponse
@@ -167,12 +170,17 @@ open class Collection(
         val ver = schedVer()
         if (ver == 1) {
             sched = DummyScheduler(this)
-        } else {
+        } else if (ver == 2) {
             if (!backend.getConfigBool(ConfigKey.Bool.SCHED_2021)) {
                 backend.setConfigBool(ConfigKey.Bool.SCHED_2021, true, undoable = false)
             }
             sched = Scheduler(this)
-            config.set("localOffset", sched.currentTimezoneOffset())
+            if (config.get<Int>("creationOffset") == null) {
+                val prefs = getPreferences().copy {
+                    scheduling = scheduling.copy { newTimezone = true }
+                }
+                setPreferences(prefs)
+            }
         }
     }
 
@@ -692,4 +700,12 @@ open class Collection(
         val homeDeck = currentReviewCard?.currentDeckId()?.did ?: 0L
         return backend.defaultsForAdding(homeDeckOfCurrentReviewCard = homeDeck)
     }
+
+    fun getPreferences(): Preferences {
+        return backend.getPreferences()
+    }
+
+    fun setPreferences(preferences: Preferences): OpChanges {
+        return backend.setPreferences(preferences)
+    }
 }
diff --git a/AnkiDroid/src/main/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml
@@ -157,7 +157,6 @@
     <string name="use_current" maxLength="41">Deck for new cards</string>
     <string name="learn_cutoff" maxLength="41">Learn ahead limit</string>
     <string name="time_limit" maxLength="41">Timebox time limit</string>
-    <string name="new_timezone" maxLength="41">New timezone handling</string>
     <string name="day_offset_with_description" maxLength="41">Start of next day</string>
     <plurals name="day_offset_summ" comment="%d is going to be replaced with the number of hours past midnight. It can be replaced if something else suits better the translation">
         <item quantity="one">%d hour past midnight</item>

diff --git a/AnkiDroid/src/main/res/values/preferences.xml b/AnkiDroid/src/main/res/values/preferences.xml
@@ -15,7 +15,6 @@
     <string name="time_limit_preference">timeLimit</string>
     <string name="timeout_answer_preference">timeoutAnswer</string>
     <string name="keep_screen_on_preference">keepScreenOn</string>
-    <string name="new_timezone_handling_preference">newTimezoneHandling</string>
     <string name="double_tap_time_interval_preference">doubleTapTimeInterval</string>
     <!-- Sync -->
     <string name="pref_sync_screen_key">syncScreen</string>

diff --git a/AnkiDroid/src/main/res/xml/preferences_reviewing.xml b/AnkiDroid/src/main/res/xml/preferences_reviewing.xml
@@ -63,10 +63,6 @@
             android:key="@string/keep_screen_on_preference"
             android:summary="@string/pref_keep_screen_on_summ"
             android:title="@string/pref_keep_screen_on" />
-        <SwitchPreferenceCompat
-            android:key="@string/new_timezone_handling_preference"
-            android:title="@string/new_timezone"
-            android:defaultValue="false" />
         <com.ichi2.preferences.NumberRangePreferenceCompat
             android:defaultValue="200"
             android:key="@string/double_tap_time_interval_preference"

diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/SchedulerTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/SchedulerTest.kt
@@ -83,11 +83,6 @@ open class SchedulerTest : JvmTest() {
             SYNC_VER,
             Matchers.equalTo(10)
         )
-        MatcherAssert.assertThat(
-            "localOffset should be set if using V2 Scheduler",
-            col.config.get<Int?>("localOffset") != null,
-            Matchers.equalTo(true)
-        )
         val sched = col.sched
         MatcherAssert.assertThat(
             "new timezone should be enabled by default",