Skip to content

refactor(kotlin): update HashMap types to support nullable values #277

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

Merged
Jasonvdb merged 1 commit into from
Feb 25, 2025
Merged

refactor(kotlin): update HashMap types to support nullable values #277

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
4 changes: 2 additions & 2 deletions lib/android/src/main/java/com/reactnativeldk/Helpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,8 +530,8 @@ fun currencyString(currency: Currency): String {
}
}

fun mergeObj(obj1: JSONObject, obj2: HashMap<String, Any>): HashMap<String, Any> {
val newObj = HashMap<String, Any>()
fun mergeObj(obj1: JSONObject, obj2: HashMap<String, Any?>): HashMap<String, Any?> {
val newObj = HashMap<String, Any?>()

obj1.keys().forEach { key ->
newObj[key] = obj1[key]
Expand Down
10 changes: 5 additions & 5 deletions lib/android/src/main/java/com/reactnativeldk/classes/LdkChannelManagerPersister.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
return
}

var payments: Array<HashMap<String, Any>> = arrayOf()
var payments: Array<HashMap<String, Any?>> = arrayOf()
var paymentReplaced = false

try {
Expand All @@ -275,7 +275,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
continue
}

val map = HashMap<String, Any>()
val map = HashMap<String, Any?>()
for (key in existingPayment.keys()) {
map[key] = existingPayments.getJSONObject(i).get(key)
}
Expand All @@ -296,13 +296,13 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
File(LdkModule.accountStoragePath + "/" + LdkFileNames.PaymentsClaimed.fileName).writeText(JSONArray(payments).toString())
}

fun persistPaymentSent(payment: HashMap<String, Any>) {
fun persistPaymentSent(payment: HashMap<String, Any?>) {
if (LdkModule.accountStoragePath == "") {
LdkEventEmitter.send(EventTypes.native_log, "Error. Failed to persist sent payment to disk (No set storage)")
return
}

var payments: Array<HashMap<String, Any>> = arrayOf()
var payments: Array<HashMap<String, Any?>> = arrayOf()
var paymentReplaced = false

try {
Expand All @@ -319,7 +319,7 @@ class LdkChannelManagerPersister: ChannelManagerConstructor.EventHandler {
continue
}

val map = HashMap<String, Any>()
val map = HashMap<String, Any?>()
for (key in existingPayment.keys()) {
map[key] = existingPayment.get(key)
}
Expand Down
Loading