moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

Restore settings to configure remote search

Browse Source
This commit is contained in:
cketti 2012-11-14 02:08:08 +01:00
parent ff156ac7c9
commit 9cbbd06352
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/fsck/k9/activity/setup/AccountSettings.java
View File

@ -180,12 +180,9 @@ public class AccountSettings extends K9PreferenceActivity {
private CheckBoxPreference mCryptoAutoEncrypt; private CheckBoxPreference mCryptoAutoEncrypt;
private PreferenceScreen mSearchScreen; private PreferenceScreen mSearchScreen;
//FIXME: Remote search is temporarily disabled
/*
private CheckBoxPreference mCloudSearchEnabled; private CheckBoxPreference mCloudSearchEnabled;
private ListPreference mRemoteSearchNumResults; private ListPreference mRemoteSearchNumResults;
private CheckBoxPreference mRemoteSearchFullText; private CheckBoxPreference mRemoteSearchFullText;
*/
private ListPreference mLocalStorageProvider; private ListPreference mLocalStorageProvider;
private ListPreference mArchiveFolder; private ListPreference mArchiveFolder;
@ -503,9 +500,6 @@ public class AccountSettings extends K9PreferenceActivity {
mSearchScreen = (PreferenceScreen) findPreference(PREFERENCE_SCREEN_SEARCH); mSearchScreen = (PreferenceScreen) findPreference(PREFERENCE_SCREEN_SEARCH);
//FIXME: Remote search is temporarily disabled
mMainScreen.removePreference(mSearchScreen);
/*
mCloudSearchEnabled = (CheckBoxPreference) findPreference(PREFERENCE_CLOUD_SEARCH_ENABLED); mCloudSearchEnabled = (CheckBoxPreference) findPreference(PREFERENCE_CLOUD_SEARCH_ENABLED);
mRemoteSearchNumResults = (ListPreference) findPreference(PREFERENCE_REMOTE_SEARCH_NUM_RESULTS); mRemoteSearchNumResults = (ListPreference) findPreference(PREFERENCE_REMOTE_SEARCH_NUM_RESULTS);
mRemoteSearchNumResults.setOnPreferenceChangeListener( mRemoteSearchNumResults.setOnPreferenceChangeListener(
@ -518,7 +512,6 @@ public class AccountSettings extends K9PreferenceActivity {
); );
updateRemoteSearchLimit(mRemoteSearchNumResults.getValue()); updateRemoteSearchLimit(mRemoteSearchNumResults.getValue());
mRemoteSearchFullText = (CheckBoxPreference) findPreference(PREFERENCE_REMOTE_SEARCH_FULL_TEXT); mRemoteSearchFullText = (CheckBoxPreference) findPreference(PREFERENCE_REMOTE_SEARCH_FULL_TEXT);
*/
mPushPollOnConnect = (CheckBoxPreference) findPreference(PREFERENCE_PUSH_POLL_ON_CONNECT); mPushPollOnConnect = (CheckBoxPreference) findPreference(PREFERENCE_PUSH_POLL_ON_CONNECT);
mIdleRefreshPeriod = (ListPreference) findPreference(PREFERENCE_IDLE_REFRESH_PERIOD); mIdleRefreshPeriod = (ListPreference) findPreference(PREFERENCE_IDLE_REFRESH_PERIOD);
@ -526,12 +519,9 @@ public class AccountSettings extends K9PreferenceActivity {
if (mIsPushCapable) { if (mIsPushCapable) {
mPushPollOnConnect.setChecked(mAccount.isPushPollOnConnect()); mPushPollOnConnect.setChecked(mAccount.isPushPollOnConnect());
//FIXME: Remote search is temporarily disabled
/*
mCloudSearchEnabled.setChecked(mAccount.allowRemoteSearch()); mCloudSearchEnabled.setChecked(mAccount.allowRemoteSearch());
mRemoteSearchNumResults.setValue(Integer.toString(mAccount.getRemoteSearchNumResults())); mRemoteSearchNumResults.setValue(Integer.toString(mAccount.getRemoteSearchNumResults()));
mRemoteSearchFullText.setChecked(mAccount.isRemoteSearchFullText()); mRemoteSearchFullText.setChecked(mAccount.isRemoteSearchFullText());
*/
mIdleRefreshPeriod.setValue(String.valueOf(mAccount.getIdleRefreshMinutes())); mIdleRefreshPeriod.setValue(String.valueOf(mAccount.getIdleRefreshMinutes()));
mIdleRefreshPeriod.setSummary(mIdleRefreshPeriod.getEntry()); mIdleRefreshPeriod.setSummary(mIdleRefreshPeriod.getEntry());
@ -805,12 +795,9 @@ public class AccountSettings extends K9PreferenceActivity {
mAccount.setPushPollOnConnect(mPushPollOnConnect.isChecked()); mAccount.setPushPollOnConnect(mPushPollOnConnect.isChecked());
mAccount.setIdleRefreshMinutes(Integer.parseInt(mIdleRefreshPeriod.getValue())); mAccount.setIdleRefreshMinutes(Integer.parseInt(mIdleRefreshPeriod.getValue()));
mAccount.setMaxPushFolders(Integer.parseInt(mMaxPushFolders.getValue())); mAccount.setMaxPushFolders(Integer.parseInt(mMaxPushFolders.getValue()));
//FIXME: Remote search is temporarily disabled
/*
mAccount.setAllowRemoteSearch(mCloudSearchEnabled.isChecked()); mAccount.setAllowRemoteSearch(mCloudSearchEnabled.isChecked());
mAccount.setRemoteSearchNumResults(Integer.parseInt(mRemoteSearchNumResults.getValue())); mAccount.setRemoteSearchNumResults(Integer.parseInt(mRemoteSearchNumResults.getValue()));
mAccount.setRemoteSearchFullText(mRemoteSearchFullText.isChecked()); mAccount.setRemoteSearchFullText(mRemoteSearchFullText.isChecked());
*/
} }
if (!mIsMoveCapable) { if (!mIsMoveCapable) {
@ -995,8 +982,7 @@ public class AccountSettings extends K9PreferenceActivity {
maxResults = getString(R.string.account_settings_remote_search_num_results_entries_all); maxResults = getString(R.string.account_settings_remote_search_num_results_entries_all);
} }
//FIXME: Remote search is temporarily disabled mRemoteSearchNumResults.setSummary(String.format(getString(R.string.account_settings_remote_search_num_summary), maxResults));
//mRemoteSearchNumResults.setSummary(String.format(getString(R.string.account_settings_remote_search_num_summary), maxResults));
} }
} }