From 71a4e8a720cd98e46fcad46c678917d2fbcf56c2 Mon Sep 17 00:00:00 2001 From: David Allison <62114487+david-allison@users.noreply.github.com> Date: Thu, 5 Dec 2024 17:39:28 +0000 Subject: [PATCH] refactor: remove 'corrupt' custom study handling I remember fixing the underlying cause in 2020 --- .../anki/dialogs/customstudy/CustomStudyDialog.kt | 10 ---------- AnkiDroid/src/main/res/values/03-dialogs.xml | 1 - 2 files changed, 11 deletions(-) diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt index f40430d61303..d926d3ef36a0 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/CustomStudyDialog.kt @@ -35,7 +35,6 @@ import anki.scheduler.CustomStudyRequestKt import anki.scheduler.customStudyRequest import com.ichi2.anki.CollectionManager.TR import com.ichi2.anki.CollectionManager.withCol -import com.ichi2.anki.CrashReportService import com.ichi2.anki.R import com.ichi2.anki.analytics.AnalyticsDialogFragment import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog.ContextMenuOption @@ -462,15 +461,6 @@ class CustomStudyDialog( return } } - if (!dyn.has("terms")) { - // #5959 - temp code to diagnose why terms doesn't exist. - // normally we wouldn't want to log this much, but we need to know how deep the corruption is to fix the - // issue - Timber.w("Invalid Dynamic Deck: %s", dyn) - CrashReportService.sendExceptionReport("Custom Study Deck had no terms", "CustomStudyDialog - createCustomStudySession") - showThemedToast(requireContext(), getString(R.string.custom_study_rebuild_deck_corrupt), false) - return - } // and then set various options dyn.put("delays", JSONObject.NULL) val ar = dyn.getJSONArray("terms") diff --git a/AnkiDroid/src/main/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml index 31645b2d95db..8fd409a5a4c6 100644 --- a/AnkiDroid/src/main/res/values/03-dialogs.xml +++ b/AnkiDroid/src/main/res/values/03-dialogs.xml @@ -57,7 +57,6 @@ Review cards forgotten in last x days: Review ahead by x days: Preview new cards added in the last x days: - Could not rebuild custom study deck Storage full Storage almost full