From 4164f05740644966a0a5aa26b0bb3bef1155f803 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 20 Nov 2012 17:15:09 +0100 Subject: [PATCH] Hide PN settings if disabled in xml --- src/org/linphone/LinphoneManager.java | 12 +++++++----- src/org/linphone/PreferencesFragment.java | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 074ce5bbf..458ccf668 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -611,11 +611,13 @@ public final class LinphoneManager implements LinphoneCoreListener { proxycon.setExpires(Integer.parseInt(getPrefString(R.string.pref_expire_key, getString(R.string.pref_expire_default)))); // Add parameters for push notifications - String regId = getPrefString(R.string.push_reg_id_key, null); - String appId = getString(R.string.push_sender_id); - if (regId != null && getPrefBoolean(R.string.pref_push_notification_key, mR.getBoolean(R.bool.pref_push_notification_default))) { - String contactInfos = "app-id=" + appId + ";pn-type=google;pn-tok=" + regId + ";pn-msg-str=IM_MSG;pn-call-str=IC_MSG;pn-call-snd=ring.caf;pn-msg-snd=msg.caf;"; - proxycon.setContactParameters(contactInfos); + if (mR.getBoolean(R.bool.enable_push_id)) { + String regId = getPrefString(R.string.push_reg_id_key, null); + String appId = getString(R.string.push_sender_id); + if (regId != null && getPrefBoolean(R.string.pref_push_notification_key, mR.getBoolean(R.bool.pref_push_notification_default))) { + String contactInfos = "app-id=" + appId + ";pn-type=google;pn-tok=" + regId + ";pn-msg-str=IM_MSG;pn-call-str=IC_MSG;pn-call-snd=ring.caf;pn-msg-snd=msg.caf;"; + proxycon.setContactParameters(contactInfos); + } } mLc.addProxyConfig(proxycon); diff --git a/src/org/linphone/PreferencesFragment.java b/src/org/linphone/PreferencesFragment.java index 6f88ffaf2..914f41de4 100644 --- a/src/org/linphone/PreferencesFragment.java +++ b/src/org/linphone/PreferencesFragment.java @@ -111,6 +111,10 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa if (getResources().getBoolean(R.bool.disable_chat)) { imageSharingServer.setLayoutResource(R.layout.hidden); } + + if (!getResources().getBoolean(R.bool.enable_push_id)) { + findPreference(getString(R.string.pref_push_notification_key)).setLayoutResource(R.layout.hidden); + } initializeTransportPreferences();