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

First steps toward adding search results

Browse Source
This commit is contained in:
Jesse Vincent 2009-12-27 16:52:26 +00:00
parent 9a40457a2a
commit 2a77001acc
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -56,6 +56,7 @@
<string name="add_account_action">Add account</string> <string name="add_account_action">Add account</string>
<string name="compose_action">Compose</string> <string name="compose_action">Compose</string>
<string name="search_action">Search</string> <string name="search_action">Search</string>
<string name="search_results">Search results</string>
<string name="preferences_action">Preferences</string> <string name="preferences_action">Preferences</string>
<string name="open_action">Open</string> <string name="open_action">Open</string>
<string name="account_settings_action">Account settings</string> <string name="account_settings_action">Account settings</string>

31
src/com/fsck/k9/activity/MessageList.java
View File

@ -59,9 +59,12 @@ public class MessageList
private static final String EXTRA_ACCOUNT = "account"; private static final String EXTRA_ACCOUNT = "account";
private static final String EXTRA_STARTUP = "startup"; private static final String EXTRA_STARTUP = "startup";
private static final String EXTRA_FOLDER = "folder"; private static final String EXTRA_FOLDER = "folder";
private static final String EXTRA_QUERY = "query";
private static final String STATE_KEY_LIST = "com.fsck.k9.activity.messagelist_state"; private static final String STATE_KEY_LIST = "com.fsck.k9.activity.messagelist_state";
private static final String STATE_CURRENT_FOLDER = "com.fsck.k9.activity.messagelist_folder"; private static final String STATE_CURRENT_FOLDER = "com.fsck.k9.activity.messagelist_folder";
private static final String STATE_QUERY = "com.fsck.k9.activity.query";
private static final String STATE_KEY_SELECTION = "com.fsck.k9.activity.messagelist_selection"; private static final String STATE_KEY_SELECTION = "com.fsck.k9.activity.messagelist_selection";
private static final String STATE_KEY_SELECTED_COUNT = "com.fsck.k9.activity.messagelist_selected_count"; private static final String STATE_KEY_SELECTED_COUNT = "com.fsck.k9.activity.messagelist_selected_count";
@ -118,6 +121,8 @@ public class MessageList
*/ */
private String mFolderName; private String mFolderName;
private String mQueryString;
private MessageListHandler mHandler = new MessageListHandler(); private MessageListHandler mHandler = new MessageListHandler();
private SORT_TYPE sortType = SORT_TYPE.SORT_DATE; private SORT_TYPE sortType = SORT_TYPE.SORT_DATE;
@ -189,13 +194,13 @@ public class MessageList
{ {
public void run() public void run()
{ {
mListView.setSelection(0); mListView.setSelection(0);
mAdapter.notifyDataSetChanged(); mAdapter.notifyDataSetChanged();
} }
}); });
} }
} }
private void sortMessages() private void sortMessages()
{ {
runOnUiThread(new Runnable() runOnUiThread(new Runnable()
@ -268,6 +273,10 @@ public class MessageList
setTitle(dispString); setTitle(dispString);
} }
else if (mQueryString != null)
{
setTitle(R.string.search_results + ": "+ mQueryString);
}
} }
public void progress(final boolean progress) public void progress(final boolean progress)
@ -375,6 +384,9 @@ public class MessageList
if (savedInstanceState == null) if (savedInstanceState == null)
{ {
mFolderName = intent.getStringExtra(EXTRA_FOLDER); mFolderName = intent.getStringExtra(EXTRA_FOLDER);
mQueryString = intent.getStringExtra(EXTRA_QUERY);
if (mFolderName == null) if (mFolderName == null)
{ {
@ -384,6 +396,7 @@ public class MessageList
else else
{ {
mFolderName = savedInstanceState.getString(STATE_CURRENT_FOLDER); mFolderName = savedInstanceState.getString(STATE_CURRENT_FOLDER);
mQueryString = savedInstanceState.getString(STATE_QUERY);
mSelectedCount = savedInstanceState.getInt(STATE_KEY_SELECTED_COUNT); mSelectedCount = savedInstanceState.getInt(STATE_KEY_SELECTED_COUNT);
} }
@ -423,16 +436,18 @@ public class MessageList
private void onRestoreListState(Bundle savedInstanceState) private void onRestoreListState(Bundle savedInstanceState)
{ {
String currentFolder = savedInstanceState.getString(STATE_CURRENT_FOLDER); mFolderName = savedInstanceState.getString(STATE_CURRENT_FOLDER);
mQueryString = savedInstanceState.getString(STATE_QUERY);
int selectedChild = savedInstanceState.getInt(STATE_KEY_SELECTION, -1); int selectedChild = savedInstanceState.getInt(STATE_KEY_SELECTION, -1);
if (selectedChild != 0) if (selectedChild != 0)
{ {
mListView.setSelection(selectedChild); mListView.setSelection(selectedChild);
} }
if (currentFolder != null) if (mFolderName != null)
{ {
mCurrentFolder = mAdapter.getFolder(currentFolder); mCurrentFolder = mAdapter.getFolder(mFolderName);
} }
@ -476,6 +491,11 @@ public class MessageList
mController.getFolderUnreadMessageCount(mAccount, mFolderName, mAdapter.mListener); mController.getFolderUnreadMessageCount(mAccount, mFolderName, mAdapter.mListener);
} }
else if (mQueryString != null)
{
mController.listLocalMessagesSynchronous(mAccount, mFolderName, mAdapter.mListener);
}
mHandler.refreshTitle(); mHandler.refreshTitle();
@ -487,7 +507,8 @@ public class MessageList
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putParcelable(STATE_KEY_LIST, mListView.onSaveInstanceState()); outState.putParcelable(STATE_KEY_LIST, mListView.onSaveInstanceState());
outState.putInt(STATE_KEY_SELECTION, mListView .getSelectedItemPosition()); outState.putInt(STATE_KEY_SELECTION, mListView .getSelectedItemPosition());
outState.putString(STATE_CURRENT_FOLDER, mCurrentFolder.name); outState.putString(STATE_CURRENT_FOLDER, mFolderName);
outState.putString(STATE_QUERY, mQueryString);
outState.putInt(STATE_KEY_SELECTED_COUNT, mSelectedCount); outState.putInt(STATE_KEY_SELECTED_COUNT, mSelectedCount);
} }