moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Rewrote code accessing mAdapter.messages from outside MessageListAdapter

This commit is contained in:
cketti 2012-09-05 01:31:09 +02:00
parent fb6d004692
commit d97da517fa
1 changed files with 75 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -743,7 +743,7 @@ public class MessageList
final ActivityState previousData = getLastNonConfigurationInstance(); final ActivityState previousData = getLastNonConfigurationInstance();
if (previousData != null) { if (previousData != null) {
mAdapter.messages.addAll(previousData.messages); mAdapter.restoreMessages(previousData.messages);
mActiveMessages = previousData.activeMessages; mActiveMessages = previousData.activeMessages;
} }
} }
@ -821,7 +821,7 @@ public class MessageList
mController.notifyAccountCancel(this, accountWithNotification); mController.notifyAccountCancel(this, accountWithNotification);
} }
if (mAdapter.messages.isEmpty()) { if (mAdapter.isEmpty()) {
if (mFolderName != null) { if (mFolderName != null) {
mController.listLocalMessages(mAccount, mFolderName, mAdapter.mListener); mController.listLocalMessages(mAccount, mFolderName, mAdapter.mListener);
// Hide the archive button if we don't have an archive folder. // Hide the archive button if we don't have an archive folder.
@ -930,7 +930,7 @@ public class MessageList
@Override @Override
public ActivityState onRetainNonConfigurationInstance() { public ActivityState onRetainNonConfigurationInstance() {
final ActivityState state = new ActivityState(); final ActivityState state = new ActivityState();
state.messages = mAdapter.messages; state.messages = mAdapter.getMessages();
state.activeMessages = mActiveMessages; state.activeMessages = mActiveMessages;
return state; return state;
} }
@ -1121,12 +1121,11 @@ public class MessageList
// Need to get the list before the sort starts // Need to get the list before the sort starts
ArrayList<MessageReference> messageRefs = new ArrayList<MessageReference>(); ArrayList<MessageReference> messageRefs = new ArrayList<MessageReference>();
synchronized (mAdapter.messages) { for (MessageInfoHolder holder : mAdapter.getMessages()) {
for (MessageInfoHolder holder : mAdapter.messages) { MessageReference ref = holder.message.makeMessageReference();
MessageReference ref = holder.message.makeMessageReference(); messageRefs.add(ref);
messageRefs.add(ref);
}
} }
MessageReference ref = message.message.makeMessageReference(); MessageReference ref = message.message.makeMessageReference();
Log.i(K9.LOG_TAG, "MessageList sending message " + ref); Log.i(K9.LOG_TAG, "MessageList sending message " + ref);
@ -1331,10 +1330,8 @@ public class MessageList
try { try {
mController.markAllMessagesRead(mAccount, mCurrentFolder.name); mController.markAllMessagesRead(mAccount, mCurrentFolder.name);
synchronized (mAdapter.messages) { for (MessageInfoHolder holder : mAdapter.getMessages()) {
for (MessageInfoHolder holder : mAdapter.messages) { holder.read = true;
holder.read = true;
}
} }
mAdapter.sortMessages(); mAdapter.sortMessages();
} catch (Exception e) { } catch (Exception e) {
@ -1864,7 +1861,8 @@ public class MessageList
} }
class MessageListAdapter extends BaseAdapter { class MessageListAdapter extends BaseAdapter {
private final List<MessageInfoHolder> messages = java.util.Collections.synchronizedList(new ArrayList<MessageInfoHolder>()); private final List<MessageInfoHolder> mMessages =
Collections.synchronizedList(new ArrayList<MessageInfoHolder>());
private final ActivityListener mListener = new ActivityListener() { private final ActivityListener mListener = new ActivityListener() {
@ -2007,6 +2005,14 @@ public class MessageList
} }
} }
public List<MessageInfoHolder> getMessages() {
return mMessages;
}
public void restoreMessages(List<MessageInfoHolder> messages) {
mMessages.addAll(messages);
}
private Drawable mAttachmentIcon; private Drawable mAttachmentIcon;
private Drawable mForwardedIcon; private Drawable mForwardedIcon;
private Drawable mAnsweredIcon; private Drawable mAnsweredIcon;
@ -2020,13 +2026,14 @@ public class MessageList
} }
public void markAllMessagesAsDirty() { public void markAllMessagesAsDirty() {
for (MessageInfoHolder holder : mAdapter.messages) { for (MessageInfoHolder holder : mMessages) {
holder.dirty = true; holder.dirty = true;
} }
} }
public void pruneDirtyMessages() { public void pruneDirtyMessages() {
synchronized (mAdapter.messages) { synchronized (mMessages) {
Iterator<MessageInfoHolder> iter = mAdapter.messages.iterator(); Iterator<MessageInfoHolder> iter = mMessages.iterator();
while (iter.hasNext()) { while (iter.hasNext()) {
MessageInfoHolder holder = iter.next(); MessageInfoHolder holder = iter.next();
if (holder.dirty) { if (holder.dirty) {
@ -2058,7 +2065,7 @@ public class MessageList
if (message.selected && mSelectedCount > 0) { if (message.selected && mSelectedCount > 0) {
mSelectedCount--; mSelectedCount--;
} }
mAdapter.messages.remove(message); mMessages.remove(message);
} }
} }
resetUnreadCount(); resetUnreadCount();
@ -2077,20 +2084,20 @@ public class MessageList
return; return;
} }
final boolean wasEmpty = mAdapter.messages.isEmpty(); final boolean wasEmpty = mMessages.isEmpty();
for (final MessageInfoHolder message : messages) { for (final MessageInfoHolder message : messages) {
if (mFolderName == null || (message.folder != null && message.folder.name.equals(mFolderName))) { if (mFolderName == null || (message.folder != null && message.folder.name.equals(mFolderName))) {
int index; int index;
synchronized (mAdapter.messages) { synchronized (mMessages) {
index = Collections.binarySearch(mAdapter.messages, message, getComparator()); index = Collections.binarySearch(mMessages, message, getComparator());
} }
if (index < 0) { if (index < 0) {
index = (index * -1) - 1; index = (index * -1) - 1;
} }
mAdapter.messages.add(index, message); mMessages.add(index, message);
} }
} }
@ -2108,8 +2115,8 @@ public class MessageList
public void resetUnreadCount() { public void resetUnreadCount() {
if (mQueryString != null) { if (mQueryString != null) {
int unreadCount = 0; int unreadCount = 0;
synchronized (mAdapter.messages) { synchronized (mMessages) {
for (MessageInfoHolder holder : mAdapter.messages) { for (MessageInfoHolder holder : mMessages) {
unreadCount += holder.read ? 0 : 1; unreadCount += holder.read ? 0 : 1;
} }
} }
@ -2124,8 +2131,8 @@ public class MessageList
public void sortMessages() { public void sortMessages() {
final Comparator<MessageInfoHolder> chainComparator = getComparator(); final Comparator<MessageInfoHolder> chainComparator = getComparator();
synchronized (mAdapter.messages) { synchronized (mMessages) {
Collections.sort(mAdapter.messages, chainComparator); Collections.sort(mMessages, chainComparator);
} }
notifyDataSetChanged(); notifyDataSetChanged();
@ -2212,8 +2219,8 @@ public class MessageList
// XXX TODO - make this not use a for loop // XXX TODO - make this not use a for loop
public MessageInfoHolder getMessage(MessageReference messageReference) { public MessageInfoHolder getMessage(MessageReference messageReference) {
synchronized (mAdapter.messages) { synchronized (mMessages) {
for (MessageInfoHolder holder : mAdapter.messages) { for (MessageInfoHolder holder : mMessages) {
/* /*
* 2010-06-21 - cketti * 2010-06-21 - cketti
* Added null pointer check. Not sure what's causing 'holder' * Added null pointer check. Not sure what's causing 'holder'
@ -2257,7 +2264,7 @@ public class MessageList
@Override @Override
public int getCount() { public int getCount() {
return messages.size(); return mMessages.size();
} }
@Override @Override
@ -2280,13 +2287,13 @@ public class MessageList
@Override @Override
public Object getItem(int position) { public Object getItem(int position) {
try { try {
synchronized (mAdapter.messages) { synchronized (mMessages) {
if (position < mAdapter.messages.size()) { if (position < mMessages.size()) {
return mAdapter.messages.get(position); return mMessages.get(position);
} }
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(K9.LOG_TAG, "getItem(" + position + "), but folder.messages.size() = " + mAdapter.messages.size(), e); Log.e(K9.LOG_TAG, "getItem(" + position + "), but folder.messages.size() = " + mMessages.size(), e);
} }
return null; return null;
} }
@ -2506,11 +2513,7 @@ public class MessageList
} }
public boolean isItemSelectable(int position) { public boolean isItemSelectable(int position) {
if (position < mAdapter.messages.size()) { return (position < mMessages.size());
return true;
} else {
return false;
}
} }
} }
@ -2659,34 +2662,32 @@ public class MessageList
private boolean computeBatchDirection(boolean flagged) { private boolean computeBatchDirection(boolean flagged) {
boolean newState = false; boolean newState = false;
synchronized (mAdapter.messages) { for (MessageInfoHolder holder : mAdapter.getMessages()) {
for (MessageInfoHolder holder : mAdapter.messages) { if (holder.selected) {
if (holder.selected) { if (flagged) {
if (flagged) { if (!holder.flagged) {
if (!holder.flagged) { newState = true;
newState = true; break;
break; }
} } else {
} else { if (!holder.read) {
if (!holder.read) { newState = true;
newState = true; break;
break;
}
} }
} }
} }
} }
return newState; return newState;
} }
private boolean anySelected() { private boolean anySelected() {
synchronized (mAdapter.messages) { for (MessageInfoHolder holder : mAdapter.getMessages()) {
for (MessageInfoHolder holder : mAdapter.messages) { if (holder.selected) {
if (holder.selected) { return true;
return true;
}
} }
} }
return false; return false;
} }
@ -2719,18 +2720,16 @@ public class MessageList
return; return;
} }
synchronized (mAdapter.messages) { for (MessageInfoHolder holder : mAdapter.getMessages()) {
for (MessageInfoHolder holder : mAdapter.messages) { if (holder.selected) {
if (holder.selected) { if (v == mBatchDeleteButton) {
if (v == mBatchDeleteButton) { removeHolderList.add(holder);
removeHolderList.add(holder); } else if (v == mBatchFlagButton) {
} else if (v == mBatchFlagButton) { holder.flagged = newState;
holder.flagged = newState; } else if (v == mBatchReadButton) {
} else if (v == mBatchReadButton) { holder.read = newState;
holder.read = newState;
}
messageList.add(holder.message);
} }
messageList.add(holder.message);
} }
} }
@ -2768,12 +2767,12 @@ public class MessageList
private void setAllSelected(boolean isSelected) { private void setAllSelected(boolean isSelected) {
mSelectedCount = 0; mSelectedCount = 0;
synchronized (mAdapter.messages) {
for (MessageInfoHolder holder : mAdapter.messages) { for (MessageInfoHolder holder : mAdapter.getMessages()) {
holder.selected = isSelected; holder.selected = isSelected;
mSelectedCount += (isSelected ? 1 : 0); mSelectedCount += (isSelected ? 1 : 0);
}
} }
mAdapter.notifyDataSetChanged(); mAdapter.notifyDataSetChanged();
toggleBatchButtons(); toggleBatchButtons();
} }
@ -2973,13 +2972,13 @@ public class MessageList
*/ */
private List<MessageInfoHolder> getSelectionFromCheckboxes() { private List<MessageInfoHolder> getSelectionFromCheckboxes() {
final List<MessageInfoHolder> selection = new ArrayList<MessageInfoHolder>(); final List<MessageInfoHolder> selection = new ArrayList<MessageInfoHolder>();
synchronized (mAdapter.messages) {
for (final MessageInfoHolder holder : mAdapter.messages) { for (final MessageInfoHolder holder : mAdapter.getMessages()) {
if (holder.selected) { if (holder.selected) {
selection.add(holder); selection.add(holder);
}
} }
} }
return selection; return selection;
} }