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

Moved transport setting from network to account

Browse source
This commit is contained in:
Sylvain Berfini 2014-02-18 15:28:53 +01:00
parent 999bae57cf
commit 6c3189f8eb
7 changed files with 184 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/xml/account_preferences.xml
View file

@ -28,6 +28,10 @@
android:title="@string/pref_advanced"
android:key="@string/pref_advanced_key">
<ListPreference
android:title="@string/pref_transport"
android:key="@string/pref_transport_key"/>
<EditTextPreference
android:title="@string/pref_proxy"
android:summary="@string/pref_help_proxy"

4
res/xml/preferences.xml
View file

@ -155,10 +155,6 @@
android:summary="@string/pref_video_port_description"
android:layout="@layout/hidden"/>
<ListPreference
android:title="@string/pref_transport"
android:key="@string/pref_transport_key"/>
<ListPreference
android:title="@string/pref_media_encryption"
android:key="@string/pref_media_encryption_key"/>

81
src/org/linphone/AccountPreferencesFragment.java
View file

@ -18,11 +18,15 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
import java.util.ArrayList;
import java.util.List;
import org.linphone.ui.PreferencesListFragment;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.Preference.OnPreferenceClickListener;
@ -36,6 +40,8 @@ import android.text.InputType;
public class AccountPreferencesFragment extends PreferencesListFragment {
private int n;
private LinphonePreferences mPrefs;
private EditTextPreference mProxyPreference;
private ListPreference mTransportPreference;
public AccountPreferencesFragment() {
super(R.xml.account_preferences);
@ -91,8 +97,15 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
OnPreferenceChangeListener proxyChangedListener = new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
mPrefs.setAccountProxy(n, newValue.toString());
String value = newValue.toString();
mPrefs.setAccountProxy(n, value);
preference.setSummary(mPrefs.getAccountProxy(n));
if (mTransportPreference != null) {
mTransportPreference.setSummary(mPrefs.getAccountTransportString(n));
mTransportPreference.setValue(mPrefs.getAccountTransportKey(n));
}
return true;
}
};
@ -136,6 +149,22 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
return true;
}
};
OnPreferenceChangeListener transportChangedListener = new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = newValue.toString();
mPrefs.setAccountTransport(n, key);
preference.setSummary(mPrefs.getAccountTransportString(n));
if (mProxyPreference != null) {
String newProxy = mPrefs.getAccountProxy(n);
mProxyPreference.setSummary(newProxy);
mProxyPreference.setText(newProxy);
}
return true;
}
};
private void manageAccountPreferencesFields(PreferenceScreen parent) {
boolean isDefaultAccount = mPrefs.getDefaultAccountIndex() == n;
@ -165,28 +194,33 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
domain.setSummary(domain.getText());
PreferenceCategory advanced = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_advanced_key));
EditTextPreference proxy = (EditTextPreference) advanced.getPreference(0);
proxy.setText(mPrefs.getAccountProxy(n));
proxy.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
proxy.setOnPreferenceChangeListener(proxyChangedListener);
proxy.setSummary("".equals(proxy.getText()) || (proxy.getText() == null) ? getString(R.string.pref_help_proxy) : proxy.getText());
mTransportPreference = (ListPreference) advanced.getPreference(0);
initializeTransportPreference(mTransportPreference);
mTransportPreference.setOnPreferenceChangeListener(transportChangedListener);
mTransportPreference.setSummary(mPrefs.getAccountTransportString(n));
CheckBoxPreference outboundProxy = (CheckBoxPreference) advanced.getPreference(1);
mProxyPreference = (EditTextPreference) advanced.getPreference(1);
mProxyPreference.setText(mPrefs.getAccountProxy(n));
mProxyPreference.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
mProxyPreference.setOnPreferenceChangeListener(proxyChangedListener);
mProxyPreference.setSummary("".equals(mProxyPreference.getText()) || (mProxyPreference.getText() == null) ? getString(R.string.pref_help_proxy) : mProxyPreference.getText());
CheckBoxPreference outboundProxy = (CheckBoxPreference) advanced.getPreference(2);
outboundProxy.setChecked(mPrefs.isAccountOutboundProxySet(n));
outboundProxy.setOnPreferenceChangeListener(outboundProxyChangedListener);
EditTextPreference expires = (EditTextPreference) advanced.getPreference(2);
EditTextPreference expires = (EditTextPreference) advanced.getPreference(3);
expires.setText(mPrefs.getExpires(n));
expires.setOnPreferenceChangeListener(expiresChangedListener);
expires.setSummary(mPrefs.getExpires(n));
EditTextPreference prefix = (EditTextPreference) advanced.getPreference(3);
EditTextPreference prefix = (EditTextPreference) advanced.getPreference(4);
String prefixValue = mPrefs.getPrefix(n);
prefix.setSummary(prefixValue);
prefix.setText(prefixValue);
prefix.setOnPreferenceChangeListener(prefixChangedListener);
CheckBoxPreference escape = (CheckBoxPreference) advanced.getPreference(4);
CheckBoxPreference escape = (CheckBoxPreference) advanced.getPreference(5);
escape.setChecked(mPrefs.getReplacePlusByZeroZero(n));
escape.setOnPreferenceChangeListener(escapeChangedListener);
@ -220,4 +254,31 @@ public class AccountPreferencesFragment extends PreferencesListFragment {
}
});
}
private void initializeTransportPreference(ListPreference pref) {
List<CharSequence> entries = new ArrayList<CharSequence>();
List<CharSequence> values = new ArrayList<CharSequence>();
entries.add(getString(R.string.pref_transport_udp));
values.add(getString(R.string.pref_transport_udp_key));
entries.add(getString(R.string.pref_transport_tcp));
values.add(getString(R.string.pref_transport_tcp_key));
if (!getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) {
entries.add(getString(R.string.pref_transport_tls));
values.add(getString(R.string.pref_transport_tls_key));
}
setListPreferenceValues(pref, entries, values);
pref.setSummary(mPrefs.getAccountTransportString(n));
pref.setDefaultValue(mPrefs.getAccountTransportKey(n));
}
private static void setListPreferenceValues(ListPreference pref, List<CharSequence> entries, List<CharSequence> values) {
CharSequence[] contents = new CharSequence[entries.size()];
entries.toArray(contents);
pref.setEntries(contents);
contents = new CharSequence[values.size()];
values.toArray(contents);
pref.setEntryValues(contents);
}
}

172
src/org/linphone/LinphonePreferences.java
View file

@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
import org.linphone.core.LinphoneAddress;
import org.linphone.core.LinphoneAuthInfo;
import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneAddress.TransportType;
import org.linphone.core.LinphoneCore.FirewallPolicy;
import org.linphone.core.LinphoneCore.MediaEncryption;
import org.linphone.core.LinphoneCore.RegistrationState;
@ -154,6 +155,7 @@ public class LinphonePreferences {
private boolean tempOutboundProxy;
private String tempContactsParams;
private String tempExpire;
private TransportType tempTransport;
/**
* Creates a new account using values previously set using setNew* functions
@ -163,9 +165,15 @@ public class LinphonePreferences {
String identity = "sip:" + tempUsername + "@" + tempDomain;
String proxy = "sip:";
proxy += tempProxy == null ? tempDomain : tempProxy;
LinphoneAddress proxyAddr = LinphoneCoreFactory.instance().createLinphoneAddress(proxy);
String route = tempOutboundProxy ? tempProxy : null;
LinphoneProxyConfig prxCfg = LinphoneCoreFactory.instance().createProxyConfig(identity, proxy, route, true);
if (tempTransport == null) {
tempTransport = TransportType.LinphoneTransportUdp;
}
proxyAddr.setTransport(tempTransport);
LinphoneProxyConfig prxCfg = LinphoneCoreFactory.instance().createProxyConfig(identity, proxyAddr.asStringUriOnly(), route, true);
if (tempContactsParams != null)
prxCfg.setContactUriParameters(tempContactsParams);
if (tempExpire != null) {
@ -190,6 +198,80 @@ public class LinphonePreferences {
tempOutboundProxy = false;
tempContactsParams = null;
tempExpire = null;
tempTransport = null;
}
public void setNewAccountTransport(TransportType transport) {
tempTransport = transport;
}
public void setAccountTransport(int n, String transport) {
LinphoneProxyConfig proxyConfig = getProxyConfig(n);
if (proxyConfig != null && transport != null) {
LinphoneAddress proxyAddr;
try {
proxyAddr = LinphoneCoreFactory.instance().createLinphoneAddress(proxyConfig.getProxy());
if (transport.equals(getString(R.string.pref_transport_udp_key))) {
proxyAddr.setTransport(TransportType.LinphoneTransportUdp);
} else if (transport.equals(getString(R.string.pref_transport_tcp_key))) {
proxyAddr.setTransport(TransportType.LinphoneTransportTcp);
} else if (transport.equals(getString(R.string.pref_transport_tls_key))) {
proxyAddr.setTransport(TransportType.LinphoneTransportTls);
}
LinphoneProxyConfig prxCfg = getProxyConfig(n);
prxCfg.setProxy(proxyAddr.asStringUriOnly());
prxCfg.done();
if (isAccountOutboundProxySet(n)) {
setAccountOutboundProxyEnabled(n, true);
}
} catch (LinphoneCoreException e) {
e.printStackTrace();
}
}
}
public TransportType getAccountTransport(int n) {
TransportType transport = null;
LinphoneProxyConfig proxyConfig = getProxyConfig(n);
if (proxyConfig != null) {
LinphoneAddress proxyAddr;
try {
proxyAddr = LinphoneCoreFactory.instance().createLinphoneAddress(proxyConfig.getProxy());
transport = proxyAddr.getTransport();
} catch (LinphoneCoreException e) {
e.printStackTrace();
}
}
return transport;
}
public String getAccountTransportKey(int n) {
TransportType transport = getAccountTransport(n);
String key = getString(R.string.pref_transport_udp_key);
if (transport != null && transport == TransportType.LinphoneTransportTcp)
key = getString(R.string.pref_transport_tcp_key);
else if (transport != null && transport == TransportType.LinphoneTransportTls)
key = getString(R.string.pref_transport_tls_key);
return key;
}
public String getAccountTransportString(int n) {
TransportType transport = getAccountTransport(n);
if (transport != null && transport == TransportType.LinphoneTransportTcp)
return getString(R.string.pref_transport_tcp);
else if (transport != null && transport == TransportType.LinphoneTransportTls)
return getString(R.string.pref_transport_tls);
return getString(R.string.pref_transport_udp);
}
public void setNewAccountUsername(String username) {
@ -278,14 +360,21 @@ public class LinphonePreferences {
if (proxy == null || proxy.length() <= 0) {
proxy = getAccountDomain(n);
}
if (!proxy.contains("sip:")) {
proxy = "sip:" + proxy;
}
try {
LinphoneAddress proxyAddr = LinphoneCoreFactory.instance().createLinphoneAddress(proxy);
if (!proxy.contains("transport=")) {
proxyAddr.setTransport(getAccountTransport(n));
}
LinphoneProxyConfig prxCfg = getProxyConfig(n);
prxCfg.setProxy(proxy);
prxCfg.setProxy(proxyAddr.asStringUriOnly());
prxCfg.done();
if (isAccountOutboundProxySet(n)) {
setAccountOutboundProxyEnabled(n, true);
}
@ -296,9 +385,6 @@ public class LinphonePreferences {
public String getAccountProxy(int n) {
String proxy = getProxyConfig(n).getProxy();
if (proxy != null && proxy.startsWith("sip:")) {
proxy = proxy.substring(4);
}
return proxy;
}
@ -311,9 +397,6 @@ public class LinphonePreferences {
LinphoneProxyConfig prxCfg = getProxyConfig(n);
if (enabled) {
String route = prxCfg.getProxy();
if (!route.contains("sip:")) {
route = "sip:" + route;
}
prxCfg.setRoute(route);
} else {
prxCfg.setRoute(null);
@ -568,14 +651,6 @@ public class LinphonePreferences {
}
}
public boolean isUpnpEnabled() {
return getLc().upnpAvailable() && getLc().getFirewallPolicy() == FirewallPolicy.UseUpnp;
}
public boolean isIceEnabled() {
return getLc().getFirewallPolicy() == FirewallPolicy.UseIce;
}
public void useRandomPort(boolean enabled) {
useRandomPort(enabled, true);
}
@ -586,9 +661,6 @@ public class LinphonePreferences {
if (enabled) {
setSipPort(LINPHONE_CORE_RANDOM_PORT);
} else {
if (getTransport().equals(getString(R.string.pref_transport_tls)))
setSipPort(5061);
else
setSipPort(5060);
}
}
@ -603,75 +675,25 @@ public class LinphonePreferences {
int port;
if (transports.udp > 0)
port = transports.udp;
else if (transports.tcp > 0)
port = transports.tcp;
else
port = transports.tls;
port = transports.tcp;
return String.valueOf(port);
}
public void setSipPort(int port) {
Transports transports = getLc().getSignalingTransportPorts();
if (transports.udp > 0)
transports.udp = port;
else if (transports.tcp > 0)
transports.tcp = port;
else
transports.tls = port;
transports.tls = LINPHONE_CORE_RANDOM_PORT;
getLc().setSignalingTransportPorts(transports);
}
public String getTransportKey() {
Transports transports = getLc().getSignalingTransportPorts();
String transport = getString(R.string.pref_transport_udp_key);
if (transports.tcp > 0)
transport = getString(R.string.pref_transport_tcp_key);
else if (transports.tls > 0)
transport = getString(R.string.pref_transport_tls_key);
return transport;
public boolean isUpnpEnabled() {
return getLc().upnpAvailable() && getLc().getFirewallPolicy() == FirewallPolicy.UseUpnp;
}
public String getTransport() {
Transports transports = getLc().getSignalingTransportPorts();
String transport = getString(R.string.pref_transport_udp);
if (transports.tcp > 0)
transport = getString(R.string.pref_transport_tcp);
else if (transports.tls > 0)
transport = getString(R.string.pref_transport_tls);
return transport;
}
public void setTransport(String transportKey) {
if (transportKey == null)
return;
Transports transports = getLc().getSignalingTransportPorts();
if (transports.udp > 0) {
if (transportKey.equals(getString(R.string.pref_transport_tcp_key))) {
transports.tcp = transports.udp;
transports.udp = transports.tls;
} else if (transportKey.equals(getString(R.string.pref_transport_tls_key))) {
transports.tls = transports.udp;
transports.udp = transports.tcp;
}
} else if (transports.tcp > 0) {
if (transportKey.equals(getString(R.string.pref_transport_udp_key))) {
transports.udp = transports.tcp;
transports.tcp = transports.tls;
} else if (transportKey.equals(getString(R.string.pref_transport_tls_key))) {
transports.tls = transports.tcp;
transports.tcp = transports.udp;
}
} else if (transports.tls > 0) {
if (transportKey.equals(getString(R.string.pref_transport_udp_key))) {
transports.udp = transports.tls;
transports.tls = transports.tcp;
} else if (transportKey.equals(getString(R.string.pref_transport_tcp_key))) {
transports.tcp = transports.tls;
transports.tls = transports.udp;
}
}
getLc().setSignalingTransportPorts(transports);
public boolean isIceEnabled() {
return getLc().getFirewallPolicy() == FirewallPolicy.UseIce;
}
public MediaEncryption getMediaEncryption() {

34
src/org/linphone/SettingsFragment.java
View file

@ -378,30 +378,6 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
pref.setDefaultValue(key);
}
private void initializeTransportPreferences(ListPreference pref) {
List<CharSequence> entries = new ArrayList<CharSequence>();
List<CharSequence> values = new ArrayList<CharSequence>();
entries.add(getString(R.string.pref_transport_udp));
values.add(getString(R.string.pref_transport_udp_key));
entries.add(getString(R.string.pref_transport_tcp));
values.add(getString(R.string.pref_transport_tcp_key));
if (!getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) {
entries.add(getString(R.string.pref_transport_tls));
values.add(getString(R.string.pref_transport_tls_key));
}
setListPreferenceValues(pref, entries, values);
String value = mPrefs.getTransport();
pref.setSummary(value);
String key = getString(R.string.pref_transport_udp_key);
if (value.equals(getString(R.string.pref_transport_tcp)))
key = getString(R.string.pref_transport_tcp_key);
else if (value.equals(getString(R.string.pref_transport_tls)))
key = getString(R.string.pref_transport_tls_key);
pref.setDefaultValue(key);
}
private void initializePreferredVideoSizePreferences(ListPreference pref) {
List<CharSequence> entries = new ArrayList<CharSequence>();
List<CharSequence> values = new ArrayList<CharSequence>();
@ -631,7 +607,6 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
private void initNetworkSettings() {
initMediaEncryptionPreference((ListPreference) findPreference(getString(R.string.pref_media_encryption_key)));
initializeTransportPreferences((ListPreference) findPreference(getString(R.string.pref_transport_key)));
((CheckBoxPreference) findPreference(getString(R.string.pref_wifi_only_key))).setChecked(mPrefs.isWifiOnlyEnabled());
@ -731,15 +706,6 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
}
});
findPreference(getString(R.string.pref_transport_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
mPrefs.setTransport(newValue.toString());
preference.setSummary(mPrefs.getTransport());
return true;
}
});
findPreference(getString(R.string.pref_media_encryption_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {

5
src/org/linphone/setup/SetupActivity.java
View file

@ -21,6 +21,7 @@ import org.linphone.LinphoneManager;
import org.linphone.LinphonePreferences;
import org.linphone.LinphoneSimpleListener.LinphoneOnRegistrationStateChangedListener;
import org.linphone.R;
import org.linphone.core.LinphoneAddress.TransportType;
import org.linphone.core.LinphoneCore.RegistrationState;
import org.linphone.core.LinphoneCoreException;
@ -291,11 +292,11 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
if (isMainAccountLinphoneDotOrg && useLinphoneDotOrgCustomPorts) {
if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) {
mPrefs.setNewAccountProxy(domain + ":5228");
mPrefs.setTransport(getString(R.string.pref_transport_tcp_key));
mPrefs.setNewAccountTransport(TransportType.LinphoneTransportTcp);
}
else {
mPrefs.setNewAccountProxy(domain + ":5223");
mPrefs.setTransport(getString(R.string.pref_transport_tls_key));
mPrefs.setNewAccountTransport(TransportType.LinphoneTransportTls);
}
mPrefs.setNewAccountExpires("604800");

2
submodules/linphone

@ -1 +1 @@
Subproject commit 3e876562027c51f61e3fe32f37bc66075e0b7854
Subproject commit 7bfd12788a1753f17a2a054152addfc8d465ebc9