From 6491be73375ba344e4554818df29e93f084fcf44 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 7 Oct 2016 17:25:29 +0200 Subject: [PATCH] Add new status 'is account linked' --- src/org/linphone/LinphoneActivity.java | 5 +++++ src/org/linphone/assistant/AssistantActivity.java | 5 +++++ .../assistant/CreateAccountCodeActivationFragment.java | 5 +++++ src/org/linphone/assistant/CreateAccountFragment.java | 5 +++++ src/org/linphone/assistant/LinphoneLoginFragment.java | 5 +++++ submodules/linphone | 2 +- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 2692b5a9e..3d0459d56 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -1834,6 +1834,11 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta @Override public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {} + + @Override + public void onAccountCreatorIsAccountLinked(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } } interface ContactPicked { diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java index 03d9aaca7..56c801553 100644 --- a/src/org/linphone/assistant/AssistantActivity.java +++ b/src/org/linphone/assistant/AssistantActivity.java @@ -680,6 +680,11 @@ private static AssistantActivity instance; } + @Override + public void onAccountCreatorIsAccountLinked(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } + public CountryListAdapter getCountryListAdapter() { return countryListAdapter; } diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java index 721e4fb2d..6eb8ea680 100644 --- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java +++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java @@ -185,4 +185,9 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin @Override public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { } + + @Override + public void onAccountCreatorIsAccountLinked(LinphoneAccountCreator accountCreator, Status status) { + + } } diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java index 8278cf65c..7a81049cd 100644 --- a/src/org/linphone/assistant/CreateAccountFragment.java +++ b/src/org/linphone/assistant/CreateAccountFragment.java @@ -565,4 +565,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, Status status) { } + + @Override + public void onAccountCreatorIsAccountLinked(LinphoneAccountCreator accountCreator, Status status) { + + } } diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java index 9bc26a5d4..80a1a62e2 100644 --- a/src/org/linphone/assistant/LinphoneLoginFragment.java +++ b/src/org/linphone/assistant/LinphoneLoginFragment.java @@ -318,4 +318,9 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { AssistantActivity.instance().displayAssistantCodeConfirm(accountCreator.getUsername(), phoneNumberEdit.getText().toString(), LinphoneUtils.getCountryCode(dialCode), true); } + + @Override + public void onAccountCreatorIsAccountLinked(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } } diff --git a/submodules/linphone b/submodules/linphone index 6caf23eb5..a5cdc5953 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6caf23eb5ce9c7c14e107a95cd4d3255ecc3a8c0 +Subproject commit a5cdc5953c545ddc5f630ec896a2f313ccd552c5