pass MessageReference instead of LocalMessage to MessagingController operations
The most significant change here is that LocalMessage data is loaded in MessagingController, instead of every calling site individually.
This commit is contained in:
Vincent Breitmoser
parent
403323c94f
commit
0f3ce1bf1c
8 changed files with 340 additions and 360 deletions
|
|
@ -45,7 +45,6 @@ import com.fsck.k9.activity.setup.FolderSettings;
|
|||
import com.fsck.k9.activity.setup.Prefs;
|
||||
import com.fsck.k9.fragment.MessageListFragment;
|
||||
import com.fsck.k9.fragment.MessageListFragment.MessageListFragmentListener;
|
||||
import com.fsck.k9.mailstore.LocalMessage;
|
||||
import com.fsck.k9.mailstore.StorageManager;
|
||||
import com.fsck.k9.preferences.StorageEditor;
|
||||
import com.fsck.k9.search.LocalSearch;
|
||||
|
|
@ -1204,38 +1203,38 @@ public class MessageList extends K9Activity implements MessageListFragmentListen
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onResendMessage(LocalMessage message) {
|
||||
MessageActions.actionEditDraft(this, message.makeMessageReference());
|
||||
public void onResendMessage(MessageReference messageReference) {
|
||||
MessageActions.actionEditDraft(this, messageReference);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onForward(LocalMessage message) {
|
||||
onForward(message, null);
|
||||
public void onForward(MessageReference messageReference) {
|
||||
onForward(messageReference, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onForward(LocalMessage message, Parcelable decryptionResultForReply) {
|
||||
MessageActions.actionForward(this, message, decryptionResultForReply);
|
||||
public void onForward(MessageReference messageReference, Parcelable decryptionResultForReply) {
|
||||
MessageActions.actionForward(this, messageReference, decryptionResultForReply);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReply(LocalMessage message) {
|
||||
onReply(message, null);
|
||||
public void onReply(MessageReference messageReference) {
|
||||
onReply(messageReference, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReply(LocalMessage message, Parcelable decryptionResultForReply) {
|
||||
MessageActions.actionReply(this, message, false, decryptionResultForReply);
|
||||
public void onReply(MessageReference messageReference, Parcelable decryptionResultForReply) {
|
||||
MessageActions.actionReply(this, messageReference, false, decryptionResultForReply);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReplyAll(LocalMessage message) {
|
||||
onReplyAll(message, null);
|
||||
public void onReplyAll(MessageReference messageReference) {
|
||||
onReplyAll(messageReference, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReplyAll(LocalMessage message, Parcelable decryptionResultForReply) {
|
||||
MessageActions.actionReply(this, message, true, decryptionResultForReply);
|
||||
public void onReplyAll(MessageReference messageReference, Parcelable decryptionResultForReply) {
|
||||
MessageActions.actionReply(this, messageReference, true, decryptionResultForReply);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import com.fsck.k9.Account;
|
|||
import com.fsck.k9.Preferences;
|
||||
import com.fsck.k9.activity.MessageCompose;
|
||||
import com.fsck.k9.activity.MessageReference;
|
||||
import com.fsck.k9.mailstore.LocalMessage;
|
||||
|
||||
public class MessageActions {
|
||||
/**
|
||||
|
|
@ -31,10 +30,10 @@ public class MessageActions {
|
|||
* the function is reply all instead of simply reply.
|
||||
*/
|
||||
public static Intent getActionReplyIntent(
|
||||
Context context, LocalMessage message, boolean replyAll, Parcelable decryptionResult) {
|
||||
Context context, MessageReference messageReference, boolean replyAll, Parcelable decryptionResult) {
|
||||
Intent i = new Intent(context, MessageCompose.class);
|
||||
i.putExtra(MessageCompose.EXTRA_MESSAGE_DECRYPTION_RESULT, decryptionResult);
|
||||
i.putExtra(MessageCompose.EXTRA_MESSAGE_REFERENCE, message.makeMessageReference());
|
||||
i.putExtra(MessageCompose.EXTRA_MESSAGE_REFERENCE, messageReference);
|
||||
if (replyAll) {
|
||||
i.setAction(MessageCompose.ACTION_REPLY_ALL);
|
||||
} else {
|
||||
|
|
@ -57,16 +56,16 @@ public class MessageActions {
|
|||
* is reply all instead of simply reply.
|
||||
*/
|
||||
public static void actionReply(
|
||||
Context context, LocalMessage message, boolean replyAll, Parcelable decryptionResult) {
|
||||
context.startActivity(getActionReplyIntent(context, message, replyAll, decryptionResult));
|
||||
Context context, MessageReference messageReference, boolean replyAll, Parcelable decryptionResult) {
|
||||
context.startActivity(getActionReplyIntent(context, messageReference, replyAll, decryptionResult));
|
||||
}
|
||||
|
||||
/**
|
||||
* Compose a new message as a forward of the given message.
|
||||
*/
|
||||
public static void actionForward(Context context, LocalMessage message, Parcelable decryptionResult) {
|
||||
public static void actionForward(Context context, MessageReference messageReference, Parcelable decryptionResult) {
|
||||
Intent i = new Intent(context, MessageCompose.class);
|
||||
i.putExtra(MessageCompose.EXTRA_MESSAGE_REFERENCE, message.makeMessageReference());
|
||||
i.putExtra(MessageCompose.EXTRA_MESSAGE_REFERENCE, messageReference);
|
||||
i.putExtra(MessageCompose.EXTRA_MESSAGE_DECRYPTION_RESULT, decryptionResult);
|
||||
i.setAction(MessageCompose.ACTION_FORWARD);
|
||||
context.startActivity(i);
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import android.os.Build;
|
|||
import android.os.PowerManager;
|
||||
import android.os.Process;
|
||||
import android.os.SystemClock;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -3299,10 +3300,10 @@ public class MessagingController implements Runnable {
|
|||
|
||||
|
||||
|
||||
public boolean isMoveCapable(Message message) {
|
||||
return !message.getUid().startsWith(K9.LOCAL_UID_PREFIX);
|
||||
public boolean isMoveCapable(MessageReference messageReference) {
|
||||
return !messageReference.getUid().startsWith(K9.LOCAL_UID_PREFIX);
|
||||
}
|
||||
public boolean isCopyCapable(Message message) {
|
||||
public boolean isCopyCapable(MessageReference message) {
|
||||
return isMoveCapable(message);
|
||||
}
|
||||
|
||||
|
|
@ -3327,85 +3328,94 @@ public class MessagingController implements Runnable {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
public void moveMessages(final Account account, final String srcFolder,
|
||||
final List<LocalMessage> messages, final String destFolder,
|
||||
final MessagingListener listener) {
|
||||
|
||||
suppressMessages(account, messages);
|
||||
|
||||
putBackground("moveMessages", null, new Runnable() {
|
||||
public void moveMessages(final Account srcAccount, final String srcFolder,
|
||||
List<MessageReference> messageReferences, final String destFolder) {
|
||||
actOnMessageGroup(srcAccount, srcFolder, messageReferences, new MessageActor() {
|
||||
@Override
|
||||
public void run() {
|
||||
moveOrCopyMessageSynchronous(account, srcFolder, messages, destFolder, false,
|
||||
listener);
|
||||
public void act(final Account account, LocalFolder messageFolder, final List<LocalMessage> messages) {
|
||||
suppressMessages(account, messages);
|
||||
|
||||
putBackground("moveMessages", null, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
moveOrCopyMessageSynchronous(account, srcFolder, messages, destFolder, false);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void moveMessagesInThread(final Account account, final String srcFolder,
|
||||
final List<LocalMessage> messages, final String destFolder) {
|
||||
|
||||
suppressMessages(account, messages);
|
||||
|
||||
putBackground("moveMessagesInThread", null, new Runnable() {
|
||||
public void moveMessagesInThread(Account srcAccount, final String srcFolder,
|
||||
final List<MessageReference> messageReferences, final String destFolder) {
|
||||
actOnMessageGroup(srcAccount, srcFolder, messageReferences, new MessageActor() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
List<Message> messagesInThreads = collectMessagesInThreads(account, messages);
|
||||
moveOrCopyMessageSynchronous(account, srcFolder, messagesInThreads, destFolder,
|
||||
false, null);
|
||||
} catch (MessagingException e) {
|
||||
addErrorMessage(account, "Exception while moving messages", e);
|
||||
}
|
||||
public void act(final Account account, LocalFolder messageFolder, final List<LocalMessage> messages) {
|
||||
suppressMessages(account, messages);
|
||||
|
||||
putBackground("moveMessagesInThread", null, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
List<Message> messagesInThreads = collectMessagesInThreads(account, messages);
|
||||
moveOrCopyMessageSynchronous(account, srcFolder, messagesInThreads, destFolder, false);
|
||||
} catch (MessagingException e) {
|
||||
addErrorMessage(account, "Exception while moving messages", e);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void moveMessage(final Account account, final String srcFolder, final LocalMessage message,
|
||||
final String destFolder, final MessagingListener listener) {
|
||||
|
||||
moveMessages(account, srcFolder, Collections.singletonList(message), destFolder, listener);
|
||||
public void moveMessage(final Account account, final String srcFolder, final MessageReference message,
|
||||
final String destFolder) {
|
||||
moveMessages(account, srcFolder, Collections.singletonList(message), destFolder);
|
||||
}
|
||||
|
||||
public void copyMessages(final Account account, final String srcFolder,
|
||||
final List<? extends Message> messages, final String destFolder,
|
||||
final MessagingListener listener) {
|
||||
|
||||
putBackground("copyMessages", null, new Runnable() {
|
||||
public void copyMessages(final Account srcAccount, final String srcFolder,
|
||||
final List<MessageReference> messageReferences, final String destFolder) {
|
||||
actOnMessageGroup(srcAccount, srcFolder, messageReferences, new MessageActor() {
|
||||
@Override
|
||||
public void run() {
|
||||
moveOrCopyMessageSynchronous(account, srcFolder, messages, destFolder, true,
|
||||
listener);
|
||||
public void act(final Account account, LocalFolder messageFolder, final List<LocalMessage> messages) {
|
||||
putBackground("copyMessages", null, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
moveOrCopyMessageSynchronous(srcAccount, srcFolder, messages, destFolder, true);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void copyMessagesInThread(final Account account, final String srcFolder,
|
||||
final List<? extends Message> messages, final String destFolder) {
|
||||
|
||||
putBackground("copyMessagesInThread", null, new Runnable() {
|
||||
public void copyMessagesInThread(Account srcAccount, final String srcFolder,
|
||||
final List<MessageReference> messageReferences, final String destFolder) {
|
||||
actOnMessageGroup(srcAccount, srcFolder, messageReferences, new MessageActor() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
List<Message> messagesInThreads = collectMessagesInThreads(account, messages);
|
||||
moveOrCopyMessageSynchronous(account, srcFolder, messagesInThreads, destFolder,
|
||||
true, null);
|
||||
} catch (MessagingException e) {
|
||||
addErrorMessage(account, "Exception while copying messages", e);
|
||||
}
|
||||
public void act(final Account account, LocalFolder messageFolder, final List<LocalMessage> messages) {
|
||||
putBackground("copyMessagesInThread", null, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
List<Message> messagesInThreads = collectMessagesInThreads(account, messages);
|
||||
moveOrCopyMessageSynchronous(account, srcFolder, messagesInThreads, destFolder,
|
||||
true);
|
||||
} catch (MessagingException e) {
|
||||
addErrorMessage(account, "Exception while copying messages", e);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void copyMessage(final Account account, final String srcFolder, final Message message,
|
||||
final String destFolder, final MessagingListener listener) {
|
||||
public void copyMessage(final Account account, final String srcFolder, final MessageReference message,
|
||||
final String destFolder) {
|
||||
|
||||
copyMessages(account, srcFolder, Collections.singletonList(message), destFolder, listener);
|
||||
copyMessages(account, srcFolder, Collections.singletonList(message), destFolder);
|
||||
}
|
||||
|
||||
private void moveOrCopyMessageSynchronous(final Account account, final String srcFolder,
|
||||
final List<? extends Message> inMessages, final String destFolder, final boolean isCopy,
|
||||
MessagingListener listener) {
|
||||
final List<? extends Message> inMessages, final String destFolder, final boolean isCopy) {
|
||||
|
||||
try {
|
||||
Map<String, String> uidMap = new HashMap<String, String>();
|
||||
|
|
@ -3434,7 +3444,7 @@ public class MessagingController implements Runnable {
|
|||
}
|
||||
}
|
||||
|
||||
List<LocalMessage> messages = localSrcFolder.getMessages(uids.toArray(EMPTY_STRING_ARRAY), null);
|
||||
List<LocalMessage> messages = localSrcFolder.getMessagesByUids(uids);
|
||||
if (messages.size() > 0) {
|
||||
Map<String, Message> origUidMap = new HashMap<String, Message>();
|
||||
|
||||
|
|
@ -3515,10 +3525,9 @@ public class MessagingController implements Runnable {
|
|||
localFolder.open(Folder.OPEN_MODE_RW);
|
||||
String uid = localFolder.getMessageUidById(id);
|
||||
if (uid != null) {
|
||||
LocalMessage message = localFolder.getMessage(uid);
|
||||
if (message != null) {
|
||||
deleteMessages(Collections.singletonList(message), null);
|
||||
}
|
||||
MessageReference messageReference = new MessageReference(
|
||||
account.getUuid(), account.getDraftsFolderName(), uid, null);
|
||||
deleteMessage(messageReference, null);
|
||||
}
|
||||
} catch (MessagingException me) {
|
||||
addErrorMessage(account, null, me);
|
||||
|
|
@ -3527,28 +3536,23 @@ public class MessagingController implements Runnable {
|
|||
}
|
||||
}
|
||||
|
||||
public void deleteThreads(final List<LocalMessage> messages) {
|
||||
actOnMessages(messages, new MessageActor() {
|
||||
|
||||
public void deleteThreads(final List<MessageReference> messages) {
|
||||
actOnMessagesGroupedByAccountAndFolder(messages, new MessageActor() {
|
||||
@Override
|
||||
public void act(final Account account, final Folder folder,
|
||||
final List<Message> accountMessages) {
|
||||
|
||||
suppressMessages(account, messages);
|
||||
public void act(final Account account, final LocalFolder messageFolder, final List<LocalMessage> accountMessages) {
|
||||
suppressMessages(account, accountMessages);
|
||||
|
||||
putBackground("deleteThreads", null, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
deleteThreadsSynchronous(account, folder.getName(), accountMessages);
|
||||
deleteThreadsSynchronous(account, messageFolder.getName(), accountMessages);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void deleteThreadsSynchronous(Account account, String folderName,
|
||||
List<Message> messages) {
|
||||
|
||||
public void deleteThreadsSynchronous(Account account, String folderName, List<? extends Message> messages) {
|
||||
try {
|
||||
List<Message> messagesToDelete = collectMessagesInThreads(account, messages);
|
||||
|
||||
|
|
@ -3578,43 +3582,52 @@ public class MessagingController implements Runnable {
|
|||
return messagesInThreads;
|
||||
}
|
||||
|
||||
public void deleteMessages(final List<LocalMessage> messages, final MessagingListener listener) {
|
||||
actOnMessages(messages, new MessageActor() {
|
||||
public void deleteMessage(MessageReference message, final MessagingListener listener) {
|
||||
deleteMessages(Collections.singletonList(message), listener);
|
||||
}
|
||||
|
||||
public void deleteMessages(List<MessageReference> messages, final MessagingListener listener) {
|
||||
actOnMessagesGroupedByAccountAndFolder(messages, new MessageActor() {
|
||||
|
||||
@Override
|
||||
public void act(final Account account, final Folder folder,
|
||||
final List<Message> accountMessages) {
|
||||
suppressMessages(account, messages);
|
||||
public void act(final Account account, final LocalFolder messageFolder, final List<LocalMessage> accountMessages) {
|
||||
suppressMessages(account, accountMessages);
|
||||
|
||||
putBackground("deleteMessages", null, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
deleteMessagesSynchronous(account, folder.getName(),
|
||||
accountMessages, listener);
|
||||
deleteMessagesSynchronous(account, messageFolder.getName(), accountMessages, listener);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@SuppressLint("NewApi") // used for debugging only
|
||||
public void debugClearMessagesLocally(final List<LocalMessage> messages) {
|
||||
public void debugClearMessagesLocally(final List<MessageReference> messages) {
|
||||
if (!BuildConfig.DEBUG) {
|
||||
throw new AssertionError("method must only be used in debug build!");
|
||||
}
|
||||
|
||||
putBackground("debugClearLocalMessages", null, new Runnable() {
|
||||
actOnMessagesGroupedByAccountAndFolder(messages, new MessageActor() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
for (LocalMessage message : messages) {
|
||||
try {
|
||||
message.debugClearLocalData();
|
||||
} catch (MessagingException e) {
|
||||
throw new AssertionError("clearing local message content failed!", e);
|
||||
public void act(final Account account, final LocalFolder messageFolder,
|
||||
final List<LocalMessage> accountMessages) {
|
||||
|
||||
putBackground("debugClearLocalMessages", null, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
for (LocalMessage message : accountMessages) {
|
||||
try {
|
||||
message.debugClearLocalData();
|
||||
} catch (MessagingException e) {
|
||||
throw new AssertionError("clearing local message content failed!", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -4791,43 +4804,63 @@ public class MessagingController implements Runnable {
|
|||
|
||||
}
|
||||
|
||||
private void actOnMessages(List<LocalMessage> messages, MessageActor actor) {
|
||||
Map<Account, Map<Folder, List<Message>>> accountMap = new HashMap<Account, Map<Folder, List<Message>>>();
|
||||
private void actOnMessagesGroupedByAccountAndFolder(List<MessageReference> messages, MessageActor actor) {
|
||||
Map<String, Map<String, List<MessageReference>>> accountMap = groupMessagesByAccountAndFolder(messages);
|
||||
|
||||
for (LocalMessage message : messages) {
|
||||
if ( message == null) {
|
||||
for (Map.Entry<String, Map<String, List<MessageReference>>> entry : accountMap.entrySet()) {
|
||||
String accountUuid = entry.getKey();
|
||||
Account account = Preferences.getPreferences(context).getAccount(accountUuid);
|
||||
|
||||
Map<String, List<MessageReference>> folderMap = entry.getValue();
|
||||
for (Map.Entry<String, List<MessageReference>> folderEntry : folderMap.entrySet()) {
|
||||
String folderName = folderEntry.getKey();
|
||||
List<MessageReference> messageList = folderEntry.getValue();
|
||||
actOnMessageGroup(account, folderName, messageList, actor);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@NonNull
|
||||
private Map<String, Map<String, List<MessageReference>>> groupMessagesByAccountAndFolder(
|
||||
List<MessageReference> messages) {
|
||||
Map<String, Map<String, List<MessageReference>>> accountMap = new HashMap<>();
|
||||
|
||||
for (MessageReference message : messages) {
|
||||
if (message == null) {
|
||||
continue;
|
||||
}
|
||||
Folder folder = message.getFolder();
|
||||
Account account = message.getAccount();
|
||||
String accountUuid = message.getAccountUuid();
|
||||
String folderName = message.getFolderName();
|
||||
|
||||
Map<Folder, List<Message>> folderMap = accountMap.get(account);
|
||||
Map<String, List<MessageReference>> folderMap = accountMap.get(accountUuid);
|
||||
if (folderMap == null) {
|
||||
folderMap = new HashMap<Folder, List<Message>>();
|
||||
accountMap.put(account, folderMap);
|
||||
folderMap = new HashMap<>();
|
||||
accountMap.put(accountUuid, folderMap);
|
||||
}
|
||||
List<Message> messageList = folderMap.get(folder);
|
||||
List<MessageReference> messageList = folderMap.get(folderName);
|
||||
if (messageList == null) {
|
||||
messageList = new LinkedList<Message>();
|
||||
folderMap.put(folder, messageList);
|
||||
messageList = new LinkedList<>();
|
||||
folderMap.put(folderName, messageList);
|
||||
}
|
||||
|
||||
messageList.add(message);
|
||||
}
|
||||
for (Map.Entry<Account, Map<Folder, List<Message>>> entry : accountMap.entrySet()) {
|
||||
Account account = entry.getKey();
|
||||
return accountMap;
|
||||
}
|
||||
|
||||
//account.refresh(Preferences.getPreferences(K9.app));
|
||||
Map<Folder, List<Message>> folderMap = entry.getValue();
|
||||
for (Map.Entry<Folder, List<Message>> folderEntry : folderMap.entrySet()) {
|
||||
Folder folder = folderEntry.getKey();
|
||||
List<Message> messageList = folderEntry.getValue();
|
||||
actor.act(account, folder, messageList);
|
||||
}
|
||||
private void actOnMessageGroup(
|
||||
Account account, String folderName, List<MessageReference> messageReferences, MessageActor actor) {
|
||||
try {
|
||||
LocalFolder messageFolder = account.getLocalStore().getFolder(folderName);
|
||||
List<LocalMessage> localMessages = messageFolder.getMessagesByReference(messageReferences);
|
||||
actor.act(account, messageFolder, localMessages);
|
||||
} catch (MessagingException e) {
|
||||
Log.e(K9.LOG_TAG, "Error loading account?!", e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
interface MessageActor {
|
||||
public void act(final Account account, final Folder folder, final List<Message> messages);
|
||||
void act(Account account, LocalFolder messageFolder, List<LocalMessage> messages);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ import com.fsck.k9.mail.Message;
|
|||
import com.fsck.k9.mail.MessagingException;
|
||||
import com.fsck.k9.mailstore.DatabasePreviewType;
|
||||
import com.fsck.k9.mailstore.LocalFolder;
|
||||
import com.fsck.k9.mailstore.LocalMessage;
|
||||
import com.fsck.k9.mailstore.LocalStore;
|
||||
import com.fsck.k9.preferences.StorageEditor;
|
||||
import com.fsck.k9.provider.EmailProvider;
|
||||
|
|
@ -206,7 +205,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
// fill the mapping at class time loading
|
||||
|
||||
final Map<SortType, Comparator<Cursor>> map =
|
||||
new EnumMap<SortType, Comparator<Cursor>>(SortType.class);
|
||||
new EnumMap<>(SortType.class);
|
||||
map.put(SortType.SORT_ATTACHMENT, new AttachmentComparator());
|
||||
map.put(SortType.SORT_DATE, new DateComparator());
|
||||
map.put(SortType.SORT_ARRIVAL, new ArrivalComparator());
|
||||
|
|
@ -268,7 +267,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
private boolean mStars = true;
|
||||
|
||||
private int mSelectedCount = 0;
|
||||
private Set<Long> mSelected = new HashSet<Long>();
|
||||
private Set<Long> mSelected = new HashSet<>();
|
||||
|
||||
private FontSizes mFontSizes = K9.getFontSizes();
|
||||
|
||||
|
|
@ -280,7 +279,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
* Relevant messages for the current context when we have to remember the chosen messages
|
||||
* between user interactions (e.g. selecting a folder for move operation).
|
||||
*/
|
||||
private List<LocalMessage> mActiveMessages;
|
||||
private List<MessageReference> mActiveMessages;
|
||||
|
||||
/* package visibility for faster inner class access */
|
||||
MessageHelper mMessageHelper;
|
||||
|
|
@ -349,7 +348,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
private WeakReference<MessageListFragment> mFragment;
|
||||
|
||||
public MessageListHandler(MessageListFragment fragment) {
|
||||
mFragment = new WeakReference<MessageListFragment>(fragment);
|
||||
mFragment = new WeakReference<>(fragment);
|
||||
}
|
||||
public void folderLoading(String folder, boolean loading) {
|
||||
android.os.Message msg = android.os.Message.obtain(this, ACTION_FOLDER_LOADING,
|
||||
|
|
@ -466,14 +465,14 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
*/
|
||||
protected Comparator<Cursor> getComparator() {
|
||||
final List<Comparator<Cursor>> chain =
|
||||
new ArrayList<Comparator<Cursor>>(3 /* we add 3 comparators at most */);
|
||||
new ArrayList<>(3 /* we add 3 comparators at most */);
|
||||
|
||||
// Add the specified comparator
|
||||
final Comparator<Cursor> comparator = SORT_COMPARATORS.get(mSortType);
|
||||
if (mSortAscending) {
|
||||
chain.add(comparator);
|
||||
} else {
|
||||
chain.add(new ReverseComparator<Cursor>(comparator));
|
||||
chain.add(new ReverseComparator<>(comparator));
|
||||
}
|
||||
|
||||
// Add the date comparator if not already specified
|
||||
|
|
@ -482,7 +481,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
if (mSortDateAscending) {
|
||||
chain.add(dateComparator);
|
||||
} else {
|
||||
chain.add(new ReverseComparator<Cursor>(dateComparator));
|
||||
chain.add(new ReverseComparator<>(dateComparator));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -490,7 +489,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
chain.add(new ReverseIdComparator());
|
||||
|
||||
// Build the comparator chain
|
||||
return new ComparatorChain<Cursor>(chain);
|
||||
return new ComparatorChain<>(chain);
|
||||
}
|
||||
|
||||
private void folderLoading(String folder, boolean loading) {
|
||||
|
|
@ -617,8 +616,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
} else {
|
||||
if (mThreadedList && cursor.getInt(THREAD_COUNT_COLUMN) > 1) {
|
||||
Account account = getAccountFromCursor(cursor);
|
||||
long folderId = cursor.getLong(FOLDER_ID_COLUMN);
|
||||
String folderName = getFolderNameById(account, folderId);
|
||||
String folderName = cursor.getString(FOLDER_NAME_COLUMN);
|
||||
|
||||
// If threading is enabled and this item represents a thread, display the thread contents.
|
||||
long rootId = cursor.getLong(THREAD_ROOT_COLUMN);
|
||||
|
|
@ -876,25 +874,6 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
return localFolder;
|
||||
}
|
||||
|
||||
private String getFolderNameById(Account account, long folderId) {
|
||||
Folder folder = getFolderById(account, folderId);
|
||||
if (folder != null) {
|
||||
return folder.getName();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private LocalFolder getFolderById(Account account, long folderId) {
|
||||
try {
|
||||
LocalStore localStore = account.getLocalStore();
|
||||
LocalFolder localFolder = localStore.getFolderById(folderId);
|
||||
localFolder.open(Folder.OPEN_MODE_RO);
|
||||
return localFolder;
|
||||
} catch (MessagingException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
super.onPause();
|
||||
|
|
@ -1037,20 +1016,20 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
}
|
||||
|
||||
public void onReply(LocalMessage message) {
|
||||
mFragmentListener.onReply(message);
|
||||
public void onReply(MessageReference messageReference) {
|
||||
mFragmentListener.onReply(messageReference);
|
||||
}
|
||||
|
||||
public void onReplyAll(LocalMessage message) {
|
||||
mFragmentListener.onReplyAll(message);
|
||||
public void onReplyAll(MessageReference messageReference) {
|
||||
mFragmentListener.onReplyAll(messageReference);
|
||||
}
|
||||
|
||||
public void onForward(LocalMessage message) {
|
||||
mFragmentListener.onForward(message);
|
||||
public void onForward(MessageReference messageReference) {
|
||||
mFragmentListener.onForward(messageReference);
|
||||
}
|
||||
|
||||
public void onResendMessage(LocalMessage message) {
|
||||
mFragmentListener.onResendMessage(message);
|
||||
public void onResendMessage(MessageReference messageReference) {
|
||||
mFragmentListener.onResendMessage(messageReference);
|
||||
}
|
||||
|
||||
public void changeSort(SortType sortType) {
|
||||
|
|
@ -1157,11 +1136,11 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
changeSort(sorts[curIndex]);
|
||||
}
|
||||
|
||||
private void onDelete(LocalMessage message) {
|
||||
private void onDelete(MessageReference message) {
|
||||
onDelete(Collections.singletonList(message));
|
||||
}
|
||||
|
||||
private void onDelete(List<LocalMessage> messages) {
|
||||
private void onDelete(List<MessageReference> messages) {
|
||||
if (K9.confirmDelete()) {
|
||||
// remember the message selection for #onCreateDialog(int)
|
||||
mActiveMessages = messages;
|
||||
|
|
@ -1171,7 +1150,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
}
|
||||
|
||||
private void onDeleteConfirmed(List<LocalMessage> messages) {
|
||||
private void onDeleteConfirmed(List<MessageReference> messages) {
|
||||
if (mThreadedList) {
|
||||
mController.deleteThreads(messages);
|
||||
} else {
|
||||
|
|
@ -1193,14 +1172,21 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
|
||||
final String destFolderName = data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER);
|
||||
final List<LocalMessage> messages = mActiveMessages;
|
||||
final List<MessageReference> messages = mActiveMessages;
|
||||
|
||||
if (destFolderName != null) {
|
||||
|
||||
mActiveMessages = null; // don't need it any more
|
||||
|
||||
if (messages.size() > 0) {
|
||||
messages.get(0).getFolder().setLastSelectedFolderName(destFolderName);
|
||||
try {
|
||||
MessageReference firstMsg = messages.get(0);
|
||||
Account account = mPreferences.getAccount(firstMsg.getAccountUuid());
|
||||
LocalFolder firstMsgFolder = getFolder(firstMsg.getFolderName(), account);
|
||||
firstMsgFolder.setLastSelectedFolderName(destFolderName);
|
||||
} catch (MessagingException e) {
|
||||
Log.e(K9.LOG_TAG, "Error getting folder for setLastSelectedFolderName()", e);
|
||||
}
|
||||
}
|
||||
|
||||
switch (requestCode) {
|
||||
|
|
@ -1392,7 +1378,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
break;
|
||||
}
|
||||
case R.id.delete: {
|
||||
LocalMessage message = getMessageAtPosition(adapterPosition);
|
||||
MessageReference message = getMessageAtPosition(adapterPosition);
|
||||
onDelete(message);
|
||||
break;
|
||||
}
|
||||
|
|
@ -2236,9 +2222,9 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
return;
|
||||
}
|
||||
|
||||
Map<Account, List<Long>> messageMap = new HashMap<Account, List<Long>>();
|
||||
Map<Account, List<Long>> threadMap = new HashMap<Account, List<Long>>();
|
||||
Set<Account> accounts = new HashSet<Account>();
|
||||
Map<Account, List<Long>> messageMap = new HashMap<>();
|
||||
Map<Account, List<Long>> threadMap = new HashMap<>();
|
||||
Set<Account> accounts = new HashSet<>();
|
||||
|
||||
for (int position = 0, end = mAdapter.getCount(); position < end; position++) {
|
||||
Cursor cursor = (Cursor) mAdapter.getItem(position);
|
||||
|
|
@ -2252,7 +2238,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
if (mThreadedList && cursor.getInt(THREAD_COUNT_COLUMN) > 1) {
|
||||
List<Long> threadRootIdList = threadMap.get(account);
|
||||
if (threadRootIdList == null) {
|
||||
threadRootIdList = new ArrayList<Long>();
|
||||
threadRootIdList = new ArrayList<>();
|
||||
threadMap.put(account, threadRootIdList);
|
||||
}
|
||||
|
||||
|
|
@ -2260,7 +2246,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
} else {
|
||||
List<Long> messageIdList = messageMap.get(account);
|
||||
if (messageIdList == null) {
|
||||
messageIdList = new ArrayList<Long>();
|
||||
messageIdList = new ArrayList<>();
|
||||
messageMap.put(account, messageIdList);
|
||||
}
|
||||
|
||||
|
|
@ -2285,7 +2271,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
computeBatchDirection();
|
||||
}
|
||||
|
||||
private void onMove(LocalMessage message) {
|
||||
private void onMove(MessageReference message) {
|
||||
onMove(Collections.singletonList(message));
|
||||
}
|
||||
|
||||
|
|
@ -2295,27 +2281,27 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
* @param messages
|
||||
* Never {@code null}.
|
||||
*/
|
||||
private void onMove(List<LocalMessage> messages) {
|
||||
private void onMove(List<MessageReference> messages) {
|
||||
if (!checkCopyOrMovePossible(messages, FolderOperation.MOVE)) {
|
||||
return;
|
||||
}
|
||||
|
||||
final Folder folder;
|
||||
String folderName;
|
||||
if (mIsThreadDisplay) {
|
||||
folder = messages.get(0).getFolder();
|
||||
folderName = messages.get(0).getFolderName();
|
||||
} else if (mSingleFolderMode) {
|
||||
folder = mCurrentFolder.folder;
|
||||
folderName = mCurrentFolder.folder.getName();
|
||||
} else {
|
||||
folder = null;
|
||||
folderName = null;
|
||||
}
|
||||
|
||||
|
||||
displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_MOVE, folder,
|
||||
messages.get(0).getFolder().getAccountUuid(), null,
|
||||
displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_MOVE, folderName,
|
||||
messages.get(0).getAccountUuid(), null,
|
||||
messages);
|
||||
}
|
||||
|
||||
private void onCopy(LocalMessage message) {
|
||||
private void onCopy(MessageReference message) {
|
||||
onCopy(Collections.singletonList(message));
|
||||
}
|
||||
|
||||
|
|
@ -2325,27 +2311,27 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
* @param messages
|
||||
* Never {@code null}.
|
||||
*/
|
||||
private void onCopy(List<LocalMessage> messages) {
|
||||
private void onCopy(List<MessageReference> messages) {
|
||||
if (!checkCopyOrMovePossible(messages, FolderOperation.COPY)) {
|
||||
return;
|
||||
}
|
||||
|
||||
final Folder folder;
|
||||
String folderName;
|
||||
if (mIsThreadDisplay) {
|
||||
folder = messages.get(0).getFolder();
|
||||
folderName = messages.get(0).getFolderName();
|
||||
} else if (mSingleFolderMode) {
|
||||
folder = mCurrentFolder.folder;
|
||||
folderName = mCurrentFolder.folder.getName();
|
||||
} else {
|
||||
folder = null;
|
||||
folderName = null;
|
||||
}
|
||||
|
||||
displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_COPY, folder,
|
||||
messages.get(0).getFolder().getAccountUuid(),
|
||||
displayFolderChoice(ACTIVITY_CHOOSE_FOLDER_COPY, folderName,
|
||||
messages.get(0).getAccountUuid(),
|
||||
null,
|
||||
messages);
|
||||
}
|
||||
|
||||
private void onDebugClearLocally(LocalMessage message) {
|
||||
private void onDebugClearLocally(MessageReference message) {
|
||||
mController.debugClearMessagesLocally(Collections.singletonList(message));
|
||||
}
|
||||
|
||||
|
|
@ -2356,25 +2342,20 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
* @param requestCode
|
||||
* If {@code >= 0}, this code will be returned in {@code onActivityResult()} when the
|
||||
* activity exits.
|
||||
* @param folder
|
||||
* The source folder. Never {@code null}.
|
||||
* @param messages
|
||||
* Messages to be affected by the folder operation. Never {@code null}.
|
||||
*
|
||||
* @see #startActivityForResult(Intent, int)
|
||||
*/
|
||||
private void displayFolderChoice(int requestCode, Folder folder,
|
||||
private void displayFolderChoice(int requestCode, String sourceFolderName,
|
||||
String accountUuid, String lastSelectedFolderName,
|
||||
List<LocalMessage> messages) {
|
||||
|
||||
List<MessageReference> messages) {
|
||||
Intent intent = new Intent(getActivity(), ChooseFolder.class);
|
||||
intent.putExtra(ChooseFolder.EXTRA_ACCOUNT, accountUuid);
|
||||
intent.putExtra(ChooseFolder.EXTRA_SEL_FOLDER, lastSelectedFolderName);
|
||||
|
||||
if (folder == null) {
|
||||
if (sourceFolderName == null) {
|
||||
intent.putExtra(ChooseFolder.EXTRA_SHOW_CURRENT, "yes");
|
||||
} else {
|
||||
intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, folder.getName());
|
||||
intent.putExtra(ChooseFolder.EXTRA_CUR_FOLDER, sourceFolderName);
|
||||
}
|
||||
|
||||
// remember the selected messages for #onActivityResult
|
||||
|
|
@ -2382,14 +2363,14 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
startActivityForResult(intent, requestCode);
|
||||
}
|
||||
|
||||
private void onArchive(final LocalMessage message) {
|
||||
private void onArchive(MessageReference message) {
|
||||
onArchive(Collections.singletonList(message));
|
||||
}
|
||||
|
||||
private void onArchive(final List<LocalMessage> messages) {
|
||||
Map<Account, List<LocalMessage>> messagesByAccount = groupMessagesByAccount(messages);
|
||||
private void onArchive(final List<MessageReference> messages) {
|
||||
Map<Account, List<MessageReference>> messagesByAccount = groupMessagesByAccount(messages);
|
||||
|
||||
for (Entry<Account, List<LocalMessage>> entry : messagesByAccount.entrySet()) {
|
||||
for (Entry<Account, List<MessageReference>> entry : messagesByAccount.entrySet()) {
|
||||
Account account = entry.getKey();
|
||||
String archiveFolder = account.getArchiveFolderName();
|
||||
|
||||
|
|
@ -2399,14 +2380,14 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
}
|
||||
|
||||
private Map<Account, List<LocalMessage>> groupMessagesByAccount(final List<LocalMessage> messages) {
|
||||
Map<Account, List<LocalMessage>> messagesByAccount = new HashMap<Account, List<LocalMessage>>();
|
||||
for (LocalMessage message : messages) {
|
||||
Account account = message.getAccount();
|
||||
private Map<Account, List<MessageReference>> groupMessagesByAccount(final List<MessageReference> messages) {
|
||||
Map<Account, List<MessageReference>> messagesByAccount = new HashMap<>();
|
||||
for (MessageReference message : messages) {
|
||||
Account account = mPreferences.getAccount(message.getAccountUuid());
|
||||
|
||||
List<LocalMessage> msgList = messagesByAccount.get(account);
|
||||
List<MessageReference> msgList = messagesByAccount.get(account);
|
||||
if (msgList == null) {
|
||||
msgList = new ArrayList<LocalMessage>();
|
||||
msgList = new ArrayList<>();
|
||||
messagesByAccount.put(account, msgList);
|
||||
}
|
||||
|
||||
|
|
@ -2415,7 +2396,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
return messagesByAccount;
|
||||
}
|
||||
|
||||
private void onSpam(LocalMessage message) {
|
||||
private void onSpam(MessageReference message) {
|
||||
onSpam(Collections.singletonList(message));
|
||||
}
|
||||
|
||||
|
|
@ -2425,7 +2406,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
* @param messages
|
||||
* The messages to move to the spam folder. Never {@code null}.
|
||||
*/
|
||||
private void onSpam(List<LocalMessage> messages) {
|
||||
private void onSpam(List<MessageReference> messages) {
|
||||
if (K9.confirmSpam()) {
|
||||
// remember the message selection for #onCreateDialog(int)
|
||||
mActiveMessages = messages;
|
||||
|
|
@ -2435,10 +2416,10 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
}
|
||||
|
||||
private void onSpamConfirmed(List<LocalMessage> messages) {
|
||||
Map<Account, List<LocalMessage>> messagesByAccount = groupMessagesByAccount(messages);
|
||||
private void onSpamConfirmed(List<MessageReference> messages) {
|
||||
Map<Account, List<MessageReference>> messagesByAccount = groupMessagesByAccount(messages);
|
||||
|
||||
for (Entry<Account, List<LocalMessage>> entry : messagesByAccount.entrySet()) {
|
||||
for (Entry<Account, List<MessageReference>> entry : messagesByAccount.entrySet()) {
|
||||
Account account = entry.getKey();
|
||||
String spamFolder = account.getSpamFolderName();
|
||||
|
||||
|
|
@ -2462,7 +2443,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
*
|
||||
* @return {@code true}, if operation is possible.
|
||||
*/
|
||||
private boolean checkCopyOrMovePossible(final List<LocalMessage> messages,
|
||||
private boolean checkCopyOrMovePossible(final List<MessageReference> messages,
|
||||
final FolderOperation operation) {
|
||||
|
||||
if (messages.isEmpty()) {
|
||||
|
|
@ -2470,11 +2451,10 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
|
||||
boolean first = true;
|
||||
for (final LocalMessage message : messages) {
|
||||
for (MessageReference message : messages) {
|
||||
if (first) {
|
||||
first = false;
|
||||
// account check
|
||||
final Account account = message.getAccount();
|
||||
Account account = mPreferences.getAccount(message.getAccountUuid());
|
||||
if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(account)) ||
|
||||
(operation == FolderOperation.COPY && !mController.isCopyCapable(account))) {
|
||||
return false;
|
||||
|
|
@ -2500,7 +2480,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
* @param destination
|
||||
* The name of the destination folder. Never {@code null}.
|
||||
*/
|
||||
private void copy(List<LocalMessage> messages, final String destination) {
|
||||
private void copy(List<MessageReference> messages, final String destination) {
|
||||
copyOrMove(messages, destination, FolderOperation.COPY);
|
||||
}
|
||||
|
||||
|
|
@ -2512,7 +2492,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
* @param destination
|
||||
* The name of the destination folder. Never {@code null}.
|
||||
*/
|
||||
private void move(List<LocalMessage> messages, final String destination) {
|
||||
private void move(List<MessageReference> messages, final String destination) {
|
||||
copyOrMove(messages, destination, FolderOperation.MOVE);
|
||||
}
|
||||
|
||||
|
|
@ -2528,12 +2508,12 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
* @param operation
|
||||
* Specifies what operation to perform. Never {@code null}.
|
||||
*/
|
||||
private void copyOrMove(List<LocalMessage> messages, final String destination,
|
||||
private void copyOrMove(List<MessageReference> messages, final String destination,
|
||||
final FolderOperation operation) {
|
||||
|
||||
Map<String, List<LocalMessage>> folderMap = new HashMap<String, List<LocalMessage>>();
|
||||
Map<String, List<MessageReference>> folderMap = new HashMap<>();
|
||||
|
||||
for (LocalMessage message : messages) {
|
||||
for (MessageReference message : messages) {
|
||||
if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) ||
|
||||
(operation == FolderOperation.COPY && !mController.isCopyCapable(message))) {
|
||||
|
||||
|
|
@ -2546,37 +2526,37 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
return;
|
||||
}
|
||||
|
||||
String folderName = message.getFolder().getName();
|
||||
String folderName = message.getFolderName();
|
||||
if (folderName.equals(destination)) {
|
||||
// Skip messages already in the destination folder
|
||||
continue;
|
||||
}
|
||||
|
||||
List<LocalMessage> outMessages = folderMap.get(folderName);
|
||||
List<MessageReference> outMessages = folderMap.get(folderName);
|
||||
if (outMessages == null) {
|
||||
outMessages = new ArrayList<LocalMessage>();
|
||||
outMessages = new ArrayList<>();
|
||||
folderMap.put(folderName, outMessages);
|
||||
}
|
||||
|
||||
outMessages.add(message);
|
||||
}
|
||||
|
||||
for (Map.Entry<String, List<LocalMessage>> entry : folderMap.entrySet()) {
|
||||
for (Map.Entry<String, List<MessageReference>> entry : folderMap.entrySet()) {
|
||||
String folderName = entry.getKey();
|
||||
List<LocalMessage> outMessages = entry.getValue();
|
||||
Account account = outMessages.get(0).getAccount();
|
||||
List<MessageReference> outMessages = entry.getValue();
|
||||
Account account = mPreferences.getAccount(outMessages.get(0).getAccountUuid());
|
||||
|
||||
if (operation == FolderOperation.MOVE) {
|
||||
if (mThreadedList) {
|
||||
mController.moveMessagesInThread(account, folderName, outMessages, destination);
|
||||
} else {
|
||||
mController.moveMessages(account, folderName, outMessages, destination, null);
|
||||
mController.moveMessages(account, folderName, outMessages, destination);
|
||||
}
|
||||
} else {
|
||||
if (mThreadedList) {
|
||||
mController.copyMessagesInThread(account, folderName, outMessages, destination);
|
||||
} else {
|
||||
mController.copyMessages(account, folderName, outMessages, destination, null);
|
||||
mController.copyMessages(account, folderName, outMessages, destination);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2624,7 +2604,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
*/
|
||||
private Set<String> getAccountUuidsForSelected() {
|
||||
int maxAccounts = mAccountUuids.length;
|
||||
Set<String> accountUuids = new HashSet<String>(maxAccounts);
|
||||
Set<String> accountUuids = new HashSet<>(maxAccounts);
|
||||
|
||||
for (int position = 0, end = mAdapter.getCount(); position < end; position++) {
|
||||
Cursor cursor = (Cursor) mAdapter.getItem(position);
|
||||
|
|
@ -2737,7 +2717,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
*/
|
||||
switch (item.getItemId()) {
|
||||
case R.id.delete: {
|
||||
List<LocalMessage> messages = getCheckedMessages();
|
||||
List<MessageReference> messages = getCheckedMessages();
|
||||
onDelete(messages);
|
||||
mSelectedCount = 0;
|
||||
break;
|
||||
|
|
@ -2874,23 +2854,6 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
super.onStop();
|
||||
}
|
||||
|
||||
public List<MessageReference> getMessageReferences() {
|
||||
List<MessageReference> messageRefs = new ArrayList<MessageReference>();
|
||||
|
||||
for (int i = 0, len = mAdapter.getCount(); i < len; i++) {
|
||||
Cursor cursor = (Cursor) mAdapter.getItem(i);
|
||||
|
||||
String accountUuid = cursor.getString(ACCOUNT_UUID_COLUMN);
|
||||
String folderName = cursor.getString(FOLDER_NAME_COLUMN);
|
||||
String messageUid = cursor.getString(UID_COLUMN);
|
||||
MessageReference ref = new MessageReference(accountUuid, folderName, messageUid, null);
|
||||
|
||||
messageRefs.add(ref);
|
||||
}
|
||||
|
||||
return messageRefs;
|
||||
}
|
||||
|
||||
public void selectAll() {
|
||||
setSelectionState(true);
|
||||
}
|
||||
|
|
@ -2993,10 +2956,10 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
void setMessageListProgress(int level);
|
||||
void showThread(Account account, String folderName, long rootId);
|
||||
void showMoreFromSameSender(String senderAddress);
|
||||
void onResendMessage(LocalMessage message);
|
||||
void onForward(LocalMessage message);
|
||||
void onReply(LocalMessage message);
|
||||
void onReplyAll(LocalMessage message);
|
||||
void onResendMessage(MessageReference message);
|
||||
void onForward(MessageReference message);
|
||||
void onReply(MessageReference message);
|
||||
void onReplyAll(MessageReference message);
|
||||
void openMessage(MessageReference messageReference);
|
||||
void setMessageListTitle(String title);
|
||||
void setMessageListSubTitle(String subTitle);
|
||||
|
|
@ -3012,7 +2975,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
changeSort(mSortType);
|
||||
}
|
||||
|
||||
private LocalMessage getSelectedMessage() {
|
||||
private MessageReference getSelectedMessage() {
|
||||
int listViewPosition = mListView.getSelectedItemPosition();
|
||||
int adapterPosition = listViewToAdapterPosition(listViewPosition);
|
||||
|
||||
|
|
@ -3035,33 +2998,28 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
return AdapterView.INVALID_POSITION;
|
||||
}
|
||||
|
||||
private LocalMessage getMessageAtPosition(int adapterPosition) {
|
||||
private MessageReference getMessageAtPosition(int adapterPosition) {
|
||||
if (adapterPosition == AdapterView.INVALID_POSITION) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Cursor cursor = (Cursor) mAdapter.getItem(adapterPosition);
|
||||
String uid = cursor.getString(UID_COLUMN);
|
||||
|
||||
Account account = getAccountFromCursor(cursor);
|
||||
long folderId = cursor.getLong(FOLDER_ID_COLUMN);
|
||||
LocalFolder folder = getFolderById(account, folderId);
|
||||
String accountUuid = cursor.getString(ACCOUNT_UUID_COLUMN);
|
||||
String folderName = cursor.getString(FOLDER_NAME_COLUMN);
|
||||
String messageUid = cursor.getString(UID_COLUMN);
|
||||
|
||||
try {
|
||||
return folder.getMessage(uid);
|
||||
} catch (MessagingException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
return new MessageReference(accountUuid, folderName, messageUid, null);
|
||||
}
|
||||
|
||||
private List<LocalMessage> getCheckedMessages() {
|
||||
List<LocalMessage> messages = new ArrayList<LocalMessage>(mSelected.size());
|
||||
private List<MessageReference> getCheckedMessages() {
|
||||
List<MessageReference> messages = new ArrayList<>(mSelected.size());
|
||||
for (int position = 0, end = mAdapter.getCount(); position < end; position++) {
|
||||
Cursor cursor = (Cursor) mAdapter.getItem(position);
|
||||
long uniqueId = cursor.getLong(mUniqueIdColumn);
|
||||
|
||||
if (mSelected.contains(uniqueId)) {
|
||||
LocalMessage message = getMessageAtPosition(position);
|
||||
MessageReference message = getMessageAtPosition(position);
|
||||
if (message != null) {
|
||||
messages.add(message);
|
||||
}
|
||||
|
|
@ -3072,7 +3030,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
|
||||
public void onDelete() {
|
||||
LocalMessage message = getSelectedMessage();
|
||||
MessageReference message = getSelectedMessage();
|
||||
if (message != null) {
|
||||
onDelete(Collections.singletonList(message));
|
||||
}
|
||||
|
|
@ -3102,21 +3060,21 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
|
||||
public void onMove() {
|
||||
LocalMessage message = getSelectedMessage();
|
||||
MessageReference message = getSelectedMessage();
|
||||
if (message != null) {
|
||||
onMove(message);
|
||||
}
|
||||
}
|
||||
|
||||
public void onArchive() {
|
||||
LocalMessage message = getSelectedMessage();
|
||||
MessageReference message = getSelectedMessage();
|
||||
if (message != null) {
|
||||
onArchive(message);
|
||||
}
|
||||
}
|
||||
|
||||
public void onCopy() {
|
||||
LocalMessage message = getSelectedMessage();
|
||||
MessageReference message = getSelectedMessage();
|
||||
if (message != null) {
|
||||
onCopy(message);
|
||||
}
|
||||
|
|
@ -3213,7 +3171,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
|
||||
StringBuilder query = new StringBuilder();
|
||||
List<String> queryArgs = new ArrayList<String>();
|
||||
List<String> queryArgs = new ArrayList<>();
|
||||
if (needConditions) {
|
||||
boolean selectActive = mActiveMessage != null && mActiveMessage.getAccountUuid().equals(accountUuid);
|
||||
|
||||
|
|
@ -3251,7 +3209,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
}
|
||||
|
||||
private String buildSortOrder() {
|
||||
String sortColumn = MessageColumns.ID;
|
||||
String sortColumn;
|
||||
switch (mSortType) {
|
||||
case SORT_ARRIVAL: {
|
||||
sortColumn = MessageColumns.INTERNAL_DATE;
|
||||
|
|
@ -3292,9 +3250,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
secondarySort = MessageColumns.DATE + ((mSortDateAscending) ? " ASC, " : " DESC, ");
|
||||
}
|
||||
|
||||
String sortOrder = sortColumn + sortDirection + ", " + secondarySort +
|
||||
MessageColumns.ID + " DESC";
|
||||
return sortOrder;
|
||||
return sortColumn + sortDirection + ", " + secondarySort + MessageColumns.ID + " DESC";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -3406,7 +3362,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
|
|||
return;
|
||||
}
|
||||
|
||||
Set<Long> selected = new HashSet<Long>();
|
||||
Set<Long> selected = new HashSet<>();
|
||||
for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
|
||||
long uniqueId = cursor.getLong(mUniqueIdColumn);
|
||||
if (mSelected.contains(uniqueId)) {
|
||||
|
|
|
|||
|
|
@ -25,10 +25,12 @@ import java.util.UUID;
|
|||
import android.content.ContentValues;
|
||||
import android.database.Cursor;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.util.Log;
|
||||
|
||||
import com.fsck.k9.Account;
|
||||
import com.fsck.k9.K9;
|
||||
import com.fsck.k9.activity.MessageReference;
|
||||
import com.fsck.k9.activity.Search;
|
||||
import com.fsck.k9.helper.Utility;
|
||||
import com.fsck.k9.mail.Address;
|
||||
|
|
@ -892,12 +894,8 @@ public class LocalFolder extends Folder<LocalMessage> implements Serializable {
|
|||
}
|
||||
}
|
||||
|
||||
public List<LocalMessage> getMessages(String[] uids, MessageRetrievalListener<LocalMessage> listener)
|
||||
throws MessagingException {
|
||||
public List<LocalMessage> getMessagesByUids(@NonNull List<String> uids) throws MessagingException {
|
||||
open(OPEN_MODE_RW);
|
||||
if (uids == null) {
|
||||
return getMessages(listener);
|
||||
}
|
||||
List<LocalMessage> messages = new ArrayList<>();
|
||||
for (String uid : uids) {
|
||||
LocalMessage message = getMessage(uid);
|
||||
|
|
@ -908,6 +906,30 @@ public class LocalFolder extends Folder<LocalMessage> implements Serializable {
|
|||
return messages;
|
||||
}
|
||||
|
||||
public List<LocalMessage> getMessagesByReference(@NonNull List<MessageReference> messageReferences)
|
||||
throws MessagingException {
|
||||
open(OPEN_MODE_RW);
|
||||
|
||||
String accountUuid = getAccountUuid();
|
||||
String folderName = getName();
|
||||
|
||||
List<LocalMessage> messages = new ArrayList<>();
|
||||
for (MessageReference messageReference : messageReferences) {
|
||||
if (!accountUuid.equals(messageReference.getAccountUuid())) {
|
||||
throw new IllegalArgumentException("all message references must belong to this Account!");
|
||||
}
|
||||
if (!folderName.equals(messageReference.getFolderName())) {
|
||||
throw new IllegalArgumentException("all message references must belong to this LocalFolder!");
|
||||
}
|
||||
|
||||
LocalMessage message = getMessage(messageReference.getUid());
|
||||
if (message != null) {
|
||||
messages.add(message);
|
||||
}
|
||||
}
|
||||
return messages;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, String> copyMessages(List<? extends Message> msgs, Folder folder) throws MessagingException {
|
||||
if (!(folder instanceof LocalFolder)) {
|
||||
|
|
|
|||
|
|
@ -173,9 +173,7 @@ public class NotificationActionService extends CoreService {
|
|||
}
|
||||
|
||||
List<MessageReference> messageReferences = intent.getParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES);
|
||||
List<LocalMessage> messages = getLocalMessages(messageReferences);
|
||||
|
||||
controller.deleteMessages(messages, null);
|
||||
controller.deleteMessages(messageReferences, null);
|
||||
}
|
||||
|
||||
private void archiveMessages(Intent intent, Account account, MessagingController controller) {
|
||||
|
|
@ -193,10 +191,9 @@ public class NotificationActionService extends CoreService {
|
|||
|
||||
List<MessageReference> messageReferences = intent.getParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES);
|
||||
for (MessageReference messageReference : messageReferences) {
|
||||
LocalMessage message = messageReference.restoreToLocalMessage(this);
|
||||
if (controller.isMoveCapable(message)) {
|
||||
String sourceFolderName = message.getFolder().getName();
|
||||
controller.moveMessage(account, sourceFolderName, message, archiveFolderName, null);
|
||||
if (controller.isMoveCapable(messageReference)) {
|
||||
String sourceFolderName = messageReference.getFolderName();
|
||||
controller.moveMessage(account, sourceFolderName, messageReference, archiveFolderName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -207,13 +204,12 @@ public class NotificationActionService extends CoreService {
|
|||
}
|
||||
|
||||
MessageReference messageReference = intent.getParcelableExtra(EXTRA_MESSAGE_REFERENCE);
|
||||
LocalMessage message = messageReference.restoreToLocalMessage(this);
|
||||
|
||||
String spamFolderName = account.getSpamFolderName();
|
||||
if (spamFolderName != null && !K9.confirmSpam() &&
|
||||
isMovePossible(controller, account, spamFolderName)) {
|
||||
String sourceFolderName = message.getFolder().getName();
|
||||
controller.moveMessage(account, sourceFolderName, message, spamFolderName, null);
|
||||
String sourceFolderName = messageReference.getFolderName();
|
||||
controller.moveMessage(account, sourceFolderName, messageReference, spamFolderName);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -231,18 +227,6 @@ public class NotificationActionService extends CoreService {
|
|||
}
|
||||
}
|
||||
|
||||
private List<LocalMessage> getLocalMessages(List<MessageReference> messageReferences) {
|
||||
List<LocalMessage> messages = new ArrayList<LocalMessage>(messageReferences.size());
|
||||
|
||||
for (MessageReference messageReference : messageReferences) {
|
||||
LocalMessage message = messageReference.restoreToLocalMessage(this);
|
||||
if (message != null) {
|
||||
messages.add(message);
|
||||
}
|
||||
}
|
||||
return messages;
|
||||
}
|
||||
|
||||
private boolean isMovePossible(MessagingController controller, Account account,
|
||||
String destinationFolderName) {
|
||||
boolean isSpecialFolderConfigured = !K9.FOLDER_NONE.equalsIgnoreCase(destinationFolderName);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,20 @@
|
|||
package com.fsck.k9.provider;
|
||||
|
||||
|
||||
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;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.Semaphore;
|
||||
import java.util.concurrent.SynchronousQueue;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.app.Application;
|
||||
import android.content.ContentProvider;
|
||||
|
|
@ -28,6 +43,7 @@ import com.fsck.k9.K9;
|
|||
import com.fsck.k9.Preferences;
|
||||
import com.fsck.k9.activity.FolderInfoHolder;
|
||||
import com.fsck.k9.activity.MessageInfoHolder;
|
||||
import com.fsck.k9.activity.MessageReference;
|
||||
import com.fsck.k9.controller.MessagingController;
|
||||
import com.fsck.k9.controller.MessagingListener;
|
||||
import com.fsck.k9.helper.MessageHelper;
|
||||
|
|
@ -36,23 +52,8 @@ import com.fsck.k9.mail.Message;
|
|||
import com.fsck.k9.mail.MessagingException;
|
||||
import com.fsck.k9.mailstore.LocalFolder;
|
||||
import com.fsck.k9.mailstore.LocalMessage;
|
||||
import com.fsck.k9.mailstore.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;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.Semaphore;
|
||||
import java.util.concurrent.SynchronousQueue;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
public class MessageProvider extends ContentProvider {
|
||||
|
||||
public static interface MessageColumns extends BaseColumns {
|
||||
|
|
@ -1050,23 +1051,11 @@ public class MessageProvider extends ContentProvider {
|
|||
Log.e(K9.LOG_TAG, "Could not find account with id " + accountId);
|
||||
}
|
||||
|
||||
// get localstore parameter
|
||||
LocalMessage msg = null;
|
||||
try {
|
||||
LocalFolder lf = LocalStore.getInstance(myAccount, getContext()).getFolder(folderName);
|
||||
int msgCount = lf.getMessageCount();
|
||||
if (K9.DEBUG) {
|
||||
Log.d(K9.LOG_TAG, "folder msg count = " + msgCount);
|
||||
}
|
||||
msg = lf.getMessage(msgUid);
|
||||
} catch (MessagingException e) {
|
||||
Log.e(K9.LOG_TAG, "Unable to retrieve message", e);
|
||||
}
|
||||
|
||||
// launch command to delete the message
|
||||
if ((myAccount != null) && (msg != null)) {
|
||||
if (myAccount != null) {
|
||||
MessageReference messageReference = new MessageReference(myAccount.getUuid(), folderName, msgUid, null);
|
||||
MessagingController controller = MessagingController.getInstance(getContext());
|
||||
controller.deleteMessages(Collections.singletonList(msg), null);
|
||||
controller.deleteMessage(messageReference, null);
|
||||
}
|
||||
|
||||
// FIXME return the actual number of deleted messages
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
|
|||
mFragmentListener.disableDeleteAction();
|
||||
LocalMessage messageToDelete = mMessage;
|
||||
mFragmentListener.showNextMessageOrReturn();
|
||||
mController.deleteMessages(Collections.singletonList(messageToDelete), null);
|
||||
mController.deleteMessage(mMessageReference, null);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -293,7 +293,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
|
|||
if (!mController.isMoveCapable(mAccount)) {
|
||||
return;
|
||||
}
|
||||
if (!mController.isMoveCapable(mMessage)) {
|
||||
if (!mController.isMoveCapable(mMessageReference)) {
|
||||
Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
|
||||
toast.show();
|
||||
return;
|
||||
|
|
@ -313,26 +313,26 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
|
|||
|
||||
private void refileMessage(String dstFolder) {
|
||||
String srcFolder = mMessageReference.getFolderName();
|
||||
LocalMessage messageToMove = mMessage;
|
||||
MessageReference messageToMove = mMessageReference;
|
||||
mFragmentListener.showNextMessageOrReturn();
|
||||
mController.moveMessage(mAccount, srcFolder, messageToMove, dstFolder, null);
|
||||
mController.moveMessage(mAccount, srcFolder, messageToMove, dstFolder);
|
||||
}
|
||||
|
||||
public void onReply() {
|
||||
if (mMessage != null) {
|
||||
mFragmentListener.onReply(mMessage, messageCryptoPresenter.getDecryptionResultForReply());
|
||||
mFragmentListener.onReply(mMessage.makeMessageReference(), messageCryptoPresenter.getDecryptionResultForReply());
|
||||
}
|
||||
}
|
||||
|
||||
public void onReplyAll() {
|
||||
if (mMessage != null) {
|
||||
mFragmentListener.onReplyAll(mMessage, messageCryptoPresenter.getDecryptionResultForReply());
|
||||
mFragmentListener.onReplyAll(mMessage.makeMessageReference(), messageCryptoPresenter.getDecryptionResultForReply());
|
||||
}
|
||||
}
|
||||
|
||||
public void onForward() {
|
||||
if (mMessage != null) {
|
||||
mFragmentListener.onForward(mMessage, messageCryptoPresenter.getDecryptionResultForReply());
|
||||
mFragmentListener.onForward(mMessage.makeMessageReference(), messageCryptoPresenter.getDecryptionResultForReply());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -350,7 +350,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
|
|||
|| (mMessage == null)) {
|
||||
return;
|
||||
}
|
||||
if (!mController.isMoveCapable(mMessage)) {
|
||||
if (!mController.isMoveCapable(mMessageReference)) {
|
||||
Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
|
||||
toast.show();
|
||||
return;
|
||||
|
|
@ -365,7 +365,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
|
|||
|| (mMessage == null)) {
|
||||
return;
|
||||
}
|
||||
if (!mController.isCopyCapable(mMessage)) {
|
||||
if (!mController.isCopyCapable(mMessageReference)) {
|
||||
Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
|
||||
toast.show();
|
||||
return;
|
||||
|
|
@ -484,13 +484,11 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
|
|||
}
|
||||
|
||||
public void moveMessage(MessageReference reference, String destFolderName) {
|
||||
mController.moveMessage(mAccount, mMessageReference.getFolderName(), mMessage,
|
||||
destFolderName, null);
|
||||
mController.moveMessage(mAccount, mMessageReference.getFolderName(), reference, destFolderName);
|
||||
}
|
||||
|
||||
public void copyMessage(MessageReference reference, String destFolderName) {
|
||||
mController.copyMessage(mAccount, mMessageReference.getFolderName(), mMessage,
|
||||
destFolderName, null);
|
||||
mController.copyMessage(mAccount, mMessageReference.getFolderName(), reference, destFolderName);
|
||||
}
|
||||
|
||||
private void showDialog(int dialogId) {
|
||||
|
|
@ -691,10 +689,10 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
|
|||
}
|
||||
|
||||
public interface MessageViewFragmentListener {
|
||||
void onForward(LocalMessage mMessage, Parcelable decryptionResultForReply);
|
||||
void onForward(MessageReference messageReference, Parcelable decryptionResultForReply);
|
||||
void disableDeleteAction();
|
||||
void onReplyAll(LocalMessage mMessage, Parcelable decryptionResultForReply);
|
||||
void onReply(LocalMessage mMessage, Parcelable decryptionResultForReply);
|
||||
void onReplyAll(MessageReference messageReference, Parcelable decryptionResultForReply);
|
||||
void onReply(MessageReference messageReference, Parcelable decryptionResultForReply);
|
||||
void displayMessageSubject(String title);
|
||||
void setProgress(boolean b);
|
||||
void showNextMessageOrReturn();
|
||||
|
|
|
|||
Loading…
Reference in a new issue