rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unnecessary context (build failing)

Browse source
This commit is contained in:
Finnley Somdahl 2024-02-02 14:49:19 -06:00
parent 025d31102e
commit 97d062ffc2
11 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt
View file

@ -752,7 +752,7 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
if (Anilist.token != null) {
binding.settingsAnilistLogin.setText(R.string.logout)
binding.settingsAnilistLogin.setOnClickListener {
Anilist.removeSavedToken(it.context)
Anilist.removeSavedToken()
restartMainActivity.isEnabled = true
reload()
}

2
app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt
View file

@ -60,7 +60,7 @@ class SettingsDialogFragment : BottomSheetDialogFragment() {
if (Anilist.token != null) {
binding.settingsLogin.setText(R.string.logout)
binding.settingsLogin.setOnClickListener {
Anilist.removeSavedToken(it.context)
Anilist.removeSavedToken()
dismiss()
startMainActivity(requireActivity())
}

19
app/src/main/java/ani/dantotsu/settings/saving/PrefManager.kt
View file

@ -125,15 +125,15 @@ object PrefManager {
}
@Suppress("UNCHECKED_CAST")
fun <T> getNullableCustomVal(key: String, default: T): T? {
fun <T> getNullableCustomVal(key: String, default: T?, clazz: Class<T>): T? {
return try {
when (default) {
is Boolean -> irrelevantPreferences!!.getBoolean(key, default) as T?
is Int -> irrelevantPreferences!!.getInt(key, default) as T?
is Float -> irrelevantPreferences!!.getFloat(key, default) as T?
is Long -> irrelevantPreferences!!.getLong(key, default) as T?
is String -> irrelevantPreferences!!.getString(key, default) as T?
is Set<*> -> convertFromStringSet(irrelevantPreferences!!.getStringSet(key, null), default) as T?
when {
clazz.isAssignableFrom(Boolean::class.java) -> irrelevantPreferences!!.getBoolean(key, default as? Boolean ?: false) as T?
clazz.isAssignableFrom(Int::class.java) -> irrelevantPreferences!!.getInt(key, default as? Int ?: 0) as T?
clazz.isAssignableFrom(Float::class.java) -> irrelevantPreferences!!.getFloat(key, default as? Float ?: 0f) as T?
clazz.isAssignableFrom(Long::class.java) -> irrelevantPreferences!!.getLong(key, default as? Long ?: 0L) as T?
clazz.isAssignableFrom(String::class.java) -> irrelevantPreferences!!.getString(key, default as? String) as T?
clazz.isAssignableFrom(Set::class.java) -> convertFromStringSet(irrelevantPreferences!!.getStringSet(key, null), default) as T?
else -> deserializeClass(key, default, Location.Irrelevant)
}
} catch (e: Exception) {
@ -141,6 +141,7 @@ object PrefManager {
}
}
fun removeVal(prefName: PrefName) {
val pref = getPrefLocation(prefName.data.prefLocation)
with(pref.edit()) {
@ -256,6 +257,7 @@ object PrefManager {
fun importAllPrefs(prefs: Map<String, *>, prefLocation: Location) {
val pref = getPrefLocation(prefLocation)
var hadError = false
pref.edit().clear().apply()
with(pref.edit()) {
prefs.forEach { (key, value) ->
when (value) {
@ -361,6 +363,7 @@ object PrefManager {
}
} catch (e: Exception) {
snackString("Error deserializing preference: ${e.message}")
e.printStackTrace()
default
}
}