Skip to content

code cleanup in FilteredDeckOptins.kt and AppcompatPreferenceActivity.kt #20047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ialwaysbeatmywifi wants to merge 1 commit into from
Closed

code cleanup in FilteredDeckOptins.kt and AppcompatPreferenceActivity.kt #20047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions AnkiDroid/src/main/java/com/ichi2/anki/FilteredDeckOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ class FilteredDeckOptions :
val delays = deck.optJSONArray("delays")
if (delays != null) {
values["steps"] = convertFromJSON(delays)
values["stepsOn"] = java.lang.Boolean.toString(true)
values["stepsOn"] = true.toString()
} else {
values["steps"] = "1 10"
values["stepsOn"] = java.lang.Boolean.toString(false)
values["stepsOn"] = false.toString()
}
values["resched"] = java.lang.Boolean.toString(deck.getBoolean("resched"))
values["resched"] = deck.getBoolean("resched").toString()
values["previewAgainSecs"] = deck.getString("previewAgainSecs")
values["previewHardSecs"] = deck.getString("previewHardSecs")
values["previewGoodSecs"] = deck.getString("previewGoodSecs")
Expand Down Expand Up @@ -167,7 +167,7 @@ class FilteredDeckOptions :
}
if ("resched" == name) {
update.put(name, presetValues.getBoolean(name))
values[name] = java.lang.Boolean.toString(presetValues.getBoolean(name))
values[name] = presetValues.getBoolean(name).toString()
} else {
update.put(name, presetValues.getString(name))
values[name] = presetValues.getString(name)
Expand Down
2 changes: 1 addition & 1 deletion AnkiDroid/src/main/java/com/ichi2/ui/AppCompatPreferenceActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ abstract class AppCompatPreferenceActivity<PreferenceHack : AppCompatPreferenceA
override fun getBoolean(
key: String,
defValue: Boolean,
): Boolean = java.lang.Boolean.parseBoolean(this.getString(key, java.lang.Boolean.toString(defValue)))
): Boolean = this.getString(key, defValue.toString()).toBoolean()

override fun getFloat(
key: String,
Expand Down