mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-09-28 20:53:03 +02:00
Forces conversion of the ID to make sure it's a valid Hex ID and doesn't crash the app later.
This commit is contained in:
@@ -58,7 +58,7 @@ object LocalCache {
|
|||||||
|
|
||||||
fun checkGetOrCreateUser(key: String): User? {
|
fun checkGetOrCreateUser(key: String): User? {
|
||||||
return try {
|
return try {
|
||||||
val checkHex = Hex.decode(key) // Checks if this is a valid Hex
|
val checkHex = Hex.decode(key).toNpub() // Checks if this is a valid Hex
|
||||||
getOrCreateUser(key)
|
getOrCreateUser(key)
|
||||||
} catch (e: IllegalArgumentException) {
|
} catch (e: IllegalArgumentException) {
|
||||||
Log.e("LocalCache", "Invalid Key to create user: $key", e)
|
Log.e("LocalCache", "Invalid Key to create user: $key", e)
|
||||||
@@ -77,7 +77,7 @@ object LocalCache {
|
|||||||
|
|
||||||
fun checkGetOrCreateNote(key: String): Note? {
|
fun checkGetOrCreateNote(key: String): Note? {
|
||||||
return try {
|
return try {
|
||||||
val checkHex = Hex.decode(key) // Checks if this is a valid Hex
|
val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
|
||||||
getOrCreateNote(key)
|
getOrCreateNote(key)
|
||||||
} catch (e: IllegalArgumentException) {
|
} catch (e: IllegalArgumentException) {
|
||||||
Log.e("LocalCache", "Invalid Key to create note: $key", e)
|
Log.e("LocalCache", "Invalid Key to create note: $key", e)
|
||||||
@@ -96,7 +96,7 @@ object LocalCache {
|
|||||||
|
|
||||||
fun checkGetOrCreateChannel(key: String): Channel? {
|
fun checkGetOrCreateChannel(key: String): Channel? {
|
||||||
return try {
|
return try {
|
||||||
val checkHex = Hex.decode(key) // Checks if this is a valid Hex
|
val checkHex = Hex.decode(key).toNote() // Checks if this is a valid Hex
|
||||||
getOrCreateChannel(key)
|
getOrCreateChannel(key)
|
||||||
} catch (e: IllegalArgumentException) {
|
} catch (e: IllegalArgumentException) {
|
||||||
Log.e("LocalCache", "Invalid Key to create channel: $key", e)
|
Log.e("LocalCache", "Invalid Key to create channel: $key", e)
|
||||||
|
Reference in New Issue
Block a user