-Move subscription friend list checkbox from account pref to advanced pref

-Subscription friend list is enabled by default only for linphone domain

res/xml/account_preferences.xml

@@ -87,11 +87,6 @@
 		    android:key="@string/pref_escape_plus_key"
             android:persistent="false"/>
 
-		<CheckBoxPreference
-			android:title="@string/pref_friendlist_subscribe"
-			android:key="@string/pref_friendlist_subscribe_key"
-            android:persistent="false"/>
-
 		<Preference
 			android:title="@string/pref_link_account"
 			android:key="@string/pref_link_account_key"

res/xml/preferences.xml

@@ -326,6 +326,11 @@
 		    <PreferenceCategory
 				android:title="@string/pref_advanced_title">
 
+				<CheckBoxPreference
+					android:title="@string/pref_friendlist_subscribe"
+					android:key="@string/pref_friendlist_subscribe_key"
+					android:persistent="false"/>
+
 				<CheckBoxPreference
 					android:title="@string/pref_debug"
 				    android:key="@string/pref_debug_key"

src/org/linphone/AccountPreferencesFragment.java

@@ -247,15 +247,6 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
 			return true;
 		}
 	};
-	OnPreferenceChangeListener friendlistSubscribeListener = new OnPreferenceChangeListener() {
-		@Override
-		public boolean onPreferenceChange(Preference preference, Object newValue) {
-			boolean value = (Boolean) newValue;
-			mPrefs.enabledFriendlistSubscription(value);
-			LinphoneManager.getInstance().subscribeFriendList(value);
-			return true;
-		}
-	};
 	OnPreferenceClickListener linkAccountListener = new OnPreferenceClickListener() {
 		@Override
 		public boolean onPreferenceClick(Preference preference) {
@@ -397,13 +388,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
 			escape.setChecked(mPrefs.getReplacePlusByZeroZero(n));
 		}
 
-		CheckBoxPreference friendlistSubscribe = (CheckBoxPreference) advanced.getPreference(8);
+		Preference linkAccount = advanced.getPreference(8);
-		friendlistSubscribe.setOnPreferenceChangeListener(friendlistSubscribeListener);
-		if(!isNewAccount){
-			friendlistSubscribe.setChecked(mPrefs.isFriendlistsubscriptionEnabled());
-		}
-
-		Preference linkAccount = advanced.getPreference(9);
 		linkAccount.setOnPreferenceClickListener(linkAccountListener);
 
 		PreferenceCategory manage = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_manage_key));

src/org/linphone/LinphoneManager.java

@@ -788,7 +788,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
 		mLc.setFriendsDatabasePath(mFriendsDatabaseFile);
 		mLc.setUserCertificatesPath(mUserCertificatePath);
-		subscribeFriendList(mPrefs.isFriendlistsubscriptionEnabled());
+		subscribeFriendList(false);
 		//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
 		enableDeviceRingtone(mPrefs.isDeviceRingtoneEnabled());
 

src/org/linphone/SettingsFragment.java

@@ -1150,6 +1150,7 @@ public class SettingsFragment extends PreferencesListFragment {
 	}
 
 	private void initAdvancedSettings() {
+		((CheckBoxPreference)findPreference(getString(R.string.pref_friendlist_subscribe_key))).setChecked(mPrefs.isFriendlistsubscriptionEnabled());
 		((CheckBoxPreference)findPreference(getString(R.string.pref_debug_key))).setChecked(mPrefs.isDebugEnabled());
 		((CheckBoxPreference)findPreference(getString(R.string.pref_background_mode_key))).setChecked(mPrefs.isBackgroundModeEnabled());
 		((CheckBoxPreference)findPreference(getString(R.string.pref_service_notification_key))).setChecked(mPrefs.getServiceNotificationVisibility());
@@ -1160,6 +1161,17 @@ public class SettingsFragment extends PreferencesListFragment {
 	}
 
 	private void setAdvancedPreferencesListener() {
+
+		findPreference(getString(R.string.pref_friendlist_subscribe_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+			@Override
+			public boolean onPreferenceChange(Preference preference, Object newValue) {
+				boolean value = (Boolean) newValue;
+				mPrefs.enabledFriendlistSubscription(value);
+				LinphoneManager.getInstance().subscribeFriendList(value);
+				return true;
+			}
+		});
+
 		findPreference(getString(R.string.pref_debug_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 			@Override
 			public boolean onPreferenceChange(Preference preference, Object newValue) {

src/org/linphone/assistant/AssistantActivity.java

@@ -510,6 +510,7 @@ private static AssistantActivity instance;
 			.setNoDefault(false);
 
 			mPrefs.enabledFriendlistSubscription(getResources().getBoolean(R.bool.use_friendlist_subscription));
+			LinphoneManager.getInstance().subscribeFriendList(getResources().getBoolean(R.bool.use_friendlist_subscription));
 
 			mPrefs.setStunServer(getString(R.string.default_stun));
 			mPrefs.setIceEnabled(true);