moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-03-03 01:51:49 -05:00
Code Issues Releases Wiki Activity

Hide remote search UI elements

Browse Source 
Remote search is currently not working
This commit is contained in:
cketti 2012-10-30 16:54:21 +01:00
parent 968d948dd0
commit 0baffd05c8
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
src/com/fsck/k9/fragment/MessageListFragment.java
View File

@ -144,7 +144,8 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
Bundle args = new Bundle();
args.putParcelable(ARG_SEARCH, search);
args.putBoolean(ARG_THREADED_LIST, threadedList);
args.putBoolean(ARG_REMOTE_SEARCH, remoteSearch);
//FIXME: Remote search temporarily disabled
//args.putBoolean(ARG_REMOTE_SEARCH, remoteSearch);
fragment.setArguments(args);
return fragment;
}