account: adapt for new daemon API

Change-Id: Ifccca815c3b700cdc57210f296180e004c6a06a0

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;

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);
         }
     }
 

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