From 51daf1eea6660f0fc233de504308371d1e199206 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 9 Nov 2010 09:26:40 +0100 Subject: [PATCH 1/4] Removed dependency on GUI framework. --- LinphoneProxyConfigImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/LinphoneProxyConfigImpl.java b/LinphoneProxyConfigImpl.java index 7ffb164b2..f1dcb70a4 100644 --- a/LinphoneProxyConfigImpl.java +++ b/LinphoneProxyConfigImpl.java @@ -18,9 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ package org.linphone.core; -import org.linphone.LinphoneService; - -import android.util.Log; @@ -35,7 +32,6 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig { setProxy(proxy); enableRegister(enableRegister); ownPtr=true; - Log.w(LinphoneService.TAG, "route ["+route+"] not used yet"); } protected LinphoneProxyConfigImpl(long aNativePtr) { nativePtr = aNativePtr; From 299b7c95c342533a776358f44780c18ba2bedb02 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 9 Nov 2010 09:29:06 +0100 Subject: [PATCH 2/4] Cleanup --- tutorials/TutorialBuddyStatusActivity.java | 2 +- tutorials/TutorialChatRoomActivity.java | 2 +- tutorials/TutorialHelloWorldActivity.java | 2 +- tutorials/TutorialRegistrationActivity.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tutorials/TutorialBuddyStatusActivity.java b/tutorials/TutorialBuddyStatusActivity.java index 376afadfb..d42607d16 100644 --- a/tutorials/TutorialBuddyStatusActivity.java +++ b/tutorials/TutorialBuddyStatusActivity.java @@ -36,7 +36,7 @@ import android.widget.TextView; */ public class TutorialBuddyStatusActivity extends Activity { - private static final String defaultSipAddress = "sip:tested@10.0.2.6:5059"; + private static final String defaultSipAddress = "sip:"; private TextView sipAddressWidget; private TutorialBuddyStatus tutorial; private Handler mHandler = new Handler() ; diff --git a/tutorials/TutorialChatRoomActivity.java b/tutorials/TutorialChatRoomActivity.java index aa4623eeb..f7dab4ce7 100644 --- a/tutorials/TutorialChatRoomActivity.java +++ b/tutorials/TutorialChatRoomActivity.java @@ -36,7 +36,7 @@ import android.widget.TextView; */ public class TutorialChatRoomActivity extends Activity { - private static final String defaultSipAddress = "sip:tested@10.0.2.6:5059"; + private static final String defaultSipAddress = "sip:"; private TextView sipAddressWidget; private TutorialChatRoom tutorial; private Handler mHandler = new Handler() ; diff --git a/tutorials/TutorialHelloWorldActivity.java b/tutorials/TutorialHelloWorldActivity.java index 3ef643a61..60bd872c7 100644 --- a/tutorials/TutorialHelloWorldActivity.java +++ b/tutorials/TutorialHelloWorldActivity.java @@ -36,7 +36,7 @@ import android.widget.TextView; */ public class TutorialHelloWorldActivity extends Activity { - private static final String defaultSipAddress = "sip:tested@10.0.2.6:5059"; + private static final String defaultSipAddress = "sip:"; private TextView sipAddressWidget; private TutorialHelloWorld tutorial; private Handler mHandler = new Handler() ; diff --git a/tutorials/TutorialRegistrationActivity.java b/tutorials/TutorialRegistrationActivity.java index 4da10f632..d87446140 100644 --- a/tutorials/TutorialRegistrationActivity.java +++ b/tutorials/TutorialRegistrationActivity.java @@ -35,8 +35,8 @@ import android.widget.TextView; */ public class TutorialRegistrationActivity extends TutorialHelloWorldActivity { - private static final String defaultSipAddress = "sip:8182449901ip@mty11.axtel.net"; - private static final String defaultSipPassword = "49901"; + private static final String defaultSipAddress = "sip:"; + private static final String defaultSipPassword = ""; private TextView sipAddressWidget; private TextView sipPasswordWidget; private TutorialRegistration tutorial; From b7886ab9a70f7875c9d6e70663140334416ec4ac Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 17 Nov 2010 10:44:39 +0100 Subject: [PATCH 3/4] fix crash on simulator --- LinphoneCoreImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java index 83a78a00e..775a83895 100644 --- a/LinphoneCoreImpl.java +++ b/LinphoneCoreImpl.java @@ -292,14 +292,22 @@ class LinphoneCoreImpl implements LinphoneCore { public LinphoneChatRoom createChatRoom(String to) { return new LinphoneChatRoomImpl(createChatRoom(nativePtr,to)); } - public void setPreviewWindow(VideoWindow w) { + public void setPreviewWindow(Object w) { throw new RuntimeException("not implemented yet"); // TODO Auto-generated method stub } - public void setVideoWindow(VideoWindow w) { + public void setVideoWindow(Object w) { throw new RuntimeException("not implemented yet"); // TODO Auto-generated method stub } + public void enableVideo(boolean vcap_enabled, boolean display_enabled) { + // TODO Auto-generated method stub + + } + public boolean isVideoEnabled() { + // TODO Auto-generated method stub + return false; + } } From 11ad5c7d021f93257058b97de187c54ce26b69d5 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 25 Nov 2010 14:01:51 +0100 Subject: [PATCH 4/4] use default ring file instead of oldring.wav --- LinphoneCallImpl.java | 3 +++ LinphoneCallLogImpl.java | 4 ++++ LinphoneCoreImpl.java | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/LinphoneCallImpl.java b/LinphoneCallImpl.java index c71883b57..ed8f00708 100644 --- a/LinphoneCallImpl.java +++ b/LinphoneCallImpl.java @@ -58,6 +58,9 @@ class LinphoneCallImpl implements LinphoneCall { public State getState() { return LinphoneCall.State.fromInt(getState(nativePtr)); } + public LinphoneCallParams getCurrentParamsReadOnly() { + throw new RuntimeException("Not Implemenetd yet"); + } } diff --git a/LinphoneCallLogImpl.java b/LinphoneCallLogImpl.java index b0360d194..c9c8b8ffe 100644 --- a/LinphoneCallLogImpl.java +++ b/LinphoneCallLogImpl.java @@ -42,5 +42,9 @@ class LinphoneCallLogImpl implements LinphoneCallLog { public LinphoneAddress getTo() { return new LinphoneAddressImpl(getTo(nativePtr)); } + public CallStatus getStatus() { + // TODO Auto-generated method stub + return null; + } } diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java index 775a83895..01b98bda4 100644 --- a/LinphoneCoreImpl.java +++ b/LinphoneCoreImpl.java @@ -67,6 +67,8 @@ class LinphoneCoreImpl implements LinphoneCore { private native void addFriend(long nativePtr,long friend); private native void setPresenceInfo(long nativePtr,int minute_away, String alternative_contact,int status); private native long createChatRoom(long nativePtr,String to); + private native void setRing(long nativePtr, String path); + private native String getRing(long nativePtr); LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig,File factoryConfig,Object userdata) throws IOException { mListener=listener; @@ -309,5 +311,39 @@ class LinphoneCoreImpl implements LinphoneCore { // TODO Auto-generated method stub return false; } + public void setStunServer(String stun_server) { + // TODO Auto-generated method stub + + } + public String getStunServer() { + // TODO Auto-generated method stub + return null; + } + public void setFirewallPolicy(FirewallPolicy pol) { + // TODO Auto-generated method stub + + } + public FirewallPolicy getFirewallPolicy() { + // TODO Auto-generated method stub + return null; + } + public void setRing(String path) { + setRing(nativePtr,path); + + } + public String getRing() { + return getRing(nativePtr); + } + public LinphoneCall inviteAddressWithParams(LinphoneAddress destination, + LinphoneCallParams params) throws LinphoneCoreException { + throw new RuntimeException("Not Implemenetd yet"); + } + public int updateCall(LinphoneCall call, LinphoneCallParams params) { + throw new RuntimeException("Not Implemenetd yet"); + } + public LinphoneCallParams createDefaultCallParameters() { + throw new RuntimeException("Not Implemenetd yet"); + } + }