...
 
Commits (1)
......@@ -51,6 +51,7 @@ public class AccountConnectionAssistantActivity extends AssistantActivity {
if (mAbortCreation) {
return;
}
mAccountCreator.setAlgorithm(getString(R.string.default_algorithm_for_account_creation));
setContentView(R.layout.assistant_account_connection);
......
......@@ -23,6 +23,7 @@ import android.app.AlertDialog;
import android.content.Intent;
import android.os.Bundle;
import android.telephony.TelephonyManager;
import android.view.KeyEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.EditText;
......@@ -107,6 +108,17 @@ public abstract class AssistantActivity extends LinphoneGenericActivity
}
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
// If back button is disabled, prevent OS back button from doing anything
if (!mBack.isEnabled()) {
return true;
}
}
return super.onKeyDown(keyCode, event);
}
void createProxyConfigAndLeaveAssistant() {
Core core = LinphoneManager.getCore();
boolean useLinphoneDefaultValues =
......
......@@ -47,6 +47,7 @@ public class EmailAccountCreationAssistantActivity extends AssistantActivity {
if (mAbortCreation) {
return;
}
mAccountCreator.setAlgorithm(getString(R.string.default_algorithm_for_account_creation));
setContentView(R.layout.assistant_email_account_creation);
......
......@@ -49,6 +49,7 @@ public class PhoneAccountCreationAssistantActivity extends AssistantActivity {
if (mAbortCreation) {
return;
}
mAccountCreator.setAlgorithm(getString(R.string.default_algorithm_for_account_creation));
setContentView(R.layout.assistant_phone_account_creation);
......
......@@ -52,6 +52,7 @@ public class PhoneAccountLinkingAssistantActivity extends AssistantActivity {
if (mAbortCreation) {
return;
}
mAccountCreator.setAlgorithm(getString(R.string.default_algorithm_for_account_creation));
setContentView(R.layout.assistant_phone_account_linking);
......
......@@ -33,5 +33,6 @@
<entry name="username_max_length" overwrite="true">128</entry>
<entry name="username_min_length" overwrite="true">1</entry>
<entry name="username_regex" overwrite="true">^[a-zA-Z0-9+_.\-]*$</entry>
<entry name="algorithm" overwrite="true">MD5</entry>
</section>
</config>
......@@ -33,5 +33,6 @@
<entry name="username_max_length" overwrite="true">64</entry>
<entry name="username_min_length" overwrite="true">1</entry>
<entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
<entry name="algorithm" overwrite="true">SHA-256</entry>
</section>
</config>
......@@ -36,7 +36,7 @@ activation_code_length=4
prefer_basic_chat_room=1
[assistant]
xmlrpc_url=https://subscribe.linphone.org:444/wizard.php
xmlrpc_url=https://subscribe.linphone.org/flexisip-account-manager/xmlrpc.php
[lime]
lime_update_threshold=-1
\ No newline at end of file
......@@ -68,6 +68,7 @@
<bool name="assistant_account_validation_mandatory">false</bool>
<bool name="display_account_assistant_at_first_start">true</bool>
<bool name="forbid_to_leave_assistant_before_account_configuration">false</bool>
<string name="default_algorithm_for_account_creation" translatable="false">SHA-256</string> <!-- Can be MD5 -->
<!-- Call -->
<bool name="forbid_self_call">false</bool>
......