diff --git a/liblinphone_tester/custom_rules.xml b/liblinphone_tester/custom_rules.xml index 52816e985..71c0890c6 100644 --- a/liblinphone_tester/custom_rules.xml +++ b/liblinphone_tester/custom_rules.xml @@ -79,14 +79,6 @@ - - - - - - - - diff --git a/res/layout/new_password.xml b/res/layout/new_password.xml new file mode 100644 index 000000000..703c7b1b5 --- /dev/null +++ b/res/layout/new_password.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 5ff051b21..e572a1855 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -48,6 +48,7 @@ Ablehnen Konferenz Link + Möchten Sie das Konto %s mit Ihrer Telefonnummer verknüpfen? Vielleicht später Später Nein @@ -64,13 +65,23 @@ Fortsetzen Aktivieren Sie Ihr Konto Konfiguration fertigstellen + Ihr Konto ist erstellt. Bitte überprüfen Sie Ihre E-Mails, um Ihr Konto zu bestätigen. + Sobald das gemacht ist, kommen Sie wieder her und klicken auf die Schaltfläche. + Dieser Assistent hilft Ihnen beim Konfigurieren und Nutzen Ihres SIP-Kontos. + Bitte geben Sie Ihren Benutzernamen und Ihr Passwort des Linphone-Kontos ein + Bitte geben Sie Ihren Benutzernamen und Ihr Passwort mit Ihrer SIP-Domäne ein Bitte geben Sie eine Bereitstellungs-URL an Transport Ihre SIP-Adresse ist Linphone-Konto verwenden SIP-Konto verwenden Fernkonfiguration abrufen + Bitte bestätigen Sie Ihre Landesvorwahl und geben Sie Ihre Telefonnummer ein + Wir haben Ihnen eine SMS mit einem Bestätigungscode an Ihre Telefonnummer gesendet. + Geben Sie bitte den folgenden 4-stelligen Code ein, um Ihre Telefonnummernbestätigung abzuschließen:\n + Bitte geben Sie einen Benutzernamen, eine E-Mail-Adresse und ein Passwort für Ihr Linphone-Konto ein Anzeigename (optional) + Verwenden Sie Ihr Linphone-Konto SIP-Konto verwenden Fernkonfiguration abrufen Abrufen und anwenden @@ -87,6 +98,7 @@ Es ist ein Fehler aufgetreten, versuchen Sie es später nochmal Server nicht erreichbar, überprüfen Sie Ihre Netzwerkverbindung. Der Benutzername wird bereits verwendet. + Diese Telefonnummer wird bereits verwendet.\r\nBitte geben Sie eine andere Nummer ein.\r\nSie können Ihr vorhandenes Konto löschen, wenn Sie Ihre Telefonnummer wiederverwenden möchten. Ihr Benutzername ist ungültig. Ihre Telefonnummer ist ungültig. Ihre E-Mail-Adresse ist ungültig. @@ -98,7 +110,9 @@ Wählen Sie ein Land aus Wählen Sie Ihr Land aus (%s) + Benutzername verwenden (optional) E-Mail-Adresse für Kontobestätigung verwenden + Verwenden Sie Ihren Benutzernamen und Ihr Passwort anstelle Ihrer Telefonnummer Wozu wird meine Telefonnummer verwendet? Ungültige E-Mail-Adresse @@ -116,11 +130,14 @@ Ungültige Telefonnummer Passwort zu kurz Passwort zu lang + Fehler beim Abfragen des Servers. Bitte versuchen Sie es später erneut Nicht unterstützter Transport Landesvorwahl ungültig In-App In-App-Kauf + Die Probezeit läuft am %s ab + Die Bezugszeit läuft am %s ab Geben Sie eine Nummer oder eine Adresse ein @@ -177,7 +194,7 @@ Audio Video Codec: - Afinet: + IP-Familie: Upload-Bandbreite: Download-Bandbreite: ICE-Konnektivität: @@ -247,11 +264,13 @@ TCP TLS Konto löschen + Passwort ändern Als Standard benutzen SIP-Konten Standardkonto Konto hinzufügen + In-App Store Tunnel Hostname Port diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3cd3d3238..cef519a5e 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -48,6 +48,7 @@ Refuser Conférence Associer + Voulez vous associer le compte %s avec votre numéro de téléphone ? Plus tard Plus tard Non @@ -136,6 +137,10 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à Transport non supporté Indicatif de pays non valide + In-app + Achat In-app + La période d\'essai se terminera le %s + L\'abonnement se terminera le %s Entrez un numéro ou une adresse @@ -192,9 +197,12 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à Audio Vidéo Codec : + Type d\'IP : Bande passante envoi : Bande passante réception : Connexion ICE : + Résolution vidéo envoyée + Résolution vidéo reçu Encodeur : Décodeur : Appel @@ -257,7 +265,9 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à TCP TLS Supprimer ce compte + Changer de mot de passe Utiliser par défaut + Mot de passe changé Comptes SIP Compte par défaut diff --git a/res/values/strings.xml b/res/values/strings.xml index 7afce82a3..074a4e14c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -210,7 +210,7 @@ Audio Video Codec: - Afinet: + IP Family: Upload bandwidth: Download bandwidth: ICE connectivity: @@ -284,7 +284,9 @@ TCP TLS Delete this account + Change password Use as default + Password changed SIP Accounts diff --git a/res/xml/account_preferences.xml b/res/xml/account_preferences.xml index 9c2182909..305750376 100644 --- a/res/xml/account_preferences.xml +++ b/res/xml/account_preferences.xml @@ -5,68 +5,68 @@ android:title="@string/pref_sipaccount" android:key="@string/pref_sipaccount_key" android:persistent="false"> - - - - - - - - - - - + - + - - - + android:persistent="false"/> + - + - - - - @@ -82,7 +82,7 @@ android:numeric="integer" android:persistent="false"/> - @@ -96,26 +96,30 @@ android:title="@string/pref_link_account" android:key="@string/pref_link_account_key" android:persistent="false"/> - + - + - + - + - - + + - + - + \ No newline at end of file diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java index 3561ca32b..7f7b49f8f 100644 --- a/src/org/linphone/AccountPreferencesFragment.java +++ b/src/org/linphone/AccountPreferencesFragment.java @@ -23,11 +23,18 @@ import java.util.List; import org.linphone.LinphonePreferences.AccountBuilder; import org.linphone.assistant.AssistantActivity; +import org.linphone.core.LinphoneAccountCreator; import org.linphone.core.LinphoneCoreException; +import org.linphone.core.LinphoneCoreFactory; import org.linphone.mediastream.Log; import org.linphone.ui.PreferencesListFragment; +import android.app.AlertDialog; +import android.app.ProgressDialog; +import android.content.DialogInterface; import android.content.Intent; +import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.EditTextPreference; @@ -37,18 +44,24 @@ import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceCategory; import android.preference.PreferenceScreen; +import android.support.v4.content.ContextCompat; +import android.view.LayoutInflater; +import android.view.View; import android.view.WindowManager; +import android.widget.EditText; /** * @author Sylvain Berfini */ -public class AccountPreferencesFragment extends PreferencesListFragment { +public class AccountPreferencesFragment extends PreferencesListFragment implements LinphoneAccountCreator.LinphoneAccountCreatorListener { private int n; private boolean isNewAccount=false; private LinphonePreferences mPrefs; private EditTextPreference mProxyPreference; private ListPreference mTransportPreference; private AccountBuilder builder; + private LinphoneAccountCreator accountCreator; + private ProgressDialog progress; public AccountPreferencesFragment() { super(R.xml.account_preferences); @@ -289,6 +302,10 @@ public class AccountPreferencesFragment extends PreferencesListFragment { private void initAccountPreferencesFields(PreferenceScreen parent) { boolean isDefaultAccount = mPrefs.getDefaultAccountIndex() == n; + accountCreator = LinphoneCoreFactory.instance().createAccountCreator(LinphoneManager.getLc() + , LinphonePreferences.instance().getXmlrpcUrl()); + accountCreator.setListener(this); + PreferenceCategory account = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_sipaccount_key)); EditTextPreference username = (EditTextPreference) account.getPreference(0); username.setOnPreferenceChangeListener(usernameChangedListener); @@ -387,8 +404,8 @@ public class AccountPreferencesFragment extends PreferencesListFragment { Preference linkAccount = advanced.getPreference(9); linkAccount.setOnPreferenceClickListener(linkAccountListener); - PreferenceCategory manage = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_manage_key)); - final CheckBoxPreference disable = (CheckBoxPreference) manage.getPreference(0); + PreferenceCategory manage = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_manage_key)); + final CheckBoxPreference disable = (CheckBoxPreference) manage.getPreference(0); disable.setEnabled(true); disable.setOnPreferenceChangeListener(disableChangedListener); if(!isNewAccount){ @@ -396,10 +413,9 @@ public class AccountPreferencesFragment extends PreferencesListFragment { } CheckBoxPreference mainAccount = (CheckBoxPreference) manage.getPreference(1); - mainAccount.setChecked(isDefaultAccount); - mainAccount.setEnabled(!mainAccount.isChecked()); - mainAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() - { + mainAccount.setChecked(isDefaultAccount); + mainAccount.setEnabled(!mainAccount.isChecked()); + mainAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() { public boolean onPreferenceClick(Preference preference) { mPrefs.setDefaultAccount(n); disable.setEnabled(false); @@ -412,7 +428,63 @@ public class AccountPreferencesFragment extends PreferencesListFragment { mainAccount.setEnabled(!mainAccount.isChecked()); } - final Preference delete = manage.getPreference(2); + final Preference changePassword = manage.getPreference(2); + if (mPrefs.getAccountDomain(n).compareTo(getString(R.string.default_domain)) == 0) { + changePassword.setEnabled(!isNewAccount); + changePassword.setOnPreferenceClickListener(new OnPreferenceClickListener() { + public boolean onPreferenceClick(Preference preference) { + final AlertDialog.Builder alert = new AlertDialog.Builder(LinphoneActivity.instance()); + LayoutInflater inflater = LinphoneActivity.instance().getLayoutInflater(); + View layout = inflater.inflate(R.layout.new_password, null); + final EditText pass1 = (EditText) layout.findViewById(R.id.password1); + final EditText pass2 = (EditText) layout.findViewById(R.id.password2); + alert.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + } + }); + alert.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + LinphoneAccountCreator.Status status = accountCreator.setPassword(pass1.getText().toString()); + if (status.equals(LinphoneAccountCreator.Status.Ok)) { + if (pass1.getText().toString().compareTo(pass2.getText().toString()) == 0) { + accountCreator.setUsername(mPrefs.getAccountUsername(n)); + accountCreator.setHa1(mPrefs.getAccountHa1(n)); + status = accountCreator.updatePassword(pass1.getText().toString()); + if (!status.equals(LinphoneAccountCreator.Status.Ok)) { + LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status) + , LinphoneActivity.instance()); + } else { + progress = ProgressDialog.show(LinphoneActivity.instance(), null, null); + Drawable d = new ColorDrawable(ContextCompat.getColor(LinphoneActivity.instance(), R.color.colorE)); + d.setAlpha(200); + progress.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); + progress.getWindow().setBackgroundDrawable(d); + progress.setContentView(R.layout.progress_dialog); + progress.show(); + } + } else { + LinphoneUtils.displayErrorAlert(getString(R.string.wizard_passwords_unmatched) + , LinphoneActivity.instance()); + } + return; + } + LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), LinphoneActivity.instance()); + } + }); + + alert.setView(layout); + alert.show(); + return true; + } + }); + } else { + changePassword.setEnabled(false); + } + + final Preference delete = manage.getPreference(3); delete.setEnabled(!isNewAccount); delete.setOnPreferenceClickListener(new OnPreferenceClickListener() { public boolean onPreferenceClick(Preference preference) { @@ -484,4 +556,60 @@ public class AccountPreferencesFragment extends PreferencesListFragment { LinphoneActivity.instance().hideTopBar(); } } + + @Override + public void onAccountCreatorIsAccountUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + } + + @Override + public void onAccountCreatorAccountCreated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } + + @Override + public void onAccountCreatorAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } + + @Override + public void onAccountCreatorAccountLinkedWithPhoneNumber(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } + + @Override + public void onAccountCreatorPhoneNumberLinkActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } + + @Override + public void onAccountCreatorIsAccountActivated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } + + @Override + public void onAccountCreatorPhoneAccountRecovered(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } + + @Override + public void onAccountCreatorIsAccountLinked(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } + + @Override + public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + } + + @Override + public void onAccountCreatorPasswordUpdated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + progress.dismiss(); + if (status.equals(LinphoneAccountCreator.Status.Ok)) { + mPrefs.setAccountPassword(n, accountCreator.getPassword()); + PreferenceCategory account = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_sipaccount_key)); + ((EditTextPreference) account.getPreference(2)).setText(mPrefs.getAccountPassword(n)); + LinphoneUtils.displayErrorAlert(getString(R.string.pref_password_changed), LinphoneActivity.instance()); + } else { + LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), LinphoneActivity.instance()); + } + } } diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index d3811866f..dc879a959 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -1449,8 +1449,12 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag public void isAccountWithAlias(){ if(LinphoneManager.getLc().getDefaultProxyConfig() != null) { - accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex())); - accountCreator.isAccountUsed(); + long now = Calendar.getInstance().getTimeInMillis(); + if (LinphonePreferences.instance().getLinkPopupTime() == null + || Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) > now) { + accountCreator.setUsername(LinphonePreferences.instance().getAccountUsername(LinphonePreferences.instance().getDefaultAccountIndex())); + accountCreator.isAccountUsed(); + } } else { LinphonePreferences.instance().setLinkPopupTime(null); } @@ -1459,11 +1463,9 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag private void askLinkWithPhoneNumber(){ long now = Calendar.getInstance().getTimeInMillis(); long newDate = now + (LinphoneActivity.instance().getResources().getInteger(R.integer.popup_time_interval)*60); - if (LinphonePreferences.instance().getLinkPopupTime() != null && Long.parseLong(LinphonePreferences.instance().getLinkPopupTime()) > now) { - return; - } else { - LinphonePreferences.instance().setLinkPopupTime(String.valueOf(newDate)); - } + + LinphonePreferences.instance().setLinkPopupTime(String.valueOf(newDate)); + final Dialog dialog = LinphoneActivity.instance().displayDialog(String.format(getString(R.string.link_account_popup), LinphoneManager.getLc().getDefaultProxyConfig().getAddress().asStringUriOnly())); Button delete = (Button) dialog.findViewById(R.id.delete_button); delete.setText(getString(R.string.link)); @@ -1657,4 +1659,9 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag @Override public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) {} + + @Override + public void onAccountCreatorPasswordUpdated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } } diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 03426c135..e32f30e3c 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -779,7 +779,7 @@ public class LinphonePreferences { if (authInfo != null) { getLc().removeAuthInfo(authInfo); } - + LinphoneProxyConfig proxyCfg = getProxyConfig(n); if (proxyCfg != null) getLc().removeProxyConfig(proxyCfg); @@ -788,7 +788,7 @@ public class LinphonePreferences { } else { getLc().setDefaultProxyConfig(null); } - + getLc().refreshRegisters(); } // End of accounts settings @@ -976,7 +976,7 @@ public class LinphonePreferences { transports.tls = LINPHONE_CORE_RANDOM_PORT; getLc().setSignalingTransportPorts(transports); } - + private LinphoneNatPolicy getOrCreateNatPolicy() { LinphoneNatPolicy nat = getLc().getNatPolicy(); if (nat == null) { @@ -991,9 +991,9 @@ public class LinphonePreferences { } public void setStunServer(String stun) { - LinphoneNatPolicy nat = getOrCreateNatPolicy(); + LinphoneNatPolicy nat = getOrCreateNatPolicy(); nat.setStunServer(stun); - + if (stun != null && !stun.isEmpty()) { nat.enableStun(true); } @@ -1032,16 +1032,16 @@ public class LinphonePreferences { LinphoneNatPolicy nat = getOrCreateNatPolicy(); return nat.turnEnabled(); } - + public String getTurnUsername() { LinphoneNatPolicy nat = getOrCreateNatPolicy(); return nat.getStunServerUsername(); } - + public void setTurnUsername(String username) { LinphoneNatPolicy nat = getOrCreateNatPolicy(); LinphoneAuthInfo authInfo = getLc().findAuthInfo(nat.getStunServerUsername(), null, null); - + if (authInfo != null) { LinphoneAuthInfo cloneAuthInfo = authInfo.clone(); getLc().removeAuthInfo(authInfo); @@ -1055,11 +1055,11 @@ public class LinphonePreferences { nat.setStunServerUsername(username); getLc().setNatPolicy(nat); } - + public void setTurnPassword(String password) { LinphoneNatPolicy nat = getOrCreateNatPolicy(); LinphoneAuthInfo authInfo = getLc().findAuthInfo(nat.getStunServerUsername(), null, null); - + if (authInfo != null) { LinphoneAuthInfo cloneAuthInfo = authInfo.clone(); getLc().removeAuthInfo(authInfo); @@ -1084,7 +1084,7 @@ public class LinphonePreferences { public void setPushNotificationEnabled(boolean enable) { getConfig().setBool("app", "push_notification", enable); - + LinphoneCore lc = getLc(); if (lc == null) { return; @@ -1316,31 +1316,31 @@ public class LinphonePreferences { public boolean isContactsMigrationDone(){ return getConfig().getBool("app", "contacts_migration_done", false); } - + public String getInAppPurchaseValidatingServerUrl() { return getConfig().getString("in-app-purchase", "server_url", null); } - + public Purchasable getInAppPurchasedItem() { String id = getConfig().getString("in-app-purchase", "purchase_item_id", null); String payload = getConfig().getString("in-app-purchase", "purchase_item_payload", null); String signature = getConfig().getString("in-app-purchase", "purchase_item_signature", null); String username = getConfig().getString("in-app-purchase", "purchase_item_username", null); - + Purchasable item = new Purchasable(id).setPayloadAndSignature(payload, signature).setUserData(username); return item; } - + public void setInAppPurchasedItem(Purchasable item) { if (item == null) return; - + getConfig().setString("in-app-purchase", "purchase_item_id", item.getId()); getConfig().setString("in-app-purchase", "purchase_item_payload", item.getPayload()); getConfig().setString("in-app-purchase", "purchase_item_signature", item.getPayloadSignature()); getConfig().setString("in-app-purchase", "purchase_item_username", item.getUserData()); } - + public ArrayList getInAppPurchasables() { ArrayList purchasables = new ArrayList(); String list = getConfig().getString("in-app-purchase", "purchasable_items_ids", null); @@ -1401,19 +1401,19 @@ public class LinphonePreferences { public void setServiceNotificationVisibility(boolean enable) { getConfig().setBool("app", "show_service_notification", enable); } - + public boolean isOverlayEnabled() { return getConfig().getBool("app", "display_overlay", false); } - + public void enableOverlay(boolean enable) { getConfig().setBool("app", "display_overlay", enable); } - + public LinphoneLimeState getLimeEncryption() { return getLc().getLimeEncryption(); } - + public void setLimeEncryption(LinphoneLimeState lime) { getLc().setLimeEncryption(lime); } @@ -1429,16 +1429,16 @@ public class LinphonePreferences { } return firstTime; } - + public void permissionHasBeenAsked(String permission) { getConfig().setBool("app", permission, false); } - + public boolean isDeviceRingtoneEnabled() { int readExternalStorage = mContext.getPackageManager().checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE, mContext.getPackageName()); return getConfig().getBool("app", "device_ringtone", true) && readExternalStorage == PackageManager.PERMISSION_GRANTED; } - + public void enableDeviceRingtone(boolean enable) { getConfig().setBool("app", "device_ringtone", enable); } @@ -1446,7 +1446,7 @@ public class LinphonePreferences { public boolean isBisFeatureEnabled() { return getConfig().getBool("app", "bis_feature", true); } - + public void enableBisFeature(boolean enable) { getConfig().setBool("app", "bis_feature", enable); } @@ -1454,7 +1454,7 @@ public class LinphonePreferences { public boolean isAutoAnswerEnabled() { return getConfig().getBool("app", "auto_answer", false); } - + public void enableAutoAnswer(boolean enable) { getConfig().setBool("app", "auto_answer", enable); } diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java index 6f181d631..a706ab6b6 100644 --- a/src/org/linphone/assistant/AssistantActivity.java +++ b/src/org/linphone/assistant/AssistantActivity.java @@ -68,8 +68,6 @@ import android.view.View.OnClickListener; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; -import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -702,6 +700,11 @@ private static AssistantActivity instance; } + @Override + public void onAccountCreatorPasswordUpdated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } + public CountryListAdapter getCountryListAdapter() { return countryListAdapter; } diff --git a/src/org/linphone/assistant/CreateAccountActivationFragment.java b/src/org/linphone/assistant/CreateAccountActivationFragment.java index 59f57dfc3..d142a71dc 100644 --- a/src/org/linphone/assistant/CreateAccountActivationFragment.java +++ b/src/org/linphone/assistant/CreateAccountActivationFragment.java @@ -122,4 +122,9 @@ public class CreateAccountActivationFragment extends Fragment implements OnClick @Override public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { } + + @Override + public void onAccountCreatorPasswordUpdated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } } diff --git a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java index 0b40c1385..a9efe7a2d 100644 --- a/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java +++ b/src/org/linphone/assistant/CreateAccountCodeActivationFragment.java @@ -197,4 +197,9 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Lin public void onAccountCreatorIsPhoneNumberUsed(LinphoneAccountCreator accountCreator, Status status) { } + + @Override + public void onAccountCreatorPasswordUpdated(LinphoneAccountCreator accountCreator, Status status) { + + } } diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java index 3c6b1768e..ea9c0630d 100644 --- a/src/org/linphone/assistant/CreateAccountFragment.java +++ b/src/org/linphone/assistant/CreateAccountFragment.java @@ -692,4 +692,9 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On accountCreator.isAccountActivated(); } } + + @Override + public void onAccountCreatorPasswordUpdated(LinphoneAccountCreator accountCreator, Status status) { + + } } diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java index 445ed2138..aa2e29d13 100644 --- a/src/org/linphone/assistant/LinphoneLoginFragment.java +++ b/src/org/linphone/assistant/LinphoneLoginFragment.java @@ -371,4 +371,9 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), AssistantActivity.instance()); } } + + @Override + public void onAccountCreatorPasswordUpdated(LinphoneAccountCreator accountCreator, LinphoneAccountCreator.Status status) { + + } } diff --git a/submodules/linphone b/submodules/linphone index 3bc59a20c..a988e996c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3bc59a20c78efc9705db715b4e72cc921e54c835 +Subproject commit a988e996ca9df932737ee2fe3000ec10f5865f7a