From cf9332d400cf4ac1b50e679bdd27ab851b5ceea7 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 28 Jun 2012 13:17:55 +0200
Subject: [PATCH] add notifyReceived + refreshRegisters to java api
---
java/common/org/linphone/core/LinphoneCore.java | 8 ++++++++
java/common/org/linphone/core/LinphoneCoreListener.java | 9 +++++++++
mediastreamer2 | 2 +-
oRTP | 2 +-
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index f4bcc7ef8e..6f0ce2c653 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -180,6 +180,9 @@ public interface LinphoneCore {
this.tcp = t.tcp;
this.tls = t.tls;
}
+ public String toString() {
+ return "udp["+udp+"] tcp["+tcp+"] tls["+tls+"]";
+ }
}
/**
* Media (RTP) encryption enum-like.
@@ -776,4 +779,9 @@ public interface LinphoneCore {
* Set missed calls count to zero
*/
public void resetMissedCallsCount();
+ /**
+ * re-initiates registration if network is up.
+ */
+ public void refreshRegisters();
+
}
diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index cfe43895ef..400e942c3f 100644
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -103,5 +103,14 @@ public interface LinphoneCoreListener {
* @param data
*/
void ecCalibrationStatus(LinphoneCore lc,LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
+ /**
+ * Report Notified message received for this identity.
+ * @param lc LinphoneCore
+ * @param call LinphoneCall in case the notify is part of a dialog, may be null
+ * @param from LinphoneAddress the message comes from
+ * @param event String the raw body of the notify event.
+ *
+ */
+ void notifyReceived(LinphoneCore lc, LinphoneCall call, LinphoneAddress from, byte[] event);
}
diff --git a/mediastreamer2 b/mediastreamer2
index 84b9ef050c..75eb1fcf8d 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 84b9ef050c6abd26446901c2532573f2589a435b
+Subproject commit 75eb1fcf8d6097e51bcb507be339dd397c6b4dd5
diff --git a/oRTP b/oRTP
index 2590e21d86..41d13b7e49 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 2590e21d864b43d6ac3a2ece0cf3b4d0e208e866
+Subproject commit 41d13b7e491c7fc418987b63ff6ef80c7e8895a4
--
GitLab