null.
+ * Never {@code null}.
*/
public ReverseComparator(final Comparatornull.
+ * Comparator chain. Never {@code null}.
*/
public ComparatorChain(final Listnull.
+ * fashion. Never {@code null}.
*/
- protected ComparatorNote: - * This method was optimized because it is called a lot. Don't change it unless you know - * what you are doing.
- * - * @param message - * A {@link Message} instance describing the message to look for. - * - * @return The corresponding {@link MessageInfoHolder} instance if the message was found in - * the message list. {@code null} otherwise. - */ - private MessageInfoHolder getMessage(Message message) { - String uid; - Folder folder; - for (MessageInfoHolder holder : mMessages) { - uid = message.getUid(); - if (uid != null && (holder.uid == uid || uid.equals(holder.uid))) { - folder = message.getFolder(); - if (holder.folder.name.equals(folder.getName()) && - holder.account.equals(folder.getAccount().getUuid())) { - return holder; - } - } - } - - return null; - } - - /** - * Find a specific message in the message list. - * - *Note: - * This method was optimized because it is called a lot. Don't change it unless you know - * what you are doing.
- * - * @param messageReference - * A {@link MessageReference} instance describing the message to look for. - * - * @return The corresponding {@link MessageInfoHolder} instance if the message was found in - * the message list. {@code null} otherwise. - */ - private MessageInfoHolder getMessage(MessageReference messageReference) { - String uid; - for (MessageInfoHolder holder : mMessages) { - uid = messageReference.uid; - if ((holder.uid == uid || uid.equals(holder.uid)) && - holder.folder.name.equals(messageReference.folderName) && - holder.account.equals(messageReference.accountUuid)) { - return holder; - } - } - - return null; - } - - public FolderInfoHolder getFolder(String folder, Account account) { - LocalFolder local_folder = null; - try { - LocalStore localStore = account.getLocalStore(); - local_folder = localStore.getFolder(folder); - return new FolderInfoHolder(getActivity(), local_folder, account); - } catch (Exception e) { - Log.e(K9.LOG_TAG, "getFolder(" + folder + ") goes boom: ", e); - return null; - } finally { - if (local_folder != null) { - local_folder.close(); - } - } - } - - - @Override - public int getCount() { - return mMessages.size(); - } - - @Override - public long getItemId(int position) { - try { - MessageInfoHolder messageHolder = (MessageInfoHolder) getItem(position); - if (messageHolder != null) { - return messageHolder.message.getId(); - } - } catch (Exception e) { - Log.i(K9.LOG_TAG, "getItemId(" + position + ") ", e); - } - return -1; - } - - @Override - public Object getItem(int position) { - try { - if (position < mMessages.size()) { - return mMessages.get(position); - } - } catch (Exception e) { - Log.e(K9.LOG_TAG, "getItem(" + position + "), but folder.messages.size() = " + mMessages.size(), e); - } - return null; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - MessageInfoHolder message = (MessageInfoHolder) getItem(position); - View view; - - if ((convertView != null) && (convertView.getId() == R.layout.message_list_item)) { - view = convertView; - } else { - view = mInflater.inflate(R.layout.message_list_item, parent, false); - view.setId(R.layout.message_list_item); - } - - MessageViewHolder holder = (MessageViewHolder) view.getTag(); - - if (holder == null) { - holder = new MessageViewHolder(); - holder.date = (TextView) view.findViewById(R.id.date); - holder.chip = view.findViewById(R.id.chip); - holder.selected = (CheckBox) view.findViewById(R.id.selected_checkbox); - holder.preview = (TextView) view.findViewById(R.id.preview); - if (mCheckboxes) { - holder.selected.setVisibility(View.VISIBLE); - } - - if (holder.selected != null) { - holder.selected.setOnCheckedChangeListener(holder); - } - - - if (mSenderAboveSubject) { - holder.from = (TextView) view.findViewById(R.id.subject); - holder.from.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListSender()); - } else { - holder.subject = (TextView) view.findViewById(R.id.subject); - holder.subject.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListSubject()); - } - - holder.date.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListDate()); - - holder.preview.setLines(mPreviewLines); - holder.preview.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListPreview()); - - view.setTag(holder); - } - - if (message != null) { - bindView(position, view, holder, message); - } else { - // This branch code is triggered when the local store - // hands us an invalid message - - holder.chip.getBackground().setAlpha(0); - if (holder.subject != null) { - holder.subject.setText(getString(R.string.general_no_subject)); - holder.subject.setTypeface(null, Typeface.NORMAL); - } - - String noSender = getString(R.string.general_no_sender); - - if (holder.preview != null) { - holder.preview.setText(noSender, TextView.BufferType.SPANNABLE); - Spannable str = (Spannable) holder.preview.getText(); - - str.setSpan(new StyleSpan(Typeface.NORMAL), - 0, - noSender.length(), - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - str.setSpan(new AbsoluteSizeSpan(mFontSizes.getMessageListSender(), true), - 0, - noSender.length(), - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - } else { - holder.from.setText(noSender); - holder.from.setTypeface(null, Typeface.NORMAL); - holder.from.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null); - } - - holder.date.setText(getString(R.string.general_no_date)); - - //WARNING: Order of the next 2 lines matter - holder.position = -1; - holder.selected.setChecked(false); - - if (!mCheckboxes) { - holder.selected.setVisibility(View.GONE); - } - } - - - return view; - } - - /** - * Associate model data to view object. - * - * @param position - * The position of the item within the adapter's data set of - * the item whose view we want. - * @param view - * Main view component to alter. Nevernull.
- * @param holder
- * Convenience view holder - eases access to view
- * child views. Never null.
- * @param message
- * Never null.
- */
-
-
-
- private void bindView(final int position, final View view, final MessageViewHolder holder,
- final MessageInfoHolder message) {
-
- int maybeBoldTypeface = message.read ? Typeface.NORMAL : Typeface.BOLD;
-
- // So that the mSelectedCount is only incremented/decremented
- // when a user checks the checkbox (vs code)
- holder.position = -1;
-
- holder.selected.setChecked(message.selected);
-
- if (!mCheckboxes && message.selected) {
-
- holder.chip.setBackgroundDrawable(message.message.getFolder().getAccount().getCheckmarkChip().drawable());
- }
-
- else {
- holder.chip.setBackgroundDrawable(message.message.getFolder().getAccount().generateColorChip(message.read,message.message.toMe(), message.message.ccMe(), message.message.fromMe(), message.flagged).drawable());
-
- }
-
- if (K9.useBackgroundAsUnreadIndicator()) {
- int res = (message.read) ? R.attr.messageListReadItemBackgroundColor :
- R.attr.messageListUnreadItemBackgroundColor;
-
- TypedValue outValue = new TypedValue();
- getActivity().getTheme().resolveAttribute(res, outValue, true);
- view.setBackgroundColor(outValue.data);
- }
-
- String subject = null;
-
- if ((message.message.getSubject() == null) || message.message.getSubject().equals("")) {
- subject = (String) getText(R.string.general_no_subject);
-
- } else {
- subject = message.message.getSubject();
- }
-
- // We'll get badge support soon --jrv
-// if (holder.badge != null) {
-// String email = message.counterpartyAddress;
-// holder.badge.assignContactFromEmail(email, true);
-// if (email != null) {
-// mContactsPictureLoader.loadContactPicture(email, holder.badge);
-// }
-// }
-
- if (holder.preview != null) {
- /*
- * In the touchable UI, we have previews. Otherwise, we
- * have just a "from" line.
- * Because text views can't wrap around each other(?) we
- * compose a custom view containing the preview and the
- * from.
- */
-
- CharSequence beforePreviewText = null;
- if (mSenderAboveSubject) {
- beforePreviewText = subject;
- } else {
- beforePreviewText = message.sender;
- }
-
- holder.preview.setText(new SpannableStringBuilder(recipientSigil(message))
- .append(beforePreviewText).append(" ").append(message.message.getPreview()),
- TextView.BufferType.SPANNABLE);
- Spannable str = (Spannable)holder.preview.getText();
-
- // Create a span section for the sender, and assign the correct font size and weight.
- str.setSpan(new AbsoluteSizeSpan((mSenderAboveSubject ? mFontSizes.getMessageListSubject(): mFontSizes.getMessageListSender()), true),
- 0, beforePreviewText.length() + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
- int color = (K9.getK9Theme() == K9.THEME_LIGHT) ?
- Color.rgb(105, 105, 105) :
- Color.rgb(160, 160, 160);
-
- // set span for preview message.
- str.setSpan(new ForegroundColorSpan(color), // How do I can specify the android.R.attr.textColorTertiary
- beforePreviewText.length() + 1,
- str.length(),
- Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- }
-
-
- if (holder.from != null ) {
- holder.from.setTypeface(null, maybeBoldTypeface);
- if (mSenderAboveSubject) {
- holder.from.setCompoundDrawablesWithIntrinsicBounds(
- message.answered ? mAnsweredIcon : null, // left
- null, // top
- message.message.hasAttachments() ? mAttachmentIcon : null, // right
- null); // bottom
-
- holder.from.setText(message.sender);
- } else {
- holder.from.setText(new SpannableStringBuilder(recipientSigil(message)).append(message.sender));
- }
- }
-
- if (holder.subject != null ) {
- if (!mSenderAboveSubject) {
- holder.subject.setCompoundDrawablesWithIntrinsicBounds(
- message.answered ? mAnsweredIcon : null, // left
- null, // top
- message.message.hasAttachments() ? mAttachmentIcon : null, // right
- null); // bottom
- }
-
- holder.subject.setTypeface(null, maybeBoldTypeface);
- holder.subject.setText(subject);
- }
-
- holder.date.setText(message.getDate(mMessageHelper));
- holder.position = position;
- }
-
-
- private String recipientSigil(MessageInfoHolder message) {
- if (message.message.toMe()) {
+ private String recipientSigil(boolean toMe, boolean ccMe) {
+ if (toMe) {
return getString(R.string.messagelist_sent_to_me_sigil);
- } else if (message.message.ccMe()) {
+ } else if (ccMe) {
return getString(R.string.messagelist_sent_cc_me_sigil);
} else {
return "";
@@ -2137,29 +1564,239 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
}
@Override
- public boolean hasStableIds() {
- return true;
+ public View newView(Context context, Cursor cursor, ViewGroup parent) {
+ View view = mInflater.inflate(R.layout.message_list_item, parent, false);
+ view.setId(R.layout.message_list_item);
+
+ MessageViewHolder holder = new MessageViewHolder();
+ holder.date = (TextView) view.findViewById(R.id.date);
+ holder.chip = view.findViewById(R.id.chip);
+ holder.preview = (TextView) view.findViewById(R.id.preview);
+
+ if (mSenderAboveSubject) {
+ holder.from = (TextView) view.findViewById(R.id.subject);
+ holder.from.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListSender());
+ } else {
+ holder.subject = (TextView) view.findViewById(R.id.subject);
+ holder.subject.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListSubject());
+ }
+
+ holder.date.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListDate());
+
+ holder.preview.setLines(mPreviewLines);
+ holder.preview.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListPreview());
+ holder.threadCount = (TextView) view.findViewById(R.id.thread_count);
+
+ holder.selected = (CheckBox) view.findViewById(R.id.selected_checkbox);
+ if (mCheckboxes) {
+ holder.selected.setOnCheckedChangeListener(holder);
+ holder.selected.setVisibility(View.VISIBLE);
+ } else {
+ holder.selected.setVisibility(View.GONE);
+ }
+
+ view.setTag(holder);
+
+ return view;
+ }
+
+ @Override
+ public void bindView(View view, Context context, Cursor cursor) {
+ Account account = getAccountFromCursor(cursor);
+
+ String fromList = cursor.getString(SENDER_LIST_COLUMN);
+ String toList = cursor.getString(TO_LIST_COLUMN);
+ String ccList = cursor.getString(CC_LIST_COLUMN);
+ Address[] fromAddrs = Address.unpack(fromList);
+ Address[] toAddrs = Address.unpack(toList);
+ Address[] ccAddrs = Address.unpack(ccList);
+
+ boolean fromMe = mMessageHelper.toMe(account, fromAddrs);
+ boolean toMe = mMessageHelper.toMe(account, toAddrs);
+ boolean ccMe = mMessageHelper.toMe(account, ccAddrs);
+
+ CharSequence displayName = mMessageHelper.getDisplayName(account, fromAddrs, toAddrs);
+
+ Date sentDate = new Date(cursor.getLong(DATE_COLUMN));
+ String displayDate = mMessageHelper.formatDate(sentDate);
+
+ String preview = cursor.getString(PREVIEW_COLUMN);
+ if (preview == null) {
+ preview = "";
+ }
+
+ String subject = cursor.getString(SUBJECT_COLUMN);
+ if (StringUtils.isNullOrEmpty(subject)) {
+ subject = getString(R.string.general_no_subject);
+ }
+
+ int threadCount = (mThreadedList) ? cursor.getInt(THREAD_COUNT_COLUMN) : 0;
+
+ String flagList = cursor.getString(FLAGS_COLUMN);
+ String[] flags = flagList.split(",");
+ boolean read = false;
+ boolean flagged = false;
+ boolean answered = false;
+ boolean forwarded = false;
+ for (int i = 0, len = flags.length; i < len; i++) {
+ try {
+ switch (Flag.valueOf(flags[i])) {
+ case SEEN: {
+ read = true;
+ break;
+ }
+ case FLAGGED: {
+ flagged = true;
+ break;
+ }
+ case ANSWERED: {
+ answered = true;
+ break;
+ }
+ case FORWARDED: {
+ forwarded = true;
+ break;
+ }
+ default: {
+ // We don't care about the other flags
+ }
+ }
+ } catch (Exception e) { /* ignore */ }
+ }
+
+ boolean hasAttachments = (cursor.getInt(ATTACHMENT_COUNT_COLUMN) > 0);
+
+ MessageViewHolder holder = (MessageViewHolder) view.getTag();
+
+ int maybeBoldTypeface = (read) ? Typeface.NORMAL : Typeface.BOLD;
+
+ long uniqueId = cursor.getLong(mUniqueIdColumn);
+ boolean selected = mSelected.contains(uniqueId);
+
+ if (!mCheckboxes && selected) {
+ holder.chip.setBackgroundDrawable(account.getCheckmarkChip().drawable());
+ } else {
+ holder.chip.setBackgroundDrawable(account.generateColorChip(read, toMe, ccMe,
+ fromMe, flagged).drawable());
+ }
+
+ if (mCheckboxes) {
+ // Set holder.position to -1 to avoid MessageViewHolder.onCheckedChanged() toggling
+ // the selection state when setChecked() is called below.
+ holder.position = -1;
+
+ // Only set the UI state, don't actually toggle the message selection.
+ holder.selected.setChecked(selected);
+
+ // Now save the position so MessageViewHolder.onCheckedChanged() will know what
+ // message to (de)select.
+ holder.position = cursor.getPosition();
+ }
+
+ // Background indicator
+ if (K9.useBackgroundAsUnreadIndicator()) {
+ int res = (read) ? R.attr.messageListReadItemBackgroundColor :
+ R.attr.messageListUnreadItemBackgroundColor;
+
+ TypedValue outValue = new TypedValue();
+ getActivity().getTheme().resolveAttribute(res, outValue, true);
+ view.setBackgroundColor(outValue.data);
+ }
+
+ // Thread count
+ if (threadCount > 1) {
+ holder.threadCount.setText(Integer.toString(threadCount));
+ holder.threadCount.setVisibility(View.VISIBLE);
+ } else {
+ holder.threadCount.setVisibility(View.GONE);
+ }
+
+ CharSequence beforePreviewText = (mSenderAboveSubject) ? subject : displayName;
+
+ String sigil = recipientSigil(toMe, ccMe);
+
+ holder.preview.setText(
+ new SpannableStringBuilder(sigil)
+ .append(beforePreviewText)
+ .append(" ")
+ .append(preview), TextView.BufferType.SPANNABLE);
+
+ Spannable str = (Spannable)holder.preview.getText();
+
+ // Create a span section for the sender, and assign the correct font size and weight
+ int fontSize = (mSenderAboveSubject) ?
+ mFontSizes.getMessageListSubject():
+ mFontSizes.getMessageListSender();
+
+ AbsoluteSizeSpan span = new AbsoluteSizeSpan(fontSize, true);
+ str.setSpan(span, 0, beforePreviewText.length() + 1,
+ Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+ //TODO: make this part of the theme
+ int color = (K9.getK9Theme() == K9.THEME_LIGHT) ?
+ Color.rgb(105, 105, 105) :
+ Color.rgb(160, 160, 160);
+
+ // Set span (color) for preview message
+ str.setSpan(new ForegroundColorSpan(color), beforePreviewText.length() + 1,
+ str.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+ Drawable statusHolder = null;
+ if (forwarded && answered) {
+ statusHolder = mForwardedAnsweredIcon;
+ } else if (answered) {
+ statusHolder = mAnsweredIcon;
+ } else if (forwarded) {
+ statusHolder = mForwardedIcon;
+ }
+
+ if (holder.from != null ) {
+ holder.from.setTypeface(null, maybeBoldTypeface);
+ if (mSenderAboveSubject) {
+ holder.from.setCompoundDrawablesWithIntrinsicBounds(
+ statusHolder, // left
+ null, // top
+ hasAttachments ? mAttachmentIcon : null, // right
+ null); // bottom
+
+ holder.from.setText(displayName);
+ } else {
+ holder.from.setText(new SpannableStringBuilder(sigil).append(displayName));
+ }
+ }
+
+ if (holder.subject != null ) {
+ if (!mSenderAboveSubject) {
+ holder.subject.setCompoundDrawablesWithIntrinsicBounds(
+ statusHolder, // left
+ null, // top
+ hasAttachments ? mAttachmentIcon : null, // right
+ null); // bottom
+ }
+
+ holder.subject.setTypeface(null, maybeBoldTypeface);
+ holder.subject.setText(subject);
+ }
+
+ holder.date.setText(displayDate);
}
}
- class MessageViewHolder
- implements OnCheckedChangeListener {
+ class MessageViewHolder implements OnCheckedChangeListener {
public TextView subject;
public TextView preview;
public TextView from;
public TextView time;
public TextView date;
public View chip;
+ public TextView threadCount;
public CheckBox selected;
public int position = -1;
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (position != -1) {
- MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(position);
- toggleMessageSelect(message);
-
-
+ toggleMessageSelectWithAdapterPosition(position);
}
}
}
@@ -2180,20 +1817,20 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
}
private void updateFooterView() {
- if (mCurrentFolder != null && mAccount != null) {
+ if (!mSearch.isManualSearch() && mCurrentFolder != null && mAccount != null) {
if (mCurrentFolder.loading) {
final boolean showProgress = true;
- updateFooter(getString(R.string.status_loading_more), showProgress);
+ updateFooter(mContext.getString(R.string.status_loading_more), showProgress);
} else {
String message;
if (!mCurrentFolder.lastCheckFailed) {
if (mAccount.getDisplayCount() == 0) {
- message = getString(R.string.message_list_load_more_messages_action);
+ message = mContext.getString(R.string.message_list_load_more_messages_action);
} else {
- message = String.format(getString(R.string.load_more_messages_fmt), mAccount.getDisplayCount());
+ message = String.format(mContext.getString(R.string.load_more_messages_fmt), mAccount.getDisplayCount());
}
} else {
- message = getString(R.string.status_loading_more_failed);
+ message = mContext.getString(R.string.status_loading_more_failed);
}
final boolean showProgress = false;
updateFooter(message, showProgress);
@@ -2205,6 +1842,10 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
}
public void updateFooter(final String text, final boolean progressVisible) {
+ if (mFooterView == null) {
+ return;
+ }
+
FooterViewHolder holder = (FooterViewHolder) mFooterView.getTag();
holder.progress.setVisibility(progressVisible ? ProgressBar.VISIBLE : ProgressBar.INVISIBLE);
@@ -2223,23 +1864,6 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
public TextView main;
}
- private void setAllSelected(boolean isSelected) {
- mSelectedCount = 0;
-
- for (MessageInfoHolder holder : mAdapter.getMessages()) {
- holder.selected = isSelected;
- mSelectedCount += (isSelected ? 1 : 0);
- }
-
- computeBatchDirection();
- mAdapter.notifyDataSetChanged();
-
- if (isSelected) {
- updateActionModeTitle();
- computeSelectAllVisibility();
- }
- }
-
/**
* Set selection state for all messages.
*
@@ -2248,40 +1872,87 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
* action mode is finished.
*/
private void setSelectionState(boolean selected) {
- mAdapter.setSelectionForAllMesages(selected);
-
if (selected) {
- mSelectedCount = mAdapter.getCount();
- mActionMode = getSherlockActivity().startActionMode(mActionModeCallback);
+ if (mAdapter.getCount() == 0) {
+ // Nothing to do if there are no messages
+ return;
+ }
+
+ mSelectedCount = 0;
+ for (int i = 0, end = mAdapter.getCount(); i < end; i++) {
+ Cursor cursor = (Cursor) mAdapter.getItem(i);
+ long uniqueId = cursor.getLong(mUniqueIdColumn);
+ mSelected.add(uniqueId);
+
+ if (mThreadedList) {
+ int threadCount = cursor.getInt(THREAD_COUNT_COLUMN);
+ mSelectedCount += (threadCount > 1) ? threadCount : 1;
+ } else {
+ mSelectedCount++;
+ }
+ }
+
+ if (mActionMode == null) {
+ mActionMode = getSherlockActivity().startActionMode(mActionModeCallback);
+ }
+ computeBatchDirection();
updateActionModeTitle();
computeSelectAllVisibility();
- computeBatchDirection();
} else {
+ mSelected.clear();
mSelectedCount = 0;
if (mActionMode != null) {
mActionMode.finish();
+ mActionMode = null;
}
}
+
+ mAdapter.notifyDataSetChanged();
}
- private void toggleMessageSelect(final MessageInfoHolder holder){
+ private void toggleMessageSelect(int listViewPosition) {
+ int adapterPosition = listViewToAdapterPosition(listViewPosition);
+ if (adapterPosition == AdapterView.INVALID_POSITION) {
+ return;
+ }
+
+ toggleMessageSelectWithAdapterPosition(adapterPosition);
+ }
+
+ private void toggleMessageSelectWithAdapterPosition(int adapterPosition) {
+ Cursor cursor = (Cursor) mAdapter.getItem(adapterPosition);
+ long uniqueId = cursor.getLong(mUniqueIdColumn);
+
+ boolean selected = mSelected.contains(uniqueId);
+ if (!selected) {
+ mSelected.add(uniqueId);
+ } else {
+ mSelected.remove(uniqueId);
+ }
+
+ int selectedCountDelta = 1;
+ if (mThreadedList) {
+ int threadCount = cursor.getInt(THREAD_COUNT_COLUMN);
+ if (threadCount > 1) {
+ selectedCountDelta = threadCount;
+ }
+ }
+
if (mActionMode != null) {
- if (mSelectedCount == 1 && holder.selected) {
+ if (mSelectedCount == selectedCountDelta && selected) {
mActionMode.finish();
+ mActionMode = null;
return;
}
} else {
mActionMode = getSherlockActivity().startActionMode(mActionModeCallback);
}
- if (holder.selected) {
- holder.selected = false;
- mSelectedCount -= 1;
+ if (selected) {
+ mSelectedCount -= selectedCountDelta;
} else {
- holder.selected = true;
- mSelectedCount += 1;
+ mSelectedCount += selectedCountDelta;
}
- mAdapter.notifyDataSetChanged();
computeBatchDirection();
updateActionModeTitle();
@@ -2290,6 +1961,8 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
mActionMode.invalidate();
computeSelectAllVisibility();
+
+ mAdapter.notifyDataSetChanged();
}
private void updateActionModeTitle() {
@@ -2297,19 +1970,24 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
}
private void computeSelectAllVisibility() {
- mActionModeCallback.showSelectAll(mSelectedCount != mAdapter.getCount());
+ mActionModeCallback.showSelectAll(mSelected.size() != mAdapter.getCount());
}
private void computeBatchDirection() {
boolean isBatchFlag = false;
boolean isBatchRead = false;
- for (MessageInfoHolder holder : mAdapter.getMessages()) {
- if (holder.selected) {
- if (!holder.flagged) {
+ for (int i = 0, end = mAdapter.getCount(); i < end; i++) {
+ Cursor cursor = (Cursor) mAdapter.getItem(i);
+ long uniqueId = cursor.getLong(mUniqueIdColumn);
+
+ if (mSelected.contains(uniqueId)) {
+ String flags = cursor.getString(FLAGS_COLUMN);
+
+ if (!flags.contains(Flag.FLAGGED.name())) {
isBatchFlag = true;
}
- if (!holder.read) {
+ if (!flags.contains(Flag.SEEN.name())) {
isBatchRead = true;
}
@@ -2323,132 +2001,154 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
mActionModeCallback.showFlag(isBatchFlag);
}
- /**
- * @param holders
- * Messages to update. Never {@code null}.
- * @param flag
- * Flag to be updated on the specified messages. Never
- * {@code null}.
- * @param newState
- * State to set for the given flag.
- */
- private void setFlag(final Listnull.
+ * @param messages
+ * The messages to copy or move. Never {@code null}.
* @param operation
- * Never {@code null}.
+ * The type of operation to perform. Never {@code null}.
*
- * @return true if operation is possible
+ * @return {@code true}, if operation is possible.
*/
- private boolean checkCopyOrMovePossible(final List
@@ -82,27 +89,29 @@ public class LocalStore extends Store implements Serializable {
private static final long serialVersionUID = -5142141896809423072L;
private static final Message[] EMPTY_MESSAGE_ARRAY = new Message[0];
-
- /**
- * Immutable empty {@link String} array
- */
private static final String[] EMPTY_STRING_ARRAY = new String[0];
-
- private static final Flag[] PERMANENT_FLAGS = { Flag.DELETED, Flag.X_DESTROYED, Flag.SEEN, Flag.FLAGGED };
+ private static final Flag[] EMPTY_FLAG_ARRAY = new Flag[0];
/*
* a String containing the columns getMessages expects to work with
* in the correct order.
*/
static private String GET_MESSAGES_COLS =
- "subject, sender_list, date, uid, flags, id, to_list, cc_list, "
- + "bcc_list, reply_to_list, attachment_count, internal_date, message_id, folder_id, preview ";
-
+ "subject, sender_list, date, uid, flags, messages.id, to_list, cc_list, "
+ + "bcc_list, reply_to_list, attachment_count, internal_date, message_id, folder_id, preview, thread_root, thread_parent ";
static private String GET_FOLDER_COLS = "id, name, unread_count, visible_limit, last_updated, status, push_state, last_pushed, flagged_count, integrate, top_group, poll_class, push_class, display_class";
+ private static final String[] UID_CHECK_PROJECTION = { "uid" };
- protected static final int DB_VERSION = 43;
+ /**
+ * Number of UIDs to check for existence at once.
+ *
+ * @see LocalFolder#extractNewMessages(List)
+ */
+ private static final int UID_CHECK_BATCH_SIZE = 500;
+
+ protected static final int DB_VERSION = 45;
protected String uUid = null;
@@ -110,6 +119,8 @@ public class LocalStore extends Store implements Serializable {
private LockableDatabase database;
+ private ContentResolver mContentResolver;
+
/**
* local://localhost/path/to/database/uuid.db
* This constructor is only used by {@link Store#getLocalInstance(Account, Application)}
@@ -122,6 +133,7 @@ public class LocalStore extends Store implements Serializable {
database = new LockableDatabase(application, account.getUuid(), new StoreSchemaDefinition());
mApplication = application;
+ mContentResolver = application.getContentResolver();
database.setStorageProviderId(account.getLocalStorageProviderId());
uUid = account.getUuid();
@@ -166,10 +178,31 @@ public class LocalStore extends Store implements Serializable {
db.execSQL("CREATE INDEX IF NOT EXISTS folder_name ON folders (name)");
db.execSQL("DROP TABLE IF EXISTS messages");
- db.execSQL("CREATE TABLE messages (id INTEGER PRIMARY KEY, deleted INTEGER default 0, folder_id INTEGER, uid TEXT, subject TEXT, "
- + "date INTEGER, flags TEXT, sender_list TEXT, to_list TEXT, cc_list TEXT, bcc_list TEXT, reply_to_list TEXT, "
- + "html_content TEXT, text_content TEXT, attachment_count INTEGER, internal_date INTEGER, message_id TEXT, preview TEXT, "
- + "mime_type TEXT)");
+ db.execSQL("CREATE TABLE messages (" +
+ "id INTEGER PRIMARY KEY, " +
+ "deleted INTEGER default 0, " +
+ "folder_id INTEGER, " +
+ "uid TEXT, " +
+ "subject TEXT, " +
+ "date INTEGER, " +
+ "flags TEXT, " +
+ "sender_list TEXT, " +
+ "to_list TEXT, " +
+ "cc_list TEXT, " +
+ "bcc_list TEXT, " +
+ "reply_to_list TEXT, " +
+ "html_content TEXT, " +
+ "text_content TEXT, " +
+ "attachment_count INTEGER, " +
+ "internal_date INTEGER, " +
+ "message_id TEXT, " +
+ "preview TEXT, " +
+ "mime_type TEXT, "+
+ "thread_root INTEGER, " +
+ "thread_parent INTEGER, " +
+ "normalized_subject_hash INTEGER, " +
+ "empty INTEGER" +
+ ")");
db.execSQL("DROP TABLE IF EXISTS headers");
db.execSQL("CREATE TABLE headers (id INTEGER PRIMARY KEY, message_id INTEGER, name TEXT, value TEXT)");
@@ -179,6 +212,16 @@ public class LocalStore extends Store implements Serializable {
db.execSQL("DROP INDEX IF EXISTS msg_folder_id");
db.execSQL("DROP INDEX IF EXISTS msg_folder_id_date");
db.execSQL("CREATE INDEX IF NOT EXISTS msg_folder_id_deleted_date ON messages (folder_id,deleted,internal_date)");
+
+ db.execSQL("DROP INDEX IF EXISTS msg_empty");
+ db.execSQL("CREATE INDEX IF NOT EXISTS msg_empty ON messages (empty)");
+
+ db.execSQL("DROP INDEX IF EXISTS msg_thread_root");
+ db.execSQL("CREATE INDEX IF NOT EXISTS msg_thread_root ON messages (thread_root)");
+
+ db.execSQL("DROP INDEX IF EXISTS msg_thread_parent");
+ db.execSQL("CREATE INDEX IF NOT EXISTS msg_thread_parent ON messages (thread_parent)");
+
db.execSQL("DROP TABLE IF EXISTS attachments");
db.execSQL("CREATE TABLE attachments (id INTEGER PRIMARY KEY, message_id INTEGER,"
+ "store_data TEXT, content_uri TEXT, size INTEGER, name TEXT,"
@@ -364,6 +407,34 @@ public class LocalStore extends Store implements Serializable {
Log.e(K9.LOG_TAG, "Error trying to fix the outbox folders", e);
}
}
+ if (db.getVersion() < 44) {
+ try {
+ db.execSQL("ALTER TABLE messages ADD thread_root INTEGER");
+ db.execSQL("ALTER TABLE messages ADD thread_parent INTEGER");
+ db.execSQL("ALTER TABLE messages ADD normalized_subject_hash INTEGER");
+ db.execSQL("ALTER TABLE messages ADD empty INTEGER");
+ } catch (SQLiteException e) {
+ if (! e.getMessage().startsWith("duplicate column name:")) {
+ throw e;
+ }
+ }
+ }
+ if (db.getVersion() < 45) {
+ try {
+ db.execSQL("DROP INDEX IF EXISTS msg_empty");
+ db.execSQL("CREATE INDEX IF NOT EXISTS msg_empty ON messages (empty)");
+
+ db.execSQL("DROP INDEX IF EXISTS msg_thread_root");
+ db.execSQL("CREATE INDEX IF NOT EXISTS msg_thread_root ON messages (thread_root)");
+
+ db.execSQL("DROP INDEX IF EXISTS msg_thread_parent");
+ db.execSQL("CREATE INDEX IF NOT EXISTS msg_thread_parent ON messages (thread_parent)");
+ } catch (SQLiteException e) {
+ if (! e.getMessage().startsWith("duplicate column name:")) {
+ throw e;
+ }
+ }
+ }
}
} catch (SQLiteException e) {
Log.e(K9.LOG_TAG, "Exception while upgrading database. Resetting the DB to v0");
@@ -623,6 +694,26 @@ public class LocalStore extends Store implements Serializable {
return new LocalFolder(name);
}
+ public LocalFolder getFolderById(long folderId) {
+ return new LocalFolder(folderId);
+ }
+
+ private long getFolderId(final String name) throws MessagingException {
+ return database.execute(false, new DbCallback() {
+ @Override
+ public Long doDbWork(final SQLiteDatabase db) {
+ Cursor cursor = null;
+ try {
+ cursor = db.rawQuery("SELECT id FROM folders WHERE name = '" + name + "'", null);
+ cursor.moveToFirst();
+ return cursor.getLong(0);
+ } finally {
+ Utility.closeQuietly(cursor);
+ }
+ }
+ });
+ }
+
// TODO this takes about 260-300ms, seems slow.
@Override
public List getPersonalNamespaces(boolean forceListAll) throws MessagingException {
@@ -855,97 +946,54 @@ public class LocalStore extends Store implements Serializable {
return true;
}
- public Message[] searchForMessages(MessageRetrievalListener listener, String[] queryFields, String queryString,
- List folders, Message[] messages, final Flag[] requiredFlags, final Flag[] forbiddenFlags) throws MessagingException {
- List args = new LinkedList();
-
- StringBuilder whereClause = new StringBuilder();
- if (queryString != null && queryString.length() > 0) {
- boolean anyAdded = false;
- String likeString = "%" + queryString + "%";
- whereClause.append(" AND (");
- for (String queryField : queryFields) {
-
- if (anyAdded) {
- whereClause.append(" OR ");
- }
- whereClause.append(queryField).append(" LIKE ? ");
- args.add(likeString);
- anyAdded = true;
- }
-
-
- whereClause.append(" )");
+ // TODO find beter solution
+ private static boolean isFolderId(String str) {
+ if (str == null) {
+ return false;
}
- if (folders != null && !folders.isEmpty()) {
- whereClause.append(" AND folder_id in (");
- boolean anyAdded = false;
- for (LocalFolder folder : folders) {
- if (anyAdded) {
- whereClause.append(",");
- }
- anyAdded = true;
- whereClause.append("?");
- args.add(Long.toString(folder.getId()));
- }
- whereClause.append(" )");
+ int length = str.length();
+ if (length == 0) {
+ return false;
}
- if (messages != null && messages.length > 0) {
- whereClause.append(" AND ( ");
- boolean anyAdded = false;
- for (Message message : messages) {
- if (anyAdded) {
- whereClause.append(" OR ");
- }
- anyAdded = true;
- whereClause.append(" ( uid = ? AND folder_id = ? ) ");
- args.add(message.getUid());
- args.add(Long.toString(((LocalFolder)message.getFolder()).getId()));
- }
- whereClause.append(" )");
+ int i = 0;
+ if (str.charAt(0) == '-') {
+ return false;
}
- if (forbiddenFlags != null && forbiddenFlags.length > 0) {
- whereClause.append(" AND (");
- boolean anyAdded = false;
- for (Flag flag : forbiddenFlags) {
- if (anyAdded) {
- whereClause.append(" AND ");
+ for (; i < length; i++) {
+ char c = str.charAt(i);
+ if (c <= '/' || c >= ':') {
+ return false;
}
- anyAdded = true;
- whereClause.append(" flags NOT LIKE ?");
+ }
+ return true;
+ }
- args.add("%" + flag.toString() + "%");
- }
- whereClause.append(" )");
- }
- if (requiredFlags != null && requiredFlags.length > 0) {
- whereClause.append(" AND (");
- boolean anyAdded = false;
- for (Flag flag : requiredFlags) {
- if (anyAdded) {
- whereClause.append(" OR ");
- }
- anyAdded = true;
- whereClause.append(" flags LIKE ?");
+ public Message[] searchForMessages(MessageRetrievalListener retrievalListener,
+ LocalSearch search) throws MessagingException {
- args.add("%" + flag.toString() + "%");
- }
- whereClause.append(" )");
- }
+ StringBuilder query = new StringBuilder();
+ List queryArgs = new ArrayList();
+ SqlQueryBuilder.buildWhereClause(mAccount, search.getConditions(), query, queryArgs);
+
+ // Avoid "ambiguous column name" error by prefixing "id" with the message table name
+ String where = SqlQueryBuilder.addPrefixToSelection(new String[] { "id" },
+ "messages.", query.toString());
+
+ String[] selectionArgs = queryArgs.toArray(EMPTY_STRING_ARRAY);
+
+ String sqlQuery = "SELECT " + GET_MESSAGES_COLS + "FROM messages " +
+ "LEFT JOIN folders ON (folders.id = messages.folder_id) WHERE " +
+ "((empty IS NULL OR empty != 1) AND deleted = 0)" +
+ ((!StringUtils.isNullOrEmpty(where)) ? " AND (" + where + ")" : "") +
+ " ORDER BY date DESC";
if (K9.DEBUG) {
- Log.v(K9.LOG_TAG, "whereClause = " + whereClause.toString());
- Log.v(K9.LOG_TAG, "args = " + args);
+ Log.d(K9.LOG_TAG, "Query = " + sqlQuery);
}
- return getMessages(
- listener,
- null,
- "SELECT "
- + GET_MESSAGES_COLS
- + "FROM messages WHERE deleted = 0 " + whereClause.toString() + " ORDER BY date DESC"
- , args.toArray(EMPTY_STRING_ARRAY)
- );
+
+ return getMessages(retrievalListener, null, sqlQuery, selectionArgs);
}
+
/*
* Given a query string, actually do the query for the messages and
* call the MessageRetrievalListener for each one
@@ -1003,6 +1051,16 @@ public class LocalStore extends Store implements Serializable {
}
+ public Message[] getMessagesInThread(final long rootId) throws MessagingException {
+ String rootIdString = Long.toString(rootId);
+
+ LocalSearch search = new LocalSearch();
+ search.and(Searchfield.THREAD_ROOT, rootIdString, Attribute.EQUALS);
+ search.or(new SearchCondition(Searchfield.ID, Attribute.EQUALS, rootIdString));
+
+ return searchForMessages(null, search);
+ }
+
public AttachmentInfo getAttachmentInfo(final String attachmentId) throws UnavailableStorageException {
return database.execute(false, new DbCallback() {
@Override
@@ -1285,7 +1343,7 @@ public class LocalStore extends Store implements Serializable {
}
Cursor cursor = null;
try {
- cursor = db.rawQuery("SELECT COUNT(*) FROM messages WHERE deleted = 0 and folder_id = ?",
+ cursor = db.rawQuery("SELECT COUNT(*) FROM messages WHERE (empty IS NULL OR empty != 1) AND deleted = 0 and folder_id = ?",
new String[] {
Long.toString(mFolderId)
});
@@ -1901,7 +1959,7 @@ public class LocalStore extends Store implements Serializable {
listener,
LocalFolder.this,
"SELECT " + GET_MESSAGES_COLS
- + "FROM messages WHERE "
+ + "FROM messages WHERE (empty IS NULL OR empty != 1) AND "
+ (includeDeleted ? "" : "deleted = 0 AND ")
+ " folder_id = ? ORDER BY date DESC"
, new String[] {
@@ -1918,7 +1976,6 @@ public class LocalStore extends Store implements Serializable {
}
}
-
@Override
public Message[] getMessages(String[] uids, MessageRetrievalListener listener)
throws MessagingException {
@@ -1975,30 +2032,118 @@ public class LocalStore extends Store implements Serializable {
String oldUID = message.getUid();
- if (K9.DEBUG)
+ if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "Updating folder_id to " + lDestFolder.getId() + " for message with UID "
+ message.getUid() + ", id " + lMessage.getId() + " currently in folder " + getName());
+ }
String newUid = K9.LOCAL_UID_PREFIX + UUID.randomUUID().toString();
message.setUid(newUid);
uidMap.put(oldUID, newUid);
- db.execSQL("UPDATE messages " + "SET folder_id = ?, uid = ? " + "WHERE id = ?", new Object[] {
- lDestFolder.getId(),
- message.getUid(),
- lMessage.getId()
- });
+ // Message threading in the target folder
+ ThreadInfo threadInfo = lDestFolder.doMessageThreading(db, message);
+
+ /*
+ * "Move" the message into the new folder and thread structure
+ */
+ long id = lMessage.getId();
+ String[] idArg = new String[] { Long.toString(id) };
+
+ ContentValues cv = new ContentValues();
+ cv.put("folder_id", lDestFolder.getId());
+ cv.put("uid", newUid);
+
+ if (threadInfo.rootId != -1) {
+ cv.put("thread_root", threadInfo.rootId);
+ }
+
+ if (threadInfo.parentId != -1) {
+ cv.put("thread_parent", threadInfo.parentId);
+ }
+
+ db.update("messages", cv, "id = ?", idArg);
+
+ if (threadInfo.id != -1) {
+ String[] oldIdArg =
+ new String[] { Long.toString(threadInfo.id) };
+
+ cv.clear();
+ cv.put("thread_root", id);
+ db.update("messages", cv, "thread_root = ?", oldIdArg);
+
+ cv.clear();
+ cv.put("thread_parent", id);
+ db.update("messages", cv, "thread_parent = ?", oldIdArg);
+ }
/*
* Add a placeholder message so we won't download the original
* message again if we synchronize before the remote move is
* complete.
*/
- LocalMessage placeHolder = new LocalMessage(oldUID, LocalFolder.this);
- placeHolder.setFlagInternal(Flag.DELETED, true);
- placeHolder.setFlagInternal(Flag.SEEN, true);
- appendMessages(new Message[] { placeHolder });
+
+ // We need to open this folder to get the folder id
+ open(OpenMode.READ_WRITE);
+
+ cv.clear();
+ cv.put("uid", oldUID);
+ cv.put("flags", serializeFlags(new Flag[] { Flag.DELETED, Flag.SEEN }));
+ cv.put("deleted", 1);
+ cv.put("folder_id", mFolderId);
+
+ String messageId = message.getMessageId();
+ if (messageId != null) {
+ cv.put("message_id", messageId);
+ cv.put("empty", 1);
+
+ long rootId = lMessage.getRootId();
+ if (rootId != -1) {
+ cv.put("thread_root", rootId);
+ }
+
+ long parentId = lMessage.getParentId();
+ if (parentId != -1) {
+ cv.put("thread_parent", parentId);
+ }
+ }
+
+ final long newId;
+ if (threadInfo.id != -1) {
+ // There already existed an empty message in the target folder.
+ // Let's use it as placeholder.
+
+ newId = threadInfo.id;
+
+ db.update("messages", cv, "id = ?",
+ new String[] { Long.toString(newId) });
+ } else {
+ newId = db.insert("messages", null, cv);
+ }
+
+ /*
+ * Replace all "thread links" to the original message with links to
+ * the placeholder message.
+ */
+
+ String[] whereArgs = new String[] {
+ Long.toString(mFolderId),
+ Long.toString(id) };
+
+ // Note: If there was an empty message in the target folder we
+ // already reconnected some messages to point to 'id'. We don't
+ // want to change those links again, so we limit the update
+ // statements below to the source folder.
+ cv.clear();
+ cv.put("thread_root", newId);
+ db.update("messages", cv, "folder_id = ? AND thread_root = ?",
+ whereArgs);
+
+ cv.clear();
+ cv.put("thread_parent", newId);
+ db.update("messages", cv, "folder_id = ? AND thread_parent = ?",
+ whereArgs);
}
} catch (MessagingException e) {
throw new WrappedException(e);
@@ -2006,6 +2151,9 @@ public class LocalStore extends Store implements Serializable {
return null;
}
});
+
+ notifyChange();
+
return uidMap;
} catch (WrappedException e) {
throw(MessagingException) e.getCause();
@@ -2076,6 +2224,70 @@ public class LocalStore extends Store implements Serializable {
}
}
+ /**
+ * Get the (database) ID of the message with the specified message ID.
+ *
+ * @param db
+ * A {@link SQLiteDatabase} instance to access the database.
+ * @param messageId
+ * The message ID to search for.
+ * @param onlyEmptyMessages
+ * {@code true} if only "empty messages" (placeholders for threading) should be
+ * searched
+ *
+ * @return If exactly one message with the specified message ID was found, the database ID
+ * of this message; {@code -1} otherwise.
+ */
+ private long getDatabaseIdByMessageId(SQLiteDatabase db, String messageId,
+ boolean onlyEmptyMessages) {
+ long id = -1;
+
+ Cursor cursor = db.query("messages",
+ new String[] { "id" },
+ (onlyEmptyMessages) ?
+ "empty=1 AND folder_id=? AND message_id=?" :
+ "folder_id=? AND message_id=?",
+ new String[] { Long.toString(mFolderId), messageId },
+ null, null, null);
+
+ if (cursor != null) {
+ try {
+ if (cursor.getCount() == 1) {
+ cursor.moveToFirst();
+ id = cursor.getLong(0);
+ }
+ } finally {
+ cursor.close();
+ }
+ }
+
+ return id;
+ }
+
+ private ThreadInfo getThreadInfo(SQLiteDatabase db, String messageId) {
+ Cursor cursor = db.query("messages",
+ new String[] { "id", "thread_root", "thread_parent" },
+ "folder_id=? AND message_id=?",
+ new String[] { Long.toString(mFolderId), messageId },
+ null, null, null);
+
+ if (cursor != null) {
+ try {
+ if (cursor.getCount() == 1) {
+ cursor.moveToFirst();
+ long id = cursor.getLong(0);
+ long rootId = (cursor.isNull(1)) ? -1 : cursor.getLong(1);
+ long parentId = (cursor.isNull(2)) ? -1 : cursor.getLong(2);
+
+ return new ThreadInfo(id, messageId, rootId, parentId);
+ }
+ } finally {
+ cursor.close();
+ }
+ }
+
+ return null;
+ }
/**
* The method differs slightly from the contract; If an incoming message already has a uid
@@ -2143,6 +2355,17 @@ public class LocalStore extends Store implements Serializable {
deleteAttachments(message.getUid());
}
+ long rootId = -1;
+ long parentId = -1;
+
+ if (oldMessageId == -1) {
+ // This is a new message. Do the message threading.
+ ThreadInfo threadInfo = doMessageThreading(db, message);
+ oldMessageId = threadInfo.id;
+ rootId = threadInfo.rootId;
+ parentId = threadInfo.parentId;
+ }
+
boolean isDraft = (message.getHeader(K9.IDENTITY_HEADER) != null);
List attachments;
@@ -2176,7 +2399,7 @@ public class LocalStore extends Store implements Serializable {
cv.put("sender_list", Address.pack(message.getFrom()));
cv.put("date", message.getSentDate() == null
? System.currentTimeMillis() : message.getSentDate().getTime());
- cv.put("flags", Utility.combine(message.getFlags(), ',').toUpperCase(Locale.US));
+ cv.put("flags", serializeFlags(message.getFlags()));
cv.put("deleted", message.isSet(Flag.DELETED) ? 1 : 0);
cv.put("folder_id", mFolderId);
cv.put("to_list", Address.pack(message.getRecipients(RecipientType.TO)));
@@ -2190,11 +2413,20 @@ public class LocalStore extends Store implements Serializable {
cv.put("internal_date", message.getInternalDate() == null
? System.currentTimeMillis() : message.getInternalDate().getTime());
cv.put("mime_type", message.getMimeType());
+ cv.put("empty", 0);
String messageId = message.getMessageId();
if (messageId != null) {
cv.put("message_id", messageId);
}
+
+ if (rootId != -1) {
+ cv.put("thread_root", rootId);
+ }
+ if (parentId != -1) {
+ cv.put("thread_parent", parentId);
+ }
+
long messageUid;
if (oldMessageId == -1) {
@@ -2223,6 +2455,9 @@ public class LocalStore extends Store implements Serializable {
return null;
}
});
+
+ notifyChange();
+
return uidMap;
} catch (WrappedException e) {
throw(MessagingException) e.getCause();
@@ -2270,7 +2505,7 @@ public class LocalStore extends Store implements Serializable {
message.getSentDate() == null ? System
.currentTimeMillis() : message.getSentDate()
.getTime(),
- Utility.combine(message.getFlags(), ',').toUpperCase(Locale.US),
+ serializeFlags(message.getFlags()),
mFolderId,
Address.pack(message
.getRecipients(RecipientType.TO)),
@@ -2303,6 +2538,8 @@ public class LocalStore extends Store implements Serializable {
} catch (WrappedException e) {
throw(MessagingException) e.getCause();
}
+
+ notifyChange();
}
/**
@@ -2337,7 +2574,8 @@ public class LocalStore extends Store implements Serializable {
db.execSQL("UPDATE messages " + "SET flags = ? " + " WHERE id = ?",
new Object[]
- { Utility.combine(appendedFlags.toArray(), ',').toUpperCase(Locale.US), id });
+ { serializeFlags(appendedFlags.toArray(EMPTY_FLAG_ARRAY)), id });
+
return null;
}
});
@@ -2551,6 +2789,9 @@ public class LocalStore extends Store implements Serializable {
return null;
}
});
+
+ //TODO: remove this once the UI code exclusively uses the database id
+ notifyChange();
}
@Override
@@ -2581,7 +2822,7 @@ public class LocalStore extends Store implements Serializable {
Message[] messages = LocalStore.this.getMessages(
null,
this,
- "SELECT " + GET_MESSAGES_COLS + "FROM messages WHERE " + whereClause,
+ "SELECT " + GET_MESSAGES_COLS + "FROM messages WHERE (empty IS NULL OR empty != 1) AND (" + whereClause + ")",
params);
for (Message message : messages) {
@@ -2595,6 +2836,8 @@ public class LocalStore extends Store implements Serializable {
}
});
resetUnreadAndFlaggedCounts();
+
+ notifyChange();
}
public void clearMessagesOlderThan(long cutoff) throws MessagingException {
@@ -2883,6 +3126,167 @@ public class LocalStore extends Store implements Serializable {
});
}
+ private String serializeFlags(Flag[] flags) {
+ return Utility.combine(flags, ',').toUpperCase(Locale.US);
+ }
+
+ private ThreadInfo doMessageThreading(SQLiteDatabase db, Message message)
+ throws MessagingException {
+ long rootId = -1;
+ long parentId = -1;
+
+ String messageId = message.getMessageId();
+
+ // If there's already an empty message in the database, update that
+ long id = getDatabaseIdByMessageId(db, messageId, true);
+
+ // Get the message IDs from the "References" header line
+ String[] referencesArray = message.getHeader("References");
+ List messageIds = null;
+ if (referencesArray != null && referencesArray.length > 0) {
+ messageIds = Utility.extractMessageIds(referencesArray[0]);
+ }
+
+ // Append the first message ID from the "In-Reply-To" header line
+ String[] inReplyToArray = message.getHeader("In-Reply-To");
+ String inReplyTo = null;
+ if (inReplyToArray != null && inReplyToArray.length > 0) {
+ inReplyTo = Utility.extractMessageId(inReplyToArray[0]);
+ if (inReplyTo != null) {
+ if (messageIds == null) {
+ messageIds = new ArrayList(1);
+ messageIds.add(inReplyTo);
+ } else if (!messageIds.contains(inReplyTo)) {
+ messageIds.add(inReplyTo);
+ }
+ }
+ }
+
+ if (messageIds == null) {
+ // This is not a reply, nothing to do for us.
+ return new ThreadInfo(id, messageId, -1, -1);
+ }
+
+ for (String reference : messageIds) {
+ ThreadInfo threadInfo = getThreadInfo(db, reference);
+
+ if (threadInfo == null) {
+ // Create placeholder message
+ ContentValues cv = new ContentValues();
+ cv.put("message_id", reference);
+ cv.put("folder_id", mFolderId);
+ cv.put("empty", 1);
+
+ if (rootId != -1) {
+ cv.put("thread_root", rootId);
+ }
+ if (parentId != -1) {
+ cv.put("thread_parent", parentId);
+ }
+
+ parentId = db.insert("messages", null, cv);
+ if (rootId == -1) {
+ rootId = parentId;
+ }
+ } else {
+ if (rootId != -1 && threadInfo.rootId == -1 && rootId != threadInfo.id) {
+ // We found an existing root container that is not
+ // the root of our current path (References).
+ // Connect it to the current parent.
+
+ // Let all children know who's the new root
+ ContentValues cv = new ContentValues();
+ cv.put("thread_root", rootId);
+ db.update("messages", cv, "thread_root=?",
+ new String[] { Long.toString(threadInfo.id) });
+
+ // Connect the message to the current parent
+ cv.put("thread_parent", parentId);
+ db.update("messages", cv, "id=?",
+ new String[] { Long.toString(threadInfo.id) });
+ } else {
+ rootId = (threadInfo.rootId == -1) ? threadInfo.id : threadInfo.rootId;
+ }
+ parentId = threadInfo.id;
+ }
+ }
+
+ //TODO: set in-reply-to "link" even if one already exists
+
+ return new ThreadInfo(id, messageId, rootId, parentId);
+ }
+
+ public List extractNewMessages(final List messages)
+ throws MessagingException {
+
+ try {
+ return database.execute(false, new DbCallback>() {
+ @Override
+ public List doDbWork(final SQLiteDatabase db) throws WrappedException {
+ try {
+ open(OpenMode.READ_WRITE);
+ } catch (MessagingException e) {
+ throw new WrappedException(e);
+ }
+
+ List result = new ArrayList();
+
+ List selectionArgs = new ArrayList();
+ Set existingMessages = new HashSet();
+ int start = 0;
+
+ while (start < messages.size()) {
+ StringBuilder selection = new StringBuilder();
+
+ selection.append("folder_id = ? AND UID IN (");
+ selectionArgs.add(Long.toString(mFolderId));
+
+ int count = Math.min(messages.size() - start, UID_CHECK_BATCH_SIZE);
+
+ for (int i = start, end = start + count; i < end; i++) {
+ if (i > start) {
+ selection.append(",?");
+ } else {
+ selection.append("?");
+ }
+
+ selectionArgs.add(messages.get(i).getUid());
+ }
+
+ selection.append(")");
+
+ Cursor cursor = db.query("messages", UID_CHECK_PROJECTION,
+ selection.toString(), selectionArgs.toArray(EMPTY_STRING_ARRAY),
+ null, null, null);
+
+ try {
+ while (cursor.moveToNext()) {
+ String uid = cursor.getString(0);
+ existingMessages.add(uid);
+ }
+ } finally {
+ Utility.closeQuietly(cursor);
+ }
+
+ for (int i = start, end = start + count; i < end; i++) {
+ Message message = messages.get(i);
+ if (!existingMessages.contains(message.getUid())) {
+ result.add(message);
+ }
+ }
+
+ existingMessages.clear();
+ selectionArgs.clear();
+ start += count;
+ }
+
+ return result;
+ }
+ });
+ } catch (WrappedException e) {
+ throw(MessagingException) e.getCause();
+ }
+ }
}
public static class LocalTextBody extends TextBody {
@@ -2917,19 +3321,12 @@ public class LocalStore extends Store implements Serializable {
private String mPreview = "";
- private boolean mToMeCalculated = false;
- private boolean mCcMeCalculated = false;
- private boolean mFromMeCalculated = false;
- private boolean mToMe = false;
- private boolean mCcMe = false;
- private boolean mFromMe = false;
-
-
-
-
private boolean mHeadersLoaded = false;
private boolean mMessageDirty = false;
+ private long mRootId;
+ private long mParentId;
+
public LocalMessage() {
}
@@ -2983,6 +3380,9 @@ public class LocalStore extends Store implements Serializable {
f.open(LocalFolder.OpenMode.READ_WRITE);
this.mFolder = f;
}
+
+ mRootId = (cursor.isNull(15)) ? -1 : cursor.getLong(15);
+ mParentId = (cursor.isNull(16)) ? -1 : cursor.getLong(16);
}
/**
@@ -3122,64 +3522,6 @@ public class LocalStore extends Store implements Serializable {
mMessageDirty = true;
}
-
- public boolean fromMe() {
- if (!mFromMeCalculated) {
- if (mAccount.isAnIdentity(getFrom())) {
- mFromMe = true;
- mFromMeCalculated = true;
- }
- }
- return mFromMe;
- }
-
-
- public boolean toMe() {
- try {
- if (!mToMeCalculated) {
- for (Address address : getRecipients(RecipientType.TO)) {
- if (mAccount.isAnIdentity(address)) {
- mToMe = true;
- mToMeCalculated = true;
- }
- }
- }
- } catch (MessagingException e) {
- // do something better than ignore this
- // getRecipients can throw a messagingexception
- }
- return mToMe;
- }
-
-
-
-
-
- public boolean ccMe() {
- try {
-
- if (!mCcMeCalculated) {
- for (Address address : getRecipients(RecipientType.CC)) {
- if (mAccount.isAnIdentity(address)) {
- mCcMe = true;
- mCcMeCalculated = true;
- }
- }
-
- }
- } catch (MessagingException e) {
- // do something better than ignore this
- // getRecipients can throw a messagingexception
- }
-
- return mCcMe;
- }
-
-
-
-
-
-
public void setFlagInternal(Flag flag, boolean set) throws MessagingException {
super.setFlag(flag, set);
}
@@ -3219,7 +3561,7 @@ public class LocalStore extends Store implements Serializable {
throw(MessagingException) e.getCause();
}
-
+ notifyChange();
}
/*
@@ -3236,13 +3578,26 @@ public class LocalStore extends Store implements Serializable {
try {
database.execute(true, new DbCallback() {
@Override
- public Void doDbWork(final SQLiteDatabase db) throws WrappedException, UnavailableStorageException {
- db.execSQL("UPDATE messages SET " + "deleted = 1," + "subject = NULL, "
- + "sender_list = NULL, " + "date = NULL, " + "to_list = NULL, "
- + "cc_list = NULL, " + "bcc_list = NULL, " + "preview = NULL, "
- + "html_content = NULL, " + "text_content = NULL, "
- + "reply_to_list = NULL " + "WHERE id = ?", new Object[]
- { mId });
+ public Void doDbWork(final SQLiteDatabase db) throws WrappedException,
+ UnavailableStorageException {
+ String[] idArg = new String[] { Long.toString(mId) };
+
+ ContentValues cv = new ContentValues();
+ cv.put("deleted", 1);
+ cv.put("empty", 1);
+ cv.putNull("subject");
+ cv.putNull("sender_list");
+ cv.putNull("date");
+ cv.putNull("to_list");
+ cv.putNull("cc_list");
+ cv.putNull("bcc_list");
+ cv.putNull("preview");
+ cv.putNull("html_content");
+ cv.putNull("text_content");
+ cv.putNull("reply_to_list");
+
+ db.update("messages", cv, "id = ?", idArg);
+
/*
* Delete all of the message's attachments to save space.
* We do this explicit deletion here because we're not deleting the record
@@ -3253,8 +3608,8 @@ public class LocalStore extends Store implements Serializable {
} catch (MessagingException e) {
throw new WrappedException(e);
}
- db.execSQL("DELETE FROM attachments WHERE message_id = ?", new Object[]
- { mId });
+
+ db.delete("attachments", "message_id = ?", idArg);
return null;
}
});
@@ -3263,11 +3618,13 @@ public class LocalStore extends Store implements Serializable {
}
((LocalFolder)mFolder).deleteHeaders(mId);
-
+ notifyChange();
}
/*
* Completely remove a message from the local database
+ *
+ * TODO: document how this updates the thread structure
*/
@Override
public void destroy() throws MessagingException {
@@ -3277,9 +3634,102 @@ public class LocalStore extends Store implements Serializable {
public Void doDbWork(final SQLiteDatabase db) throws WrappedException,
UnavailableStorageException {
try {
+ LocalFolder localFolder = (LocalFolder) mFolder;
+
updateFolderCountsOnFlag(Flag.X_DESTROYED, true);
- ((LocalFolder) mFolder).deleteAttachments(mId);
- db.execSQL("DELETE FROM messages WHERE id = ?", new Object[] { mId });
+ localFolder.deleteAttachments(mId);
+
+ String id = Long.toString(mId);
+
+ // Check if this message has children in the thread hierarchy
+ Cursor cursor = db.query("messages", new String[] { "COUNT(id)" },
+ "thread_root = ? OR thread_parent = ?",
+ new String[] {id, id},
+ null, null, null);
+
+ try {
+ if (cursor.moveToFirst() && cursor.getLong(0) > 0) {
+ // Make the message an empty message
+ ContentValues cv = new ContentValues();
+ cv.put("id", mId);
+ cv.put("folder_id", localFolder.getId());
+ cv.put("deleted", 0);
+ cv.put("message_id", getMessageId());
+ cv.put("empty", 1);
+
+ if (getRootId() != -1) {
+ cv.put("thread_root", getRootId());
+ }
+
+ if (getParentId() != -1) {
+ cv.put("thread_parent", getParentId());
+ }
+
+ db.replace("messages", null, cv);
+
+ // Nothing else to do
+ return null;
+ }
+ } finally {
+ cursor.close();
+ }
+
+ long parentId = getParentId();
+
+ // Check if 'parentId' is empty
+ cursor = db.query("messages", new String[] { "id" },
+ "id = ? AND empty = 1",
+ new String[] { Long.toString(parentId) },
+ null, null, null);
+
+ try {
+ if (cursor.getCount() == 0) {
+ // If the message isn't empty we skip the loop below
+ parentId = -1;
+ }
+ } finally {
+ cursor.close();
+ }
+
+ while (parentId != -1) {
+ String parentIdString = Long.toString(parentId);
+
+ // Get the parent of the message 'parentId'
+ cursor = db.query("messages", new String[] { "thread_parent" },
+ "id = ? AND empty = 1",
+ new String[] { parentIdString },
+ null, null, null);
+ try {
+ if (cursor.moveToFirst() && !cursor.isNull(0)) {
+ parentId = cursor.getLong(0);
+ } else {
+ parentId = -1;
+ }
+ } finally {
+ cursor.close();
+ }
+
+ // Check if (the old) 'parentId' has any children
+ cursor = db.query("messages", new String[] { "COUNT(id)" },
+ "thread_parent = ? AND id != ?",
+ new String[] { parentIdString, id },
+ null, null, null);
+
+ try {
+ if (cursor.moveToFirst() && cursor.getLong(0) == 0) {
+ // If it has no children we can remove it
+ db.delete("messages", "id = ?",
+ new String[] { parentIdString });
+ } else {
+ break;
+ }
+ } finally {
+ cursor.close();
+ }
+ }
+
+ // Remove the placeholder message
+ db.delete("messages", "id = ?", new String[] { id });
} catch (MessagingException e) {
throw new WrappedException(e);
}
@@ -3289,6 +3739,8 @@ public class LocalStore extends Store implements Serializable {
} catch (WrappedException e) {
throw(MessagingException) e.getCause();
}
+
+ notifyChange();
}
private void updateFolderCountsOnFlag(Flag flag, boolean set) {
@@ -3376,15 +3828,19 @@ public class LocalStore extends Store implements Serializable {
message.mAttachmentCount = mAttachmentCount;
message.mSubject = mSubject;
message.mPreview = mPreview;
- message.mToMeCalculated = mToMeCalculated;
- message.mCcMeCalculated = mCcMeCalculated;
- message.mToMe = mToMe;
- message.mCcMe = mCcMe;
message.mHeadersLoaded = mHeadersLoaded;
message.mMessageDirty = mMessageDirty;
return message;
}
+
+ public long getRootId() {
+ return mRootId;
+ }
+
+ public long getParentId() {
+ return mParentId;
+ }
}
public static class LocalAttachmentBodyPart extends MimeBodyPart {
@@ -3449,4 +3905,27 @@ public class LocalStore extends Store implements Serializable {
return mUri;
}
}
+
+ static class ThreadInfo {
+ public final long id;
+ public final String messageId;
+ public final long rootId;
+ public final long parentId;
+
+ public ThreadInfo(long id, String messageId, long rootId, long parentId) {
+ this.id = id;
+ this.messageId = messageId;
+ this.rootId = rootId;
+ this.parentId = parentId;
+ }
+ }
+
+ public LockableDatabase getDatabase() {
+ return database;
+ }
+
+ private void notifyChange() {
+ Uri uri = Uri.withAppendedPath(EmailProvider.CONTENT_URI, "account/" + uUid + "/messages");
+ mContentResolver.notifyChange(uri, null);
+ }
}
diff --git a/src/com/fsck/k9/mail/store/LockableDatabase.java b/src/com/fsck/k9/mail/store/LockableDatabase.java
index b303c2aef..67090aace 100644
--- a/src/com/fsck/k9/mail/store/LockableDatabase.java
+++ b/src/com/fsck/k9/mail/store/LockableDatabase.java
@@ -49,7 +49,7 @@ public class LockableDatabase {
* Workaround exception wrapper used to keep the inner exception generated
* in a {@link DbCallback}.
*/
- protected static class WrappedException extends RuntimeException {
+ public static class WrappedException extends RuntimeException {
/**
*
*/
diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index 985826605..190b46765 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -222,6 +222,9 @@ public class GlobalSettings {
s.put("useBackgroundAsUnreadIndicator", Settings.versions(
new V(19, new BooleanSetting(true))
));
+ s.put("threadedView", Settings.versions(
+ new V(20, new BooleanSetting(true))
+ ));
SETTINGS = Collections.unmodifiableMap(s);
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index 725c562f7..56a6646b9 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -35,7 +35,7 @@ public class Settings {
*
* @see SettingsExporter
*/
- public static final int VERSION = 19;
+ public static final int VERSION = 20;
public static Map validate(int version, Map> settings,
diff --git a/src/com/fsck/k9/provider/EmailProvider.java b/src/com/fsck/k9/provider/EmailProvider.java
new file mode 100644
index 000000000..150c272dc
--- /dev/null
+++ b/src/com/fsck/k9/provider/EmailProvider.java
@@ -0,0 +1,579 @@
+package com.fsck.k9.provider;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.fsck.k9.Account;
+import com.fsck.k9.Preferences;
+import com.fsck.k9.helper.StringUtils;
+import com.fsck.k9.helper.Utility;
+import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.store.LocalStore;
+import com.fsck.k9.mail.store.LockableDatabase;
+import com.fsck.k9.mail.store.LockableDatabase.DbCallback;
+import com.fsck.k9.mail.store.LockableDatabase.WrappedException;
+import com.fsck.k9.mail.store.UnavailableStorageException;
+import com.fsck.k9.search.SqlQueryBuilder;
+
+import android.annotation.TargetApi;
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.CursorWrapper;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+
+/**
+ * Content Provider used to display the message list etc.
+ *
+ *
+ * For now this content provider is for internal use only. In the future we may allow third-party
+ * apps to access K-9 Mail content using this content provider.
+ *
+ */
+/*
+ * TODO:
+ * - add support for account list and folder list
+ */
+public class EmailProvider extends ContentProvider {
+ private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+
+ public static final String AUTHORITY = "org.k9mail.provider.email";
+
+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY);
+
+
+ /*
+ * Constants that are used for the URI matching.
+ */
+ private static final int MESSAGE_BASE = 0;
+ private static final int MESSAGES = MESSAGE_BASE;
+ private static final int MESSAGES_THREADED = MESSAGE_BASE + 1;
+ //private static final int MESSAGES_THREAD = MESSAGE_BASE + 2;
+
+
+ private static final String MESSAGES_TABLE = "messages";
+
+ private static final String[] MESSAGES_COLUMNS = {
+ MessageColumns.ID,
+ MessageColumns.UID,
+ MessageColumns.INTERNAL_DATE,
+ MessageColumns.SUBJECT,
+ MessageColumns.DATE,
+ MessageColumns.MESSAGE_ID,
+ MessageColumns.SENDER_LIST,
+ MessageColumns.TO_LIST,
+ MessageColumns.CC_LIST,
+ MessageColumns.BCC_LIST,
+ MessageColumns.REPLY_TO_LIST,
+ MessageColumns.FLAGS,
+ MessageColumns.ATTACHMENT_COUNT,
+ MessageColumns.FOLDER_ID,
+ MessageColumns.PREVIEW,
+ MessageColumns.THREAD_ROOT,
+ MessageColumns.THREAD_PARENT,
+ InternalMessageColumns.DELETED,
+ InternalMessageColumns.EMPTY,
+ InternalMessageColumns.TEXT_CONTENT,
+ InternalMessageColumns.HTML_CONTENT,
+ InternalMessageColumns.MIME_TYPE
+ };
+
+ static {
+ UriMatcher matcher = sUriMatcher;
+
+ matcher.addURI(AUTHORITY, "account/*/messages", MESSAGES);
+ matcher.addURI(AUTHORITY, "account/*/messages/threaded", MESSAGES_THREADED);
+ //matcher.addURI(AUTHORITY, "account/*/thread/#", MESSAGES_THREAD);
+ }
+
+ public interface SpecialColumns {
+ public static final String ACCOUNT_UUID = "account_uuid";
+
+ public static final String FOLDER_NAME = "name";
+ public static final String INTEGRATE = "integrate";
+ }
+
+ public interface MessageColumns {
+ public static final String ID = "id";
+ public static final String UID = "uid";
+ public static final String INTERNAL_DATE = "internal_date";
+ public static final String SUBJECT = "subject";
+ public static final String DATE = "date";
+ public static final String MESSAGE_ID = "message_id";
+ public static final String SENDER_LIST = "sender_list";
+ public static final String TO_LIST = "to_list";
+ public static final String CC_LIST = "cc_list";
+ public static final String BCC_LIST = "bcc_list";
+ public static final String REPLY_TO_LIST = "reply_to_list";
+ public static final String FLAGS = "flags";
+ public static final String ATTACHMENT_COUNT = "attachment_count";
+ public static final String FOLDER_ID = "folder_id";
+ public static final String PREVIEW = "preview";
+ public static final String THREAD_ROOT = "thread_root";
+ public static final String THREAD_PARENT = "thread_parent";
+ public static final String THREAD_COUNT = "thread_count";
+ }
+
+ private interface InternalMessageColumns extends MessageColumns {
+ public static final String DELETED = "deleted";
+ public static final String EMPTY = "empty";
+ public static final String TEXT_CONTENT = "text_content";
+ public static final String HTML_CONTENT = "html_content";
+ public static final String MIME_TYPE = "mime_type";
+ }
+
+
+ private Preferences mPreferences;
+
+
+ @Override
+ public boolean onCreate() {
+ return true;
+ }
+
+ @Override
+ public String getType(Uri uri) {
+ throw new RuntimeException("not implemented yet");
+ }
+
+ @Override
+ public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+ String sortOrder) {
+
+ int match = sUriMatcher.match(uri);
+ if (match < 0) {
+ throw new IllegalArgumentException("Unknown URI: " + uri);
+ }
+
+ ContentResolver contentResolver = getContext().getContentResolver();
+ Cursor cursor = null;
+ switch (match) {
+ case MESSAGES:
+ case MESSAGES_THREADED: {
+ List segments = uri.getPathSegments();
+ String accountUuid = segments.get(1);
+
+ List dbColumnNames = new ArrayList(projection.length);
+ Map specialColumns = new HashMap();
+ for (String columnName : projection) {
+ if (SpecialColumns.ACCOUNT_UUID.equals(columnName)) {
+ specialColumns.put(SpecialColumns.ACCOUNT_UUID, accountUuid);
+ } else {
+ dbColumnNames.add(columnName);
+ }
+ }
+
+ String[] dbProjection = dbColumnNames.toArray(new String[0]);
+
+ if (match == MESSAGES) {
+ cursor = getMessages(accountUuid, dbProjection, selection, selectionArgs,
+ sortOrder);
+ } else if (match == MESSAGES_THREADED) {
+ cursor = getThreadedMessages(accountUuid, dbProjection, selection,
+ selectionArgs, sortOrder);
+ } else {
+ throw new RuntimeException("Not implemented");
+ }
+
+ cursor.setNotificationUri(contentResolver, uri);
+
+ cursor = new SpecialColumnsCursor(new IdTrickeryCursor(cursor), projection,
+ specialColumns);
+
+ break;
+ }
+ }
+
+ return cursor;
+ }
+
+ @Override
+ public int delete(Uri uri, String selection, String[] selectionArgs) {
+ throw new RuntimeException("not implemented yet");
+ }
+
+ @Override
+ public Uri insert(Uri uri, ContentValues values) {
+ throw new RuntimeException("not implemented yet");
+ }
+
+ @Override
+ public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ throw new RuntimeException("not implemented yet");
+ }
+
+ protected Cursor getMessages(String accountUuid, final String[] projection,
+ final String selection, final String[] selectionArgs, final String sortOrder) {
+
+ Account account = getAccount(accountUuid);
+ LockableDatabase database = getDatabase(account);
+
+ try {
+ return database.execute(false, new DbCallback() {
+ @Override
+ public Cursor doDbWork(SQLiteDatabase db) throws WrappedException,
+ UnavailableStorageException {
+
+ String where;
+ if (StringUtils.isNullOrEmpty(selection)) {
+ where = InternalMessageColumns.DELETED + "=0 AND (" +
+ InternalMessageColumns.EMPTY + " IS NULL OR " +
+ InternalMessageColumns.EMPTY + "!=1)";
+ } else {
+ where = "(" + selection + ") AND " +
+ InternalMessageColumns.DELETED + "=0 AND (" +
+ InternalMessageColumns.EMPTY + " IS NULL OR " +
+ InternalMessageColumns.EMPTY + "!=1)";
+ }
+
+ final Cursor cursor;
+ //TODO: check projection and selection for folder columns
+ if (Utility.arrayContains(projection, SpecialColumns.FOLDER_NAME)) {
+ StringBuilder query = new StringBuilder();
+ query.append("SELECT ");
+ boolean first = true;
+ for (String columnName : projection) {
+ if (!first) {
+ query.append(",");
+ } else {
+ first = false;
+ }
+
+ if (MessageColumns.ID.equals(columnName)) {
+ query.append("m.");
+ query.append(MessageColumns.ID);
+ query.append(" AS ");
+ query.append(MessageColumns.ID);
+ } else {
+ query.append(columnName);
+ }
+ }
+
+ query.append(" FROM messages m " +
+ "LEFT JOIN folders f ON (m.folder_id = f.id) " +
+ "WHERE ");
+ query.append(SqlQueryBuilder.addPrefixToSelection(MESSAGES_COLUMNS,
+ "m.", where));
+ query.append(" ORDER BY ");
+ query.append(SqlQueryBuilder.addPrefixToSelection(MESSAGES_COLUMNS,
+ "m.", sortOrder));
+
+ cursor = db.rawQuery(query.toString(), selectionArgs);
+ } else {
+ cursor = db.query(MESSAGES_TABLE, projection, where, selectionArgs, null,
+ null, sortOrder);
+ }
+
+ return cursor;
+ }
+ });
+ } catch (UnavailableStorageException e) {
+ throw new RuntimeException("Storage not available", e);
+ }
+ }
+
+ protected Cursor getThreadedMessages(String accountUuid, final String[] projection,
+ final String selection, final String[] selectionArgs, final String sortOrder) {
+
+ Account account = getAccount(accountUuid);
+ LockableDatabase database = getDatabase(account);
+
+ try {
+ return database.execute(false, new DbCallback() {
+ @Override
+ public Cursor doDbWork(SQLiteDatabase db) throws WrappedException,
+ UnavailableStorageException {
+
+ StringBuilder query = new StringBuilder();
+ query.append("SELECT ");
+ boolean first = true;
+ for (String columnName : projection) {
+ if (!first) {
+ query.append(",");
+ } else {
+ first = false;
+ }
+
+ if (MessageColumns.DATE.equals(columnName)) {
+ query.append("MAX(m.date) AS " + MessageColumns.DATE);
+ } else if (MessageColumns.THREAD_COUNT.equals(columnName)) {
+ query.append("COUNT(h.id) AS " + MessageColumns.THREAD_COUNT);
+ } else if (SpecialColumns.FOLDER_NAME.equals(columnName)) {
+ query.append("f." + SpecialColumns.FOLDER_NAME + " AS " +
+ SpecialColumns.FOLDER_NAME);
+ } else if (SpecialColumns.INTEGRATE.equals(columnName)) {
+ query.append("f." + SpecialColumns.INTEGRATE + " AS " +
+ SpecialColumns.INTEGRATE);
+ } else {
+ query.append("m.");
+ query.append(columnName);
+ query.append(" AS ");
+ query.append(columnName);
+ }
+ }
+
+ query.append(
+ " FROM messages h JOIN messages m " +
+ "ON (h.id = m.thread_root OR h.id = m.id) ");
+
+ //TODO: check projection and selection for folder columns
+ if (Utility.arrayContains(projection, SpecialColumns.FOLDER_NAME)) {
+ query.append("LEFT JOIN folders f ON (m.folder_id = f.id) ");
+ }
+
+ query.append(
+ "WHERE " +
+ "(h.deleted = 0 AND m.deleted = 0 AND " +
+ "(m.empty IS NULL OR m.empty != 1) AND " +
+ "h.thread_root IS NULL) ");
+
+ if (!StringUtils.isNullOrEmpty(selection)) {
+ query.append("AND (");
+ query.append(SqlQueryBuilder.addPrefixToSelection(MESSAGES_COLUMNS,
+ "h.", selection));
+ query.append(") ");
+ }
+
+ query.append("GROUP BY h.id");
+
+ if (!StringUtils.isNullOrEmpty(sortOrder)) {
+ query.append(" ORDER BY ");
+ query.append(SqlQueryBuilder.addPrefixToSelection(MESSAGES_COLUMNS,
+ "m.", sortOrder));
+ }
+
+ return db.rawQuery(query.toString(), selectionArgs);
+ }
+ });
+ } catch (UnavailableStorageException e) {
+ throw new RuntimeException("Storage not available", e);
+ }
+ }
+
+ private Account getAccount(String accountUuid) {
+ if (mPreferences == null) {
+ Context appContext = getContext().getApplicationContext();
+ mPreferences = Preferences.getPreferences(appContext);
+ }
+
+ Account account = mPreferences.getAccount(accountUuid);
+
+ if (account == null) {
+ throw new IllegalArgumentException("Unknown account: " + accountUuid);
+ }
+
+ return account;
+ }
+
+ private LockableDatabase getDatabase(Account account) {
+ LocalStore localStore;
+ try {
+ localStore = account.getLocalStore();
+ } catch (MessagingException e) {
+ throw new RuntimeException("Couldn't get LocalStore", e);
+ }
+
+ return localStore.getDatabase();
+ }
+
+ /**
+ * This class is needed to make {@link CursorAdapter} work with our database schema.
+ *
+ *
+ * {@code CursorAdapter} requires a column named {@code "_id"} containing a stable id. We use
+ * the column name {@code "id"} as primary key in all our tables. So this {@link CursorWrapper}
+ * maps all queries for {@code "_id"} to {@code "id"}.
+ *
+ * Please note that this only works for the returned {@code Cursor}. When querying the content
+ * provider you still need to use {@link MessageColumns#ID}.
+ *
+ */
+ static class IdTrickeryCursor extends CursorWrapper {
+ public IdTrickeryCursor(Cursor cursor) {
+ super(cursor);
+ }
+
+ @Override
+ public int getColumnIndex(String columnName) {
+ if ("_id".equals(columnName)) {
+ return super.getColumnIndex("id");
+ }
+
+ return super.getColumnIndex(columnName);
+ }
+
+ @Override
+ public int getColumnIndexOrThrow(String columnName) {
+ if ("_id".equals(columnName)) {
+ return super.getColumnIndexOrThrow("id");
+ }
+
+ return super.getColumnIndexOrThrow(columnName);
+ }
+ }
+
+ static class SpecialColumnsCursor extends CursorWrapper {
+ private int[] mColumnMapping;
+ private String[] mSpecialColumnValues;
+ private String[] mColumnNames;
+
+ public SpecialColumnsCursor(Cursor cursor, String[] allColumnNames,
+ Map specialColumns) {
+ super(cursor);
+
+ mColumnNames = allColumnNames;
+ mColumnMapping = new int[allColumnNames.length];
+ mSpecialColumnValues = new String[specialColumns.size()];
+ for (int i = 0, columnIndex = 0, specialColumnCount = 0, len = allColumnNames.length;
+ i < len; i++) {
+
+ String columnName = allColumnNames[i];
+
+ if (specialColumns.containsKey(columnName)) {
+ // This is a special column name, so save the value in mSpecialColumnValues
+ mSpecialColumnValues[specialColumnCount] = specialColumns.get(columnName);
+
+ // Write the index into mSpecialColumnValues negated into mColumnMapping
+ mColumnMapping[i] = -(specialColumnCount + 1);
+ specialColumnCount++;
+ } else {
+ mColumnMapping[i] = columnIndex++;
+ }
+ }
+ }
+
+ @Override
+ public byte[] getBlob(int columnIndex) {
+ int realColumnIndex = mColumnMapping[columnIndex];
+ if (realColumnIndex < 0) {
+ throw new RuntimeException("Special column can only be retrieved as string.");
+ }
+
+ return super.getBlob(realColumnIndex);
+ }
+
+ @Override
+ public int getColumnCount() {
+ return mColumnMapping.length;
+ }
+
+ @Override
+ public int getColumnIndex(String columnName) {
+ for (int i = 0, len = mColumnNames.length; i < len; i++) {
+ if (mColumnNames[i].equals(columnName)) {
+ return i;
+ }
+ }
+
+ return super.getColumnIndex(columnName);
+ }
+
+ @Override
+ public int getColumnIndexOrThrow(String columnName) throws IllegalArgumentException {
+ int index = getColumnIndex(columnName);
+
+ if (index == -1) {
+ throw new IllegalArgumentException("Unknown column name");
+ }
+
+ return index;
+ }
+
+ @Override
+ public String getColumnName(int columnIndex) {
+ return mColumnNames[columnIndex];
+ }
+
+ @Override
+ public String[] getColumnNames() {
+ return mColumnNames.clone();
+ }
+
+ @Override
+ public double getDouble(int columnIndex) {
+ int realColumnIndex = mColumnMapping[columnIndex];
+ if (realColumnIndex < 0) {
+ throw new RuntimeException("Special column can only be retrieved as string.");
+ }
+
+ return super.getDouble(realColumnIndex);
+ }
+
+ @Override
+ public float getFloat(int columnIndex) {
+ int realColumnIndex = mColumnMapping[columnIndex];
+ if (realColumnIndex < 0) {
+ throw new RuntimeException("Special column can only be retrieved as string.");
+ }
+
+ return super.getFloat(realColumnIndex);
+ }
+
+ @Override
+ public int getInt(int columnIndex) {
+ int realColumnIndex = mColumnMapping[columnIndex];
+ if (realColumnIndex < 0) {
+ throw new RuntimeException("Special column can only be retrieved as string.");
+ }
+
+ return super.getInt(realColumnIndex);
+ }
+
+ @Override
+ public long getLong(int columnIndex) {
+ int realColumnIndex = mColumnMapping[columnIndex];
+ if (realColumnIndex < 0) {
+ throw new RuntimeException("Special column can only be retrieved as string.");
+ }
+
+ return super.getLong(realColumnIndex);
+ }
+
+ @Override
+ public short getShort(int columnIndex) {
+ int realColumnIndex = mColumnMapping[columnIndex];
+ if (realColumnIndex < 0) {
+ throw new RuntimeException("Special column can only be retrieved as string.");
+ }
+
+ return super.getShort(realColumnIndex);
+ }
+
+ @Override
+ public String getString(int columnIndex) {
+ int realColumnIndex = mColumnMapping[columnIndex];
+ if (realColumnIndex < 0) {
+ return mSpecialColumnValues[-realColumnIndex - 1];
+ }
+
+ return super.getString(realColumnIndex);
+ }
+
+ @TargetApi(11)
+ @Override
+ public int getType(int columnIndex) {
+ int realColumnIndex = mColumnMapping[columnIndex];
+ if (realColumnIndex < 0) {
+ return FIELD_TYPE_STRING;
+ }
+
+ return super.getType(realColumnIndex);
+ }
+
+ @Override
+ public boolean isNull(int columnIndex) {
+ int realColumnIndex = mColumnMapping[columnIndex];
+ if (realColumnIndex < 0) {
+ return (mSpecialColumnValues[-realColumnIndex - 1] == null);
+ }
+
+ return super.isNull(realColumnIndex);
+ }
+ }
+}
diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index 1e351d057..7035baa65 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -21,23 +21,22 @@ import com.fsck.k9.Account;
import com.fsck.k9.AccountStats;
import com.fsck.k9.K9;
import com.fsck.k9.Preferences;
-import com.fsck.k9.SearchAccount;
import com.fsck.k9.activity.FolderInfoHolder;
import com.fsck.k9.activity.MessageInfoHolder;
-import com.fsck.k9.activity.MessageList;
import com.fsck.k9.controller.MessagingController;
import com.fsck.k9.controller.MessagingListener;
-import com.fsck.k9.fragment.MessageListFragment;
import com.fsck.k9.helper.MessageHelper;
import com.fsck.k9.mail.Flag;
import com.fsck.k9.mail.Folder;
import com.fsck.k9.mail.Message;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.store.LocalStore;
+import com.fsck.k9.search.SearchAccount;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.concurrent.BlockingQueue;
@@ -302,14 +301,13 @@ public class MessageProvider extends ContentProvider {
final SearchAccount integratedInboxAccount = SearchAccount.createUnifiedInboxAccount(getContext());
final MessagingController msgController = MessagingController.getInstance(K9.app);
- msgController.searchLocalMessages(integratedInboxAccount, null,
+ msgController.searchLocalMessages(integratedInboxAccount.getRelatedSearch(),
new MesssageInfoHolderRetrieverListener(queue));
final List holders = queue.take();
// TODO add sort order parameter
- Collections.sort(holders, new MessageListFragment.ReverseComparator(
- new MessageListFragment.DateComparator()));
+ Collections.sort(holders, new ReverseDateComparator());
final String[] projectionToUse;
if (projection == null) {
@@ -1025,7 +1023,8 @@ public class MessageProvider extends ContentProvider {
// launch command to delete the message
if ((myAccount != null) && (msg != null)) {
- MessagingController.getInstance(K9.app).deleteMessages(new Message[] { msg }, null);
+ MessagingController controller = MessagingController.getInstance(K9.app);
+ controller.deleteMessages(Collections.singletonList(msg), null);
}
// FIXME return the actual number of deleted messages
@@ -1123,4 +1122,16 @@ public class MessageProvider extends ContentProvider {
mUriMatcher.addURI(AUTHORITY, handler.getPath(), code);
}
+ public static class ReverseDateComparator implements Comparator {
+ @Override
+ public int compare(MessageInfoHolder object2, MessageInfoHolder object1) {
+ if (object1.compareDate == null) {
+ return (object2.compareDate == null ? 0 : 1);
+ } else if (object2.compareDate == null) {
+ return -1;
+ } else {
+ return object1.compareDate.compareTo(object2.compareDate);
+ }
+ }
+ }
}
diff --git a/src/com/fsck/k9/provider/UnreadWidgetProvider.java b/src/com/fsck/k9/provider/UnreadWidgetProvider.java
index 2af479d15..75acd1073 100644
--- a/src/com/fsck/k9/provider/UnreadWidgetProvider.java
+++ b/src/com/fsck/k9/provider/UnreadWidgetProvider.java
@@ -8,6 +8,7 @@ import com.fsck.k9.R;
import com.fsck.k9.activity.UnreadWidgetConfiguration;
import com.fsck.k9.activity.FolderList;
import com.fsck.k9.activity.MessageList;
+import com.fsck.k9.search.LocalSearch;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
@@ -62,8 +63,11 @@ public class UnreadWidgetProvider extends AppWidgetProvider {
clickIntent = FolderList.actionHandleAccountIntent(context, account, null,
false);
} else {
- clickIntent = MessageList.actionHandleFolderIntent(context, account,
- account.getAutoExpandFolderName());
+ LocalSearch search = new LocalSearch(account.getAutoExpandFolderName());
+ search.addAllowedFolder(account.getAutoExpandFolderName());
+ search.addAccountUuid(account.getUuid());
+ clickIntent = MessageList.intentDisplaySearch(context, search, false, true,
+ true);
}
clickIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
}
diff --git a/src/com/fsck/k9/search/ConditionsTreeNode.java b/src/com/fsck/k9/search/ConditionsTreeNode.java
new file mode 100644
index 000000000..1a1be85d7
--- /dev/null
+++ b/src/com/fsck/k9/search/ConditionsTreeNode.java
@@ -0,0 +1,431 @@
+package com.fsck.k9.search;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Stack;
+
+import android.database.Cursor;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.fsck.k9.search.SearchSpecification.Attribute;
+import com.fsck.k9.search.SearchSpecification.Searchfield;
+import com.fsck.k9.search.SearchSpecification.SearchCondition;
+
+/**
+ * This class stores search conditions. It's basically a boolean expression binary tree.
+ * The output will be SQL queries ( obtained by traversing inorder ).
+ *
+ * TODO removing conditions from the tree
+ * TODO implement NOT as a node again
+ */
+public class ConditionsTreeNode implements Parcelable {
+
+ public enum Operator {
+ AND, OR, CONDITION;
+ }
+
+ public ConditionsTreeNode mLeft;
+ public ConditionsTreeNode mRight;
+ public ConditionsTreeNode mParent;
+
+ /*
+ * If mValue isn't CONDITION then mCondition contains a real
+ * condition, otherwise it's null.
+ */
+ public Operator mValue;
+ public SearchCondition mCondition;
+
+ /*
+ * Used for storing and retrieving the tree to/from the database.
+ * The algorithm is called "modified preorder tree traversal".
+ */
+ public int mLeftMPTTMarker;
+ public int mRightMPTTMarker;
+
+
+ ///////////////////////////////////////////////////////////////
+ // Static Helpers to restore a tree from a database cursor
+ ///////////////////////////////////////////////////////////////
+ /**
+ * Builds a condition tree starting from a database cursor. The cursor
+ * should point to rows representing the nodes of the tree.
+ *
+ * @param cursor Cursor pointing to the first of a bunch or rows. Each rows
+ * should contains 1 tree node.
+ * @return A condition tree.
+ */
+ public static ConditionsTreeNode buildTreeFromDB(Cursor cursor) {
+ Stack stack = new Stack();
+ ConditionsTreeNode tmp = null;
+
+ // root node
+ if (cursor.moveToFirst()) {
+ tmp = buildNodeFromRow(cursor);
+ stack.push(tmp);
+ }
+
+ // other nodes
+ while (cursor.moveToNext()) {
+ tmp = buildNodeFromRow(cursor);
+ if (tmp.mRightMPTTMarker < stack.peek().mRightMPTTMarker) {
+ stack.peek().mLeft = tmp;
+ stack.push(tmp);
+ } else {
+ while (stack.peek().mRightMPTTMarker < tmp.mRightMPTTMarker) {
+ stack.pop();
+ }
+ stack.peek().mRight = tmp;
+ }
+ }
+ return tmp;
+ }
+
+ /**
+ * Converts a single database row to a single condition node.
+ *
+ * @param cursor Cursor pointing to the row we want to convert.
+ * @return A single ConditionsTreeNode
+ */
+ private static ConditionsTreeNode buildNodeFromRow(Cursor cursor) {
+ ConditionsTreeNode result = null;
+ SearchCondition condition = null;
+
+ Operator tmpValue = ConditionsTreeNode.Operator.valueOf(cursor.getString(5));
+
+ if (tmpValue == Operator.CONDITION) {
+ condition = new SearchCondition(Searchfield.valueOf(cursor.getString(0)),
+ Attribute.valueOf(cursor.getString(2)), cursor.getString(1));
+ }
+
+ result = new ConditionsTreeNode(condition);
+ result.mValue = tmpValue;
+ result.mLeftMPTTMarker = cursor.getInt(3);
+ result.mRightMPTTMarker = cursor.getInt(4);
+
+ return result;
+ }
+
+
+ ///////////////////////////////////////////////////////////////
+ // Constructors
+ ///////////////////////////////////////////////////////////////
+ public ConditionsTreeNode(SearchCondition condition) {
+ mParent = null;
+ mCondition = condition;
+ mValue = Operator.CONDITION;
+ }
+
+ public ConditionsTreeNode(ConditionsTreeNode parent, Operator op) {
+ mParent = parent;
+ mValue = op;
+ mCondition = null;
+ }
+
+
+ /* package */ ConditionsTreeNode cloneTree() {
+ if (mParent != null) {
+ throw new IllegalStateException("Can't call cloneTree() for a non-root node");
+ }
+
+ ConditionsTreeNode copy = new ConditionsTreeNode(mCondition.clone());
+
+ copy.mLeftMPTTMarker = mLeftMPTTMarker;
+ copy.mRightMPTTMarker = mRightMPTTMarker;
+
+ copy.mLeft = (mLeft == null) ? null : mLeft.cloneNode(copy);
+ copy.mRight = (mRight == null) ? null : mRight.cloneNode(copy);
+
+ return copy;
+ }
+
+ private ConditionsTreeNode cloneNode(ConditionsTreeNode parent) {
+ ConditionsTreeNode copy = new ConditionsTreeNode(parent, mValue);
+
+ copy.mCondition = mCondition.clone();
+ copy.mLeftMPTTMarker = mLeftMPTTMarker;
+ copy.mRightMPTTMarker = mRightMPTTMarker;
+
+ copy.mLeft = (mLeft == null) ? null : mLeft.cloneNode(copy);
+ copy.mRight = (mRight == null) ? null : mRight.cloneNode(copy);
+
+ return copy;
+ }
+
+ ///////////////////////////////////////////////////////////////
+ // Public modifiers
+ ///////////////////////////////////////////////////////////////
+ /**
+ * Adds the expression as the second argument of an AND
+ * clause to this node.
+ *
+ * @param expr Expression to 'AND' with.
+ * @return New top AND node.
+ * @throws Exception
+ */
+ public ConditionsTreeNode and(ConditionsTreeNode expr) throws Exception {
+ return add(expr, Operator.AND);
+ }
+
+ /**
+ * Convenience method.
+ * Adds the provided condition as the second argument of an AND
+ * clause to this node.
+ *
+ * @param condition Condition to 'AND' with.
+ * @return New top AND node, new root.
+ */
+ public ConditionsTreeNode and(SearchCondition condition) {
+ try {
+ ConditionsTreeNode tmp = new ConditionsTreeNode(condition);
+ return and(tmp);
+ } catch (Exception e) {
+ // impossible
+ return null;
+ }
+ }
+
+ /**
+ * Adds the expression as the second argument of an OR
+ * clause to this node.
+ *
+ * @param expr Expression to 'OR' with.
+ * @return New top OR node.
+ * @throws Exception
+ */
+ public ConditionsTreeNode or(ConditionsTreeNode expr) throws Exception {
+ return add(expr, Operator.OR);
+ }
+
+ /**
+ * Convenience method.
+ * Adds the provided condition as the second argument of an OR
+ * clause to this node.
+ *
+ * @param condition Condition to 'OR' with.
+ * @return New top OR node, new root.
+ */
+ public ConditionsTreeNode or(SearchCondition condition) {
+ try {
+ ConditionsTreeNode tmp = new ConditionsTreeNode(condition);
+ return or(tmp);
+ } catch (Exception e) {
+ // impossible
+ return null;
+ }
+ }
+
+ /**
+ * This applies the MPTT labeling to the subtree of which this node
+ * is the root node.
+ *
+ * For a description on MPTT see:
+ * http://www.sitepoint.com/hierarchical-data-database-2/
+ */
+ public void applyMPTTLabel() {
+ applyMPTTLabel(1);
+ }
+
+
+ ///////////////////////////////////////////////////////////////
+ // Public accessors
+ ///////////////////////////////////////////////////////////////
+ /**
+ * Returns the condition stored in this node.
+ * @return Condition stored in the node.
+ */
+ public SearchCondition getCondition() {
+ return mCondition;
+ }
+
+ /**
+ * Get a set of all the leaves in the tree.
+ * @return Set of all the leaves.
+ */
+ public HashSet getLeafSet() {
+ HashSet leafSet = new HashSet();
+ return getLeafSet(leafSet);
+ }
+
+ /**
+ * Returns a list of all the nodes in the subtree of which this node
+ * is the root. The list contains the nodes in a pre traversal order.
+ *
+ * @return List of all nodes in subtree in preorder.
+ */
+ public List preorder() {
+ ArrayList result = new ArrayList();
+ Stack stack = new Stack();
+ stack.push(this);
+
+ while (!stack.isEmpty()) {
+ ConditionsTreeNode current = stack.pop();
+
+ if (current.mLeft != null) {
+ stack.push(current.mLeft);
+ }
+
+ if (current.mRight != null) {
+ stack.push(current.mRight);
+ }
+
+ result.add(current);
+ }
+
+ return result;
+ }
+
+
+ ///////////////////////////////////////////////////////////////
+ // Private class logic
+ ///////////////////////////////////////////////////////////////
+ /**
+ * Adds two new ConditionTreeNodes, one for the operator and one for the
+ * new condition. The current node will end up on the same level as the
+ * one provided in the arguments, they will be siblings. Their common
+ * parent node will be one containing the operator provided in the arguments.
+ * The method will update all the required references so the tree ends up in
+ * a valid state.
+ *
+ * This method only supports node arguments with a null parent node.
+ *
+ * @param Node to add.
+ * @param Operator that will connect the new node with this one.
+ * @return New parent node, containing the operator.
+ * @throws Exception Throws when the provided new node does not have a null parent.
+ */
+ private ConditionsTreeNode add(ConditionsTreeNode node, Operator op) throws Exception {
+ if (node.mParent != null) {
+ throw new Exception("Can only add new expressions from root node down.");
+ }
+
+ ConditionsTreeNode tmpNode = new ConditionsTreeNode(mParent, op);
+ tmpNode.mLeft = this;
+ tmpNode.mRight = node;
+
+ if (mParent != null) {
+ mParent.updateChild(this, tmpNode);
+ }
+
+ this.mParent = tmpNode;
+ node.mParent = tmpNode;
+
+ return tmpNode;
+ }
+
+ /**
+ * Helper method that replaces a child of the current node with a new node.
+ * If the provided old child node was the left one, left will be replaced with
+ * the new one. Same goes for the right one.
+ *
+ * @param oldChild Old child node to be replaced.
+ * @param newChild New child node.
+ */
+ private void updateChild(ConditionsTreeNode oldChild, ConditionsTreeNode newChild) {
+ // we can compare objects id's because this is the desired behaviour in this case
+ if (mLeft == oldChild) {
+ mLeft = newChild;
+ } else if (mRight == oldChild) {
+ mRight = newChild;
+ }
+ }
+
+ /**
+ * Recursive function to gather all the leaves in the subtree of which
+ * this node is the root.
+ *
+ * @param leafSet Leafset that's being built.
+ * @return Set of leaves being completed.
+ */
+ private HashSet