commit 75540ff671e99d1e710552c221aca357f21b2a75
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sun Oct 04 22:58:37 2015 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sun Oct 04 22:58:51 2015 -0400
tree aa634dc4df1aa4407497d2d82e36c723ec6f6b4f
parent 9f4d86d77fe34a4f1b041494dbefe7df846cbd91

android: bump to last daemon API

Issue: #79814
Change-Id: Ie1ba9208e5eaa69387fcda818384d5878f36b6d1

ring-android/app/src/main/jni/callmanager.i

diff --git a/ring-android/app/src/main/jni/callmanager.i b/ring-android/app/src/main/jni/callmanager.i
index 9d29d4c..8efe4e0 100644
--- a/ring-android/app/src/main/jni/callmanager.i
+++ b/ring-android/app/src/main/jni/callmanager.i
@@ -41,7 +41,7 @@
     virtual void transferSucceeded(void){}
     virtual void recordPlaybackStopped(const std::string& path){}
     virtual void voiceMailNotify(const std::string& call_id, int nd_msg){}
-    virtual void incomingMessage(const std::string& id, const std::string& from, const std::string& msg){}
+    virtual void incomingMessage(const std::string& id, const std::string& from, const std::map<std::string, std::string>& messages){}
     virtual void incomingCall(const std::string& account_id, const std::string& call_id, const std::string& from){}
     virtual void recordPlaybackFilepath(const std::string& id, const std::string& filename){}
     virtual void conferenceCreated(const std::string& conf_id){}
@@ -129,8 +129,7 @@
 void acceptEnrollment(const std::string& callID, bool accepted);
 
 /* Instant messaging */
-void sendTextMessage(const std::string& callID, const std::string& message);
-void sendTextMessage(const std::string& callID, const std::string& message, const std::string& from);
+void sendTextMessage(const std::string& callID, const std::map<std::string, std::string>& messages, const std::string& from, const bool& isMixed);
 
 }
 
@@ -142,7 +141,7 @@
     virtual void transferSucceeded(void){}
     virtual void recordPlaybackStopped(const std::string& path){}
     virtual void voiceMailNotify(const std::string& call_id, int nd_msg){}
-    virtual void incomingMessage(const std::string& id, const std::string& from, const std::string& msg){}
+    virtual void incomingMessage(const std::string& id, const std::string& from, const std::map<std::string, std::string>& messages){}
     virtual void incomingCall(const std::string& account_id, const std::string& call_id, const std::string& from){}
     virtual void recordPlaybackFilepath(const std::string& id, const std::string& filename){}
     virtual void conferenceCreated(const std::string& conf_id){}