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

fix: crash on incorrect password

Browse source
This commit is contained in:
rebelonion 2024-02-06 01:53:49 -06:00
parent 0c6fad91ca
commit 8d7b86a667
4 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/ani/dantotsu/settings/saving/internal/PreferencePackager.kt
View file

@ -1,7 +1,11 @@
package ani.dantotsu.settings.saving.internal
import android.content.SharedPreferences
import android.net.Uri
import androidx.documentfile.provider.DocumentFile
import ani.dantotsu.connections.discord.serializers.Activity
import ani.dantotsu.settings.saving.PrefManager
import ani.dantotsu.toast
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
@ -10,11 +14,18 @@ class PreferencePackager {
companion object {
/**
* @return a json string of the packed preferences
*/
fun pack(map: Map<Location, SharedPreferences>): String {
val prefsMap = packagePreferences(map)
val gson = Gson()
return gson.toJson(prefsMap)
}
/**
* @return true if successful, false if error
*/
fun unpack(decryptedJson: String): Boolean {
val gson = Gson()
val type = object : TypeToken<Map<String, Map<String, Map<String, Any>>>>() {}.type //oh god...
@ -47,6 +58,9 @@ class PreferencePackager {
return unpackagePreferences(deserializedMap)
}
/**
* @return a map of location names to a map of preference names to their values
*/
private fun packagePreferences(map: Map<Location, SharedPreferences>): Map<String, Map<String, *>> {
val result = mutableMapOf<String, Map<String, *>>()
for ((location, preferences) in map) {
@ -63,7 +77,6 @@ class PreferencePackager {
return result
}
/**
* @return true if successful, false if error
*/