diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so index b560ffc09..da187852c 100755 Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so index 47758a2b3..d68ee0e79 100755 Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ diff --git a/src/org/linphone/BootReceiver.java b/src/org/linphone/BootReceiver.java index 7a4e6f99f..836e62d12 100644 --- a/src/org/linphone/BootReceiver.java +++ b/src/org/linphone/BootReceiver.java @@ -33,6 +33,5 @@ public class BootReceiver extends BroadcastReceiver { lLinphoneServiceIntent.setClass(context, LinphoneService.class); context.startService(lLinphoneServiceIntent);; } - } } diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index 5ce891fac..69d77a884 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -20,9 +20,11 @@ package org.linphone; import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCall; +import org.linphone.core.LinphoneChatRoom; import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreListener; +import org.linphone.core.LinphoneFriend; import org.linphone.core.LinphoneProxyConfig; import org.linphone.core.LinphoneCall.State; @@ -583,4 +585,18 @@ public class DialerActivity extends Activity implements LinphoneCoreListener { aButton.setOnTouchListener(lListener); } + public void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, + String url) { + // TODO Auto-generated method stub + + } + public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) { + // TODO Auto-generated method stub + + } + public void textReceived(LinphoneCore lc, LinphoneChatRoom cr, + LinphoneAddress from, String message) { + // TODO Auto-generated method stub + + } } diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 507bcbf41..17bc557f4 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -26,12 +26,15 @@ import java.io.InputStream; import java.util.Timer; import java.util.TimerTask; +import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneAuthInfo; import org.linphone.core.LinphoneCall; +import org.linphone.core.LinphoneChatRoom; import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreListener; +import org.linphone.core.LinphoneFriend; import org.linphone.core.LinphoneProxyConfig; import org.linphone.core.PayloadType; import org.linphone.core.LinphoneCall.State; @@ -406,6 +409,20 @@ public class LinphoneService extends Service implements LinphoneCoreListener { theLinphone=null; mNotificationManager.cancel(NOTIFICATION_ID); } + public void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, + String url) { + // TODO Auto-generated method stub + + } + public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) { + // TODO Auto-generated method stub + + } + public void textReceived(LinphoneCore lc, LinphoneChatRoom cr, + LinphoneAddress from, String message) { + // TODO Auto-generated method stub + + } } diff --git a/src/org/linphone/core/LinphoneCoreFactoryImpl.java b/src/org/linphone/core/LinphoneCoreFactoryImpl.java index 712e27b63..e86f0b100 100644 --- a/src/org/linphone/core/LinphoneCoreFactoryImpl.java +++ b/src/org/linphone/core/LinphoneCoreFactoryImpl.java @@ -68,4 +68,16 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory { //not implemented on Android } + + @Override + LinphoneFriend createLinphoneFriend(String friendUri) { + // TODO Auto-generated method stub + return null; + } + + @Override + LinphoneFriend createLinphoneFriend() { + // TODO Auto-generated method stub + return null; + } } diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java index e042b3951..223a52fdc 100644 --- a/src/org/linphone/core/LinphoneCoreImpl.java +++ b/src/org/linphone/core/LinphoneCoreImpl.java @@ -270,5 +270,18 @@ class LinphoneCoreImpl implements LinphoneCore { public void stopDtmf() { stopDtmf(nativePtr); } + public void addFriend(LinphoneFriend lf) throws LinphoneCoreException { + // TODO Auto-generated method stub + + } + public LinphoneChatRoom createChatRoom(String to) { + // TODO Auto-generated method stub + return null; + } + public void setPresenceInfo(int minuteAway, String alternativeContact, + OnlineStatus status) { + // TODO Auto-generated method stub + + } } diff --git a/submodules/linphone b/submodules/linphone index dea7a7661..740dbb904 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit dea7a7661cbf7e95e476a7ddd9bf5449e3093c40 +Subproject commit 740dbb9041bea18490fcd9c7abb9dac670413a34