diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index b47439a1e..c16701637 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -212,12 +212,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta displayMissedChats(getUnreadMessageCount()); } - @Override - public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain, LinphoneCore.AuthMethod method) { - //authInfoPassword = displayWrongPasswordDialog(username, realm, domain); - //authInfoPassword.show(); - } - @Override public void registrationState(LinphoneCore lc, LinphoneProxyConfig proxy, LinphoneCore.RegistrationState state, String smessage) { if (state.equals(RegistrationState.RegistrationCleared)) { diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 0dd175859..059aa4d9b 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -45,6 +45,7 @@ import org.linphone.core.LinphoneChatMessage; import org.linphone.core.LinphoneChatRoom; import org.linphone.core.LinphoneContent; import org.linphone.core.LinphoneCore; +import org.linphone.core.LinphoneCore.AuthMethod; import org.linphone.core.LinphoneCore.EcCalibratorStatus; import org.linphone.core.LinphoneCore.GlobalState; import org.linphone.core.LinphoneCore.LogCollectionUploadState; @@ -927,17 +928,10 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag private Vibrator mVibrator; public void displayWarning(LinphoneCore lc, String message) {} - - public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain, LinphoneCore.AuthMethod method) {} - public void byeReceived(LinphoneCore lc, String from) {} public void displayMessage(LinphoneCore lc, String message) {} public void show(LinphoneCore lc) {} - - public void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url) { - } - - public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) { - } + public void newSubscriptionRequest(LinphoneCore lc, LinphoneFriend lf, String url) {} + public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) {} @Override public void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf) { @@ -1541,4 +1535,16 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag public void friendListRemoved(LinphoneCore lc, LinphoneFriendList list) { // TODO Auto-generated method stub } + @Override + public void authInfoRequested(LinphoneCore lc, String realm, + String username, String domain) { + // TODO Auto-generated method stub + + } + @Override + public void authenticationRequested(LinphoneCore lc, + LinphoneAuthInfo authInfo, AuthMethod method) { + // TODO Auto-generated method stub + + } } diff --git a/src/org/linphone/tutorials/TutorialCardDavSync.java b/src/org/linphone/tutorials/TutorialCardDavSync.java index 539349a83..27e6e0742 100644 --- a/src/org/linphone/tutorials/TutorialCardDavSync.java +++ b/src/org/linphone/tutorials/TutorialCardDavSync.java @@ -15,6 +15,7 @@ import org.linphone.core.LinphoneChatMessage; import org.linphone.core.LinphoneChatRoom; import org.linphone.core.LinphoneContent; import org.linphone.core.LinphoneCore; +import org.linphone.core.LinphoneCore.AuthMethod; import org.linphone.core.LinphoneCore.EcCalibratorStatus; import org.linphone.core.LinphoneCore.GlobalState; import org.linphone.core.LinphoneCore.LogCollectionUploadState; @@ -193,13 +194,6 @@ public class TutorialCardDavSync extends Activity implements OnClickListener, Li myLog(msg2); } - @Override - public void authInfoRequested(LinphoneCore lc, String realm, - String username, String Domain, LinphoneCore.AuthMethod method) { - // TODO Auto-generated method stub - - } - @Override public void callStatsUpdated(LinphoneCore lc, LinphoneCall call, LinphoneCallStats stats) { @@ -379,4 +373,18 @@ public class TutorialCardDavSync extends Activity implements OnClickListener, Li // TODO Auto-generated method stub } + + @Override + public void authInfoRequested(LinphoneCore lc, String realm, + String username, String domain) { + // TODO Auto-generated method stub + + } + + @Override + public void authenticationRequested(LinphoneCore lc, + LinphoneAuthInfo authInfo, AuthMethod method) { + // TODO Auto-generated method stub + + } } diff --git a/submodules/linphone b/submodules/linphone index b98e85186..05cf0889e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b98e85186c1600658f9028676dbd34d736935e1a +Subproject commit 05cf0889ea62ea09172a539d351a894a62a67cb6