Skip to content

Commit 66a3f31

Browse files
committed
Add ability to delete saved filters in batch
1 parent 290b358 commit 66a3f31

File tree

5 files changed

+30
-2
lines changed

5 files changed

+30
-2
lines changed

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/BrowseFilterQueries.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ interface BrowseFilterQueries : DbProvider {
2222
)
2323
.prepare()
2424

25+
fun deleteAllBrowseFilters() = db.delete()
26+
.byQuery(
27+
DeleteQuery.builder()
28+
.table(BrowseFilterTable.TABLE)
29+
.build(),
30+
)
31+
.prepare()
32+
2533
fun getBrowseFilters() = db.get()
2634
.listOfObjects(BrowseFilterImpl::class.java)
2735
.withQuery(

app/src/main/java/eu/kanade/tachiyomi/source/online/utils/MdLang.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ enum class MdLang(val lang: String, val prettyPrint: String, val iconResId: Int)
4242
PORTUGUESE_BR("pt-br", "Portuguese (Br)", R.drawable.ic_flag_br),
4343
ROMANIAN("ro", "Romanian", R.drawable.ic_flag_ro),
4444
RUSSIAN("ru", "Russian", R.drawable.ic_flag_ru),
45-
SERBIAN("sr", "Serbo-Croatian", R.drawable.ic_flag_sr),
45+
SERBIAN("sr", "Serbian", R.drawable.ic_flag_sr),
4646
SLOVAK("sk", "Slovak", R.drawable.ic_flag_sk),
4747
SPANISH_ES("es", "Spanish (Es)", R.drawable.ic_flag_es),
4848
SPANISH_LATAM("es-la", "Spanish (LATAM)", R.drawable.ic_flag_mx),

app/src/main/java/eu/kanade/tachiyomi/source/online/utils/MdUtil.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ class MdUtil {
6161
}
6262

6363
fun getLangsToShow(preferences: PreferencesHelper) =
64-
preferences.langsToShow().get().split(",")
64+
//this prevents langauges that don't exist anymore from causing a parse exception
65+
preferences.langsToShow().get().split(",").filter { MdLang.values().firstOrNull { mdLang -> it == mdLang.lang } != null }
6566

6667
fun getTitle(
6768
titleMap: Map<String, String?>,

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSiteController.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,22 @@ class SettingsSiteController :
126126
defaultValue = 0
127127
}
128128

129+
preference {
130+
titleRes = R.string.delete_saved_filters
131+
summaryRes = R.string.delete_saved_filters_description
132+
onClick {
133+
activity!!.materialAlertDialog()
134+
.setTitle(R.string.delete_saved_filters)
135+
.setNegativeButton(android.R.string.cancel, null)
136+
.setPositiveButton(R.string.delete) { dialog, t ->
137+
viewScope.launch {
138+
db.deleteAllBrowseFilters().executeAsBlocking()
139+
}
140+
}
141+
.show()
142+
}
143+
}
144+
129145
preference {
130146

131147
titleRes = R.string.currently_blocked_scanlators

constants/src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,6 +1131,9 @@
11311131
<string name="currently_blocked_scanlators_description">These are blocks in the app only, as the app does not use or sync with the MangaDex website setting.</string>
11321132
<string name="unblock_scanlator">Unblock scanlator</string>
11331133
<string name="no_blocked_scanlator">No blocked scanlators</string>
1134+
<string name="delete_saved_filters">Delete saved filters</string>
1135+
<string name="delete_saved_filters_description">Use this if you get a parse exception clicking the search button in browse, or want to delete all your saved search filters.</string>
1136+
11341137
<string name="menu">menu</string>
11351138
<string name="more">More</string>
11361139
<string name="move_to_bottom">Move to bottom</string>

0 commit comments

Comments
 (0)