From b7886ab9a70f7875c9d6e70663140334416ec4ac Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 17 Nov 2010 10:44:39 +0100 Subject: [PATCH 1/3] 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 2/3] 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"); + } + } From f54a55d359a906f8e2dfb44252febd3bc968c3d0 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 30 Nov 2010 19:02:11 +0100 Subject: [PATCH 3/3] add proxy suport to TutorialBuddyStatusActivity --- tutorials/TutorialBuddyStatusActivity.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tutorials/TutorialBuddyStatusActivity.java b/tutorials/TutorialBuddyStatusActivity.java index d42607d16..1bf4f981f 100644 --- a/tutorials/TutorialBuddyStatusActivity.java +++ b/tutorials/TutorialBuddyStatusActivity.java @@ -38,6 +38,9 @@ public class TutorialBuddyStatusActivity extends Activity { private static final String defaultSipAddress = "sip:"; private TextView sipAddressWidget; + private TextView mySipAddressWidget; + private TextView mySipPasswordWidget; + private TutorialBuddyStatus tutorial; private Handler mHandler = new Handler() ; private Button buttonCall; @@ -49,6 +52,12 @@ public class TutorialBuddyStatusActivity extends Activity { sipAddressWidget = (TextView) findViewById(R.id.AddressId); sipAddressWidget.setText(defaultSipAddress); + mySipAddressWidget = (TextView) findViewById(R.id.MyAddressId); + mySipAddressWidget.setVisibility(View.VISIBLE); + mySipPasswordWidget = (TextView) findViewById(R.id.Password); + mySipPasswordWidget.setVisibility(TextView.VISIBLE); + + // Output text to the outputText widget final TextView outputText = (TextView) findViewById(R.id.OutputText); final TutorialNotifier notifier = new AndroidTutorialNotifier(mHandler, outputText); @@ -84,7 +93,9 @@ public class TutorialBuddyStatusActivity extends Activity { public void run() { super.run(); try { - tutorial.launchTutorial(sipAddressWidget.getText().toString()); + String myIdentity = mySipAddressWidget.getText().length()>0?mySipAddressWidget.getText().toString():null; + String myPassword = mySipPasswordWidget.getText().length()>0?mySipPasswordWidget.getText().toString():null; + tutorial.launchTutorial(sipAddressWidget.getText().toString(), myIdentity, myPassword); mHandler.post(new Runnable() { public void run() { buttonCall.setEnabled(true);