diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 7cbb7cd9f..b47439a1e 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -213,7 +213,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta } @Override - public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) { + public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain, LinphoneCore.AuthMethod method) { //authInfoPassword = displayWrongPasswordDialog(username, realm, domain); //authInfoPassword.show(); } diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index b0721d1ed..698e153d4 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -50,6 +50,7 @@ import org.linphone.core.LinphoneCore.GlobalState; import org.linphone.core.LinphoneCore.LogCollectionUploadState; import org.linphone.core.LinphoneCore.RegistrationState; import org.linphone.core.LinphoneCore.RemoteProvisioningState; +import org.linphone.core.LinphoneAuthInfo; import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreListener; @@ -927,7 +928,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag public void displayWarning(LinphoneCore lc, String message) {} - public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) {} + 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) {} diff --git a/src/org/linphone/tutorials/TutorialCardDavSync.java b/src/org/linphone/tutorials/TutorialCardDavSync.java index efcd4bd0d..539349a83 100644 --- a/src/org/linphone/tutorials/TutorialCardDavSync.java +++ b/src/org/linphone/tutorials/TutorialCardDavSync.java @@ -195,7 +195,7 @@ public class TutorialCardDavSync extends Activity implements OnClickListener, Li @Override public void authInfoRequested(LinphoneCore lc, String realm, - String username, String Domain) { + String username, String Domain, LinphoneCore.AuthMethod method) { // TODO Auto-generated method stub } diff --git a/submodules/belle-sip b/submodules/belle-sip index b61dd749d..727db8b6d 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit b61dd749dec10d1f4bb715de6e0868b50c40f0d6 +Subproject commit 727db8b6d041be0d561d34aa1914dbebc1922459 diff --git a/submodules/linphone b/submodules/linphone index 9aa49cdcc..f42568dc7 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9aa49cdcc9140b38bae49177db23ab56f6a471bf +Subproject commit f42568dc719704e8549c3b4f9acce34fcb99b7bc diff --git a/tests/src/org/linphone/test/LinphoneTestManager.java b/tests/src/org/linphone/test/LinphoneTestManager.java index b4caa9655..66da48285 100644 --- a/tests/src/org/linphone/test/LinphoneTestManager.java +++ b/tests/src/org/linphone/test/LinphoneTestManager.java @@ -433,7 +433,7 @@ public class LinphoneTestManager implements LinphoneCoreListener{ @Override public void authInfoRequested(LinphoneCore lc, String realm, - String username, String Domain) { + String username, String Domain, LinphoneCore.AuthMethod method) { // TODO Auto-generated method stub }