From 07f3edaa6e54159995d24a2676bc991fe7d32384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 22 Dec 2022 14:30:36 -0500
Subject: [PATCH] AccountService: convert profile map to Java for async
processing
Change-Id: I6c0e5d666fb952364a8b0b767f8b57236aa836af
---
.../src/main/kotlin/net/jami/services/AccountService.kt | 8 ++++----
.../src/main/kotlin/net/jami/services/DaemonService.kt | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt b/ring-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
index b52b8756f..a1d6b87c4 100644
--- a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
+++ b/ring-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
@@ -266,7 +266,7 @@ class AccountService(
Log.w(TAG, "$accountId loading ${conversations.size} conversations: ")
for (conversationId in conversations) {
try {
- val info: Map<String, String> = JamiService.conversationInfos(accountId, conversationId)
+ val info: Map<String, String> = JamiService.conversationInfos(accountId, conversationId).toNativeFromUtf8()
/*for (Map.Entry<String, String> i : info.entrySet()) {
Log.w(TAG, "conversation info: " + i.getKey() + " " + i.getValue());
}*/
@@ -301,7 +301,7 @@ class AccountService(
}
}
Log.w(TAG, "$accountId loading conversation requests")
- for (requestData in JamiService.getConversationRequests(account.accountId)) {
+ for (requestData in JamiService.getConversationRequests(account.accountId).map { it.toNativeFromUtf8() }) {
try {
/* for ((key, value) in requestData.entries)
Log.e(TAG, "Request: $key $value") */
@@ -1291,7 +1291,7 @@ class AccountService(
}
fun conversationProfileUpdated(accountId: String, conversationId: String, info: StringMap) {
- getAccount(accountId)?.getSwarm(conversationId)?.setProfile(mVCardService.loadConversationProfile(info))
+ getAccount(accountId)?.getSwarm(conversationId)?.setProfile(mVCardService.loadConversationProfile(info.toNativeFromUtf8()))
}
fun conversationPreferencesUpdated(accountId: String, conversationId: String, preferences: StringMap) {
@@ -1329,7 +1329,7 @@ class AccountService(
Log.w(TAG, "conversationReady: can't find account")
return
}
- val info = JamiService.conversationInfos(accountId, conversationId)
+ val info = JamiService.conversationInfos(accountId, conversationId).toNativeFromUtf8()
/*for (Map.Entry<String, String> i : info.entrySet()) {
Log.w(TAG, "conversation info: " + i.getKey() + " " + i.getValue());
}*/
diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/DaemonService.kt b/ring-android/libjamiclient/src/main/kotlin/net/jami/services/DaemonService.kt
index 64528e027..652922ccd 100644
--- a/ring-android/libjamiclient/src/main/kotlin/net/jami/services/DaemonService.kt
+++ b/ring-android/libjamiclient/src/main/kotlin/net/jami/services/DaemonService.kt
@@ -340,7 +340,7 @@ class DaemonService(
}
override fun conversationRequestReceived(accountId: String, conversationId: String, metadata: StringMap) {
- mAccountService.conversationRequestReceived(accountId, conversationId, metadata.toNative())
+ mAccountService.conversationRequestReceived(accountId, conversationId, metadata.toNativeFromUtf8())
}
override fun conversationRequestDeclined(accountId: String, conversationId: String) {
--
GitLab