Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added displayname/username and expire preferences

Browse source
This commit is contained in:
Sylvain Berfini 2012-11-16 14:42:43 +01:00
parent 549695216c
commit f07f35e00b
7 changed files with 54 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/values-FR/strings.xml
View file

@ -348,4 +348,9 @@
<string name="contact_first_name">Prénom</string>
<string name="contact_last_name">Nom</string>
<string name="pref_primary_account_title">Compte principal</string>
<string name="pref_display_name_title">Nom d\'affichage</string>
<string name="pref_user_name_title">Nom d\'utilisateur</string>
<string name="pref_expire_title">Expiration</string>
</resources>

3
res/values/non_localizable_defaults.xml
View file

@ -51,6 +51,9 @@
<string name="pref_incoming_call_timeout_default">30</string>
<string name="pref_image_sharing_server_default">https://www.linphone.org:444/upload.php</string>
<string name="pref_audio_use_specific_mode_default">0</string>
<string name="pref_expire_default">600</string>
<string name="pref_display_name_default">Linphone Android</string>
<string name="pref_user_name_default">linphone.android</string>
<bool name="pref_auto_accept_friends_default">false</bool>

4
res/values/non_localizable_strings.xml
View file

@ -102,4 +102,8 @@
<string name="pref_video_port_key">pref_video_port_key</string>
<string name="pref_audio_port_key">pref_audio_port_key</string>
<string name="pref_incoming_call_timeout_key">pref_incoming_expire_key</string>
<string name="pref_display_name_key">pref_display_name_key</string>
<string name="pref_user_name_key">pref_user_name_key</string>
<string name="pref_expire_key">pref_expire_key</string>
</resources>

5
res/values/strings.xml
View file

@ -394,4 +394,9 @@
<string name="phone_number">Phone number</string>
<string name="contact_first_name">First name</string>
<string name="contact_last_name">Last name</string>
<string name="pref_primary_account_title">Primary account</string>
<string name="pref_display_name_title">Display name</string>
<string name="pref_user_name_title">Username</string>
<string name="pref_expire_title">Expire</string>
</resources>

34
res/xml/preferences.xml
View file

@ -266,10 +266,15 @@
<PreferenceScreen
android:title="@string/pref_advanced">
<CheckBoxPreference
android:key="@string/pref_debug_key"
android:title="@string/pref_debug"
android:defaultValue="@bool/pref_debug_default"/>
<PreferenceCategory
android:title="@string/pref_debug">
<CheckBoxPreference
android:key="@string/pref_debug_key"
android:title="@string/pref_debug"
android:defaultValue="@bool/pref_debug_default"/>
</PreferenceCategory>
<CheckBoxPreference
android:defaultValue="@bool/pref_animation_enable_default"
@ -286,6 +291,27 @@
android:title="@string/pref_incoming_call_timeout_title"
android:defaultValue="@string/pref_incoming_call_timeout_default"
android:layout="@layout/hidden"/>
<EditTextPreference
android:key="@string/pref_expire_key"
android:title="@string/pref_expire_title"
android:defaultValue="@string/pref_expire_default"
android:numeric="integer" />
<PreferenceCategory
android:title="@string/pref_primary_account_title">
<EditTextPreference
android:title="@string/pref_display_name_title"
android:defaultValue="@string/pref_display_name_default"
android:key="@string/pref_display_name_key"/>
<EditTextPreference
android:title="@string/pref_user_name_title"
android:defaultValue="@string/pref_user_name_default"
android:key="@string/pref_user_name_key"/>
</PreferenceCategory>
<EditTextPreference
android:key="@string/pref_image_sharing_server_key"

7
src/org/linphone/LinphoneManager.java
View file

@ -610,6 +610,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
}
LinphoneProxyConfig proxycon = LinphoneCoreFactory.instance().createProxyConfig(identity, proxy, null, true);
proxycon.setExpires(getPrefInt(R.string.pref_expire_key, Integer.parseInt(getString(R.string.pref_expire_default))));
// Add parameters for push notifications
String regId = getPrefString(R.string.push_reg_id_key, null);
@ -687,7 +688,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
readAndSetAudioAndVideoPorts();
int incomingCallTimeout = Integer.parseInt(getPrefString(R.string.pref_incoming_call_timeout_key, "30"));
int incomingCallTimeout = Integer.parseInt(getPrefString(R.string.pref_incoming_call_timeout_key, getString(R.string.pref_incoming_call_timeout_default)));
mLc.setIncomingTimeout(incomingCallTimeout);
try {
@ -750,6 +751,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
} catch (LinphoneCoreException e) {
throw new LinphoneConfigException(getString(R.string.wrong_settings),e);
}
String displayName = getPrefString(R.string.pref_display_name_key, getString(R.string.pref_display_name_default));
String username = getPrefString(R.string.pref_user_name_key, getString(R.string.pref_user_name_default));
mLc.setPrimaryContact(displayName, username);
}
private void setSignalingTransportsFromConfiguration(Transports t) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 8712757602d7fc6d80a1d0d61d9af70473782b00
Subproject commit eeb4b52d1e8b12c0b1096775be41774dc6bd61b6