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

Disable server side full text search for the moment

Browse Source 
The server search itself does work. But the results are not displayed
to the user because only the message headers of found messages are
downloaded and the subsequent search in the local database won't return
those messages.
This commit is contained in:
cketti 2013-03-10 03:00:16 +01:00
parent e118917090
commit aea95b1493
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/account_settings_preferences.xml
View File

@ -446,12 +446,14 @@
android:dialogTitle="@string/account_settings_remote_search_num_label"
android:dependency="remote_search_enabled"/>
<!-- Temporarily removed
<CheckBoxPreference
android:key="account_remote_search_full_text"
android:title="@string/account_settings_remote_search_full_text"
android:summary="@string/account_settings_remote_search_full_text_summary"
android:persistent="false"
android:dependency="remote_search_enabled"/>
-->
</PreferenceScreen>

3
src/com/fsck/k9/Account.java
View File

@ -1768,7 +1768,8 @@ public class Account implements BaseAccount {
mAlwaysShowCcBcc = show;
}
public boolean isRemoteSearchFullText() {
return mRemoteSearchFullText;
return false; // Temporarily disabled
//return mRemoteSearchFullText;
}
public void setRemoteSearchFullText(boolean val) {

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

@ -177,7 +177,11 @@ public class AccountSettings extends K9PreferenceActivity {
private PreferenceScreen mSearchScreen;
private CheckBoxPreference mCloudSearchEnabled;
private ListPreference mRemoteSearchNumResults;
private CheckBoxPreference mRemoteSearchFullText;
/*
* Temporarily removed because search results aren't displayed to the user.
* So this feature is useless.
*/
//private CheckBoxPreference mRemoteSearchFullText;
private ListPreference mLocalStorageProvider;
private ListPreference mArchiveFolder;
@ -502,7 +506,7 @@ public class AccountSettings extends K9PreferenceActivity {
}
);
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);
mIdleRefreshPeriod = (ListPreference) findPreference(PREFERENCE_IDLE_REFRESH_PERIOD);
@ -512,7 +516,7 @@ public class AccountSettings extends K9PreferenceActivity {
mCloudSearchEnabled.setChecked(mAccount.allowRemoteSearch());
mRemoteSearchNumResults.setValue(Integer.toString(mAccount.getRemoteSearchNumResults()));
mRemoteSearchFullText.setChecked(mAccount.isRemoteSearchFullText());
//mRemoteSearchFullText.setChecked(mAccount.isRemoteSearchFullText());
mIdleRefreshPeriod.setValue(String.valueOf(mAccount.getIdleRefreshMinutes()));
mIdleRefreshPeriod.setSummary(mIdleRefreshPeriod.getEntry());
@ -789,7 +793,7 @@ public class AccountSettings extends K9PreferenceActivity {
mAccount.setMaxPushFolders(Integer.parseInt(mMaxPushFolders.getValue()));
mAccount.setAllowRemoteSearch(mCloudSearchEnabled.isChecked());
mAccount.setRemoteSearchNumResults(Integer.parseInt(mRemoteSearchNumResults.getValue()));
mAccount.setRemoteSearchFullText(mRemoteSearchFullText.isChecked());
//mAccount.setRemoteSearchFullText(mRemoteSearchFullText.isChecked());
}
boolean needsRefresh = mAccount.setAutomaticCheckIntervalMinutes(Integer.parseInt(mCheckFrequency.getValue()));