From f9a35531995ad7eda3ccd64fdac57fdbba0671b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 4 Mar 2020 15:53:25 -0500
Subject: [PATCH] account: adapt for new daemon API
Change-Id: Ifccca815c3b700cdc57210f296180e004c6a06a0
---
.../src/main/java/cx/ring/services/AccountService.java | 4 +++-
.../src/main/java/cx/ring/services/CallService.java | 2 +-
.../src/main/java/cx/ring/services/DaemonService.java | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ring-android/libringclient/src/main/java/cx/ring/services/AccountService.java b/ring-android/libringclient/src/main/java/cx/ring/services/AccountService.java
index 0d5bc00b9..a6b6e4332 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/services/AccountService.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/services/AccountService.java
@@ -120,6 +120,7 @@ public class AccountService {
public static class Message {
String accountId;
+ String messageId;
String callId;
String author;
Map<String, String> messages;
@@ -1234,10 +1235,11 @@ public class AccountService {
accountSubject.onNext(account);
}
- void incomingAccountMessage(String accountId, String callId, String from, Map<String, String> messages) {
+ void incomingAccountMessage(String accountId, String messageId, String callId, String from, Map<String, String> messages) {
Log.d(TAG, "incomingAccountMessage: " + accountId + " " + messages.size());
Message message = new Message();
message.accountId = accountId;
+ message.messageId = messageId;
message.callId = callId;
message.author = from;
message.messages = messages;
diff --git a/ring-android/libringclient/src/main/java/cx/ring/services/CallService.java b/ring-android/libringclient/src/main/java/cx/ring/services/CallService.java
index 9b18e923b..bfb3f5343 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/services/CallService.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/services/CallService.java
@@ -504,7 +504,7 @@ public class CallService {
mContactService.saveVCardContactData(sipCall.getContact(), sipCall.getAccount(), vcard);
}
if (messages.containsKey(MIME_TEXT_PLAIN)) {
- mAccountService.incomingAccountMessage(sipCall.getAccount(), callId, from, messages);
+ mAccountService.incomingAccountMessage(sipCall.getAccount(), null, callId, from, messages);
}
}
diff --git a/ring-android/libringclient/src/main/java/cx/ring/services/DaemonService.java b/ring-android/libringclient/src/main/java/cx/ring/services/DaemonService.java
index a9205cbad..e45d552fa 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/services/DaemonService.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/services/DaemonService.java
@@ -145,11 +145,11 @@ public class DaemonService {
}
@Override
- public void incomingAccountMessage(String accountId, String from, StringMap messages) {
+ public void incomingAccountMessage(String accountId, String messageId, String from, StringMap messages) {
if (messages == null || messages.isEmpty())
return;
Map<String, String> jmessages = messages.toNativeFromUtf8();
- mExecutor.submit(() -> mAccountService.incomingAccountMessage(accountId, null, from, jmessages));
+ mExecutor.submit(() -> mAccountService.incomingAccountMessage(accountId, messageId, null, from, jmessages));
}
@Override
--
GitLab