mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1605603 - xpidl [array] removal from nsIMsgImapMailFolder. r=mkmelin

This commit is contained in:
Ben Campbell 2019-12-31 12:21:48 +02:00
Родитель 34315f1a84
Коммит a02df1efbe
15 изменённых файлов: 76 добавлений и 122 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
mail/components/compose/content/MsgComposeCommands.js
Просмотреть файл

@ -4966,13 +4966,10 @@ function RemoveDraft() {
// couldn't find header - perhaps an imap folder.
var imapFolder = folder.QueryInterface(Ci.nsIMsgImapMailFolder);
if (imapFolder) {
let keyArray = [];
keyArray[0] = msgKey;
imapFolder.storeImapFlags(
Ci.nsMsgFolderFlags.Expunged,
true,
keyArray,
1,
[msgKey],
null
);
}

16
mailnews/base/content/junkCommands.js
Просмотреть файл

@ -97,13 +97,7 @@ function performActionsOnJunkMsgs(aFolder, aJunkMsgHdrs, aGoodMsgHdrs) {
Ci.nsIMsgDBHdr
).messageKey;
}
aFolder.storeCustomKeywords(
null,
"Junk",
"NonJunk",
junkMsgKeys,
junkMsgKeys.length
);
aFolder.storeCustomKeywords(null, "Junk", "NonJunk", junkMsgKeys);
}
if (aGoodMsgHdrs.length) {
@ -114,13 +108,7 @@ function performActionsOnJunkMsgs(aFolder, aJunkMsgHdrs, aGoodMsgHdrs) {
Ci.nsIMsgDBHdr
).messageKey;
}
aFolder.storeCustomKeywords(
null,
"NonJunk",
"Junk",
goodMsgKeys,
goodMsgKeys.length
);
aFolder.storeCustomKeywords(null, "NonJunk", "Junk", goodMsgKeys);
}
}

16
mailnews/base/src/nsMsgDBView.cpp
Просмотреть файл

@ -2966,8 +2966,7 @@ nsresult nsMsgDBView::ApplyCommandToIndices(nsMsgViewCommandTypeValue command,
case nsMsgViewCommandType::junk:
return imapFolder->StoreCustomKeywords(
msgWindow, NS_LITERAL_CSTRING("Junk"),
NS_LITERAL_CSTRING("NonJunk"), imapUids.Elements(),
imapUids.Length(), nullptr);
NS_LITERAL_CSTRING("NonJunk"), imapUids, nullptr);
case nsMsgViewCommandType::unjunk: {
nsCOMPtr<nsIMsgDBHdr> msgHdr;
GetHdrForFirstSelectedMessage(getter_AddRefs(msgHdr));
@ -2975,14 +2974,12 @@ nsresult nsMsgDBView::ApplyCommandToIndices(nsMsgViewCommandTypeValue command,
if (msgHdr) msgHdr->GetFlags(&msgFlags);
if (msgFlags & nsMsgMessageFlags::IMAPDeleted)
imapFolder->StoreImapFlags(kImapMsgDeletedFlag, false,
imapUids.Elements(), imapUids.Length(),
imapFolder->StoreImapFlags(kImapMsgDeletedFlag, false, imapUids,
nullptr);
return imapFolder->StoreCustomKeywords(
msgWindow, NS_LITERAL_CSTRING("NonJunk"),
NS_LITERAL_CSTRING("Junk"), imapUids.Elements(), imapUids.Length(),
nullptr);
NS_LITERAL_CSTRING("Junk"), imapUids, nullptr);
}
default:
break;
@ -2990,8 +2987,7 @@ nsresult nsMsgDBView::ApplyCommandToIndices(nsMsgViewCommandTypeValue command,
// Can't get here without thisIsImapThreadPane == TRUE.
if (flags != kNoImapMsgFlag) {
imapFolder->StoreImapFlags(flags, addFlags, imapUids.Elements(),
imapUids.Length(), nullptr);
imapFolder->StoreImapFlags(flags, addFlags, imapUids, nullptr);
}
}
@ -3469,9 +3465,7 @@ nsresult nsMsgDBView::PerformActionsOnJunkMsgs(bool msgsAreJunk) {
msgHdr->GetMessageKey(&imapUids[i]);
}
imapFolder->StoreImapFlags(kImapMsgDeletedFlag, false,
imapUids.Elements(), imapUids.Length(),
nullptr);
imapFolder->StoreImapFlags(kImapMsgDeletedFlag, false, imapUids, nullptr);
}
NoteEndChange(nsMsgViewNotificationCode::none, 0, 0);

3
mailnews/base/src/nsMsgQuickSearchDBView.cpp
Просмотреть файл

@ -103,8 +103,7 @@ NS_IMETHODIMP nsMsgQuickSearchDBView::DoCommand(
nsCOMPtr<nsIMsgImapMailFolder> imapFolder = do_QueryInterface(m_folder);
if (NS_SUCCEEDED(rv) && imapFolder)
rv = imapFolder->StoreImapFlags(kImapMsgSeenFlag, true, m_keys.Elements(),
m_keys.Length(), nullptr);
rv = imapFolder->StoreImapFlags(kImapMsgSeenFlag, true, m_keys, nullptr);
m_db->SetSummaryValid(true);
return rv;

2
mailnews/base/util/nsMsgDBFolder.cpp
Просмотреть файл

@ -5418,7 +5418,7 @@ void nsMsgDBFolder::ClearProcessingFlags() {
}
}
nsresult nsMsgDBFolder::MessagesInKeyOrder(nsTArray<nsMsgKey> &aKeyArray,
nsresult nsMsgDBFolder::MessagesInKeyOrder(const nsTArray<nsMsgKey> &aKeyArray,
nsIMsgFolder *srcFolder,
nsIMutableArray *messages) {
// XXX: the output messages - should really be and nsCOMArray<nsIMsgDBHdr>

2
mailnews/base/util/nsMsgDBFolder.h
Просмотреть файл

@ -201,7 +201,7 @@ class NS_MSG_BASE nsMsgDBFolder : public nsSupportsWeakReference,
/**
* Produce an array of messages ordered like the input keys.
*/
nsresult MessagesInKeyOrder(nsTArray<nsMsgKey> &aKeyArray,
nsresult MessagesInKeyOrder(const nsTArray<nsMsgKey> &aKeyArray,
nsIMsgFolder *srcFolder,
nsIMutableArray *messages);
nsCString mURI;

2
mailnews/compose/src/nsMsgCompose.cpp
Просмотреть файл

@ -3613,7 +3613,7 @@ nsresult nsMsgComposeSendListener::RemoveDraftOrTemplate(nsIMsgCompose *compObj,
nsMsgKey messageID = srcStr.ToInteger(&err);
if (messageID != nsMsgKey_None) {
rv = imapFolder->StoreImapFlags(kImapMsgDeletedFlag, true,
&messageID, 1, nullptr);
{messageID}, nullptr);
}
}
}

2
mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp
Просмотреть файл

@ -146,7 +146,7 @@ nsresult nsMsgMdnGenerator::StoreMDNSentFlag(nsIMsgFolder *folder,
nsCOMPtr<nsIMsgImapMailFolder> imapFolder = do_QueryInterface(folder);
// Store the $MDNSent flag if the folder is an Imap Mail Folder
if (imapFolder)
return imapFolder->StoreImapFlags(kImapMsgMDNSentFlag, true, &key, 1,
return imapFolder->StoreImapFlags(kImapMsgMDNSentFlag, true, {key},
nullptr);
return rv;
}

12
mailnews/imap/public/nsIMsgImapMailFolder.idl
Просмотреть файл

@ -63,11 +63,12 @@ interface nsIMsgImapMailFolder : nsISupports {
void renameClient(in nsIMsgWindow msgWindow, in nsIMsgFolder msgFolder, in ACString oldName, in ACString newName);
// these are used for offline synchronization
void storeImapFlags(in long aFlags, in boolean aAddFlags, [array, size_is (aNumKeys)]
in nsMsgKey aKeysToFlag, in unsigned long aNumKeys, in nsIUrlListener aUrlListener);
void storeImapFlags(in long aFlags, in boolean aAddFlags,
in Array<nsMsgKey> aKeysToFlag, in nsIUrlListener aUrlListener);
nsIURI setImapFlags(in string uids, in long flags);
void replayOfflineMoveCopy([array, size_is (numKeys)] in nsMsgKey keys, in unsigned long numKeys, in boolean isMove, in nsIMsgFolder aDstFolder,
in nsIUrlListener aUrlListener, in nsIMsgWindow aWindow);
void replayOfflineMoveCopy(in Array<nsMsgKey> keys, in boolean isMove,
in nsIMsgFolder aDstFolder, in nsIUrlListener aUrlListener,
in nsIMsgWindow aWindow);
nsIURI playbackOfflineFolderCreate(in AString folderName, in nsIMsgWindow aWindow);
/**
* This is called by the offline sync code to tell the imap folder to
@ -126,8 +127,7 @@ interface nsIMsgImapMailFolder : nsISupports {
nsIURI storeCustomKeywords(in nsIMsgWindow aMsgWindow,
in ACString aFlagsToAdd,
in ACString aFlagsToSubtract,
[array, size_is (aNumKeys)] in nsMsgKey aKeysToStore,
in unsigned long aNumKeys);
in Array<nsMsgKey> aKeysToStore);
void notifyIfNewMail();

114
mailnews/imap/src/nsImapMailFolder.cpp
Просмотреть файл

@ -1657,9 +1657,9 @@ nsImapMailFolder::AddMessageDispositionState(
aMessage->GetMessageKey(&msgKey);
if (aDispositionFlag == nsIMsgFolder::nsMsgDispositionState_Replied)
StoreImapFlags(kImapMsgAnsweredFlag, true, &msgKey, 1, nullptr);
StoreImapFlags(kImapMsgAnsweredFlag, true, {msgKey}, nullptr);
else if (aDispositionFlag == nsIMsgFolder::nsMsgDispositionState_Forwarded)
StoreImapFlags(kImapMsgForwardedFlag, true, &msgKey, 1, nullptr);
StoreImapFlags(kImapMsgForwardedFlag, true, {msgKey}, nullptr);
}
return NS_OK;
}
@ -1674,8 +1674,7 @@ nsImapMailFolder::MarkMessagesRead(nsIArray *messages, bool markRead) {
rv = BuildIdsAndKeyArray(messages, messageIds, keysToMarkRead);
NS_ENSURE_SUCCESS(rv, rv);
StoreImapFlags(kImapMsgSeenFlag, markRead, keysToMarkRead.Elements(),
keysToMarkRead.Length(), nullptr);
StoreImapFlags(kImapMsgSeenFlag, markRead, keysToMarkRead, nullptr);
rv = GetDatabase();
if (NS_SUCCEEDED(rv)) mDatabase->Commit(nsMsgDBCommitType::kLargeCommit);
}
@ -1693,8 +1692,7 @@ nsImapMailFolder::SetLabelForMessages(nsIArray *aMessages,
nsTArray<nsMsgKey> keysToLabel;
nsresult rv = BuildIdsAndKeyArray(aMessages, messageIds, keysToLabel);
NS_ENSURE_SUCCESS(rv, rv);
StoreImapFlags((aLabel << 9), true, keysToLabel.Elements(),
keysToLabel.Length(), nullptr);
StoreImapFlags((aLabel << 9), true, keysToLabel, nullptr);
rv = GetDatabase();
if (NS_SUCCEEDED(rv)) mDatabase->Commit(nsMsgDBCommitType::kLargeCommit);
}
@ -1710,8 +1708,7 @@ nsImapMailFolder::MarkAllMessagesRead(nsIMsgWindow *aMsgWindow) {
rv = mDatabase->MarkAllRead(thoseMarked);
EnableNotifications(allMessageCountNotifications, true);
if (NS_SUCCEEDED(rv) && thoseMarked.Length() > 0) {
rv = StoreImapFlags(kImapMsgSeenFlag, true, thoseMarked.Elements(),
thoseMarked.Length(), nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, true, thoseMarked, nullptr);
mDatabase->Commit(nsMsgDBCommitType::kLargeCommit);
// Setup a undo-state
@ -1729,8 +1726,7 @@ NS_IMETHODIMP nsImapMailFolder::MarkThreadRead(nsIMsgThread *thread) {
nsTArray<nsMsgKey> keys;
rv = mDatabase->MarkThreadRead(thread, nullptr, keys);
if (NS_SUCCEEDED(rv) && keys.Length() > 0) {
rv = StoreImapFlags(kImapMsgSeenFlag, true, keys.Elements(),
keys.Length(), nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, true, keys, nullptr);
mDatabase->Commit(nsMsgDBCommitType::kLargeCommit);
}
}
@ -1805,9 +1801,8 @@ nsImapMailFolder::MarkMessagesFlagged(nsIArray *messages, bool markFlagged) {
nsTArray<nsMsgKey> keysToMarkFlagged;
rv = BuildIdsAndKeyArray(messages, messageIds, keysToMarkFlagged);
if (NS_FAILED(rv)) return rv;
rv = StoreImapFlags(kImapMsgFlaggedFlag, markFlagged,
keysToMarkFlagged.Elements(),
keysToMarkFlagged.Length(), nullptr);
rv = StoreImapFlags(kImapMsgFlaggedFlag, markFlagged, keysToMarkFlagged,
nullptr);
NS_ENSURE_SUCCESS(rv, rv);
rv = GetDatabase();
NS_ENSURE_SUCCESS(rv, rv);
@ -1906,30 +1901,24 @@ nsImapMailFolder::GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo,
if (msgDBHdr) rv = msgDBHdr->GetMessageKey(&key);
if (NS_SUCCEEDED(rv)) keyArray.AppendElement(key);
}
return AllocateUidStringFromKeys(keyArray.Elements(), keyArray.Length(),
msgIds);
}
static int CompareKey(const void *v1, const void *v2, void *) {
// QuickSort callback to compare array values
nsMsgKey i1 = *(nsMsgKey *)v1;
nsMsgKey i2 = *(nsMsgKey *)v2;
return i1 - i2;
return AllocateUidStringFromKeys(keyArray, msgIds);
}
/* static */ nsresult nsImapMailFolder::AllocateUidStringFromKeys(
nsMsgKey *keys, uint32_t numKeys, nsCString &msgIds) {
if (!numKeys) return NS_ERROR_INVALID_ARG;
const nsTArray<nsMsgKey> &keys, nsCString &msgIds) {
if (keys.IsEmpty()) return NS_ERROR_INVALID_ARG;
nsresult rv = NS_OK;
uint32_t startSequence;
startSequence = keys[0];
uint32_t curSequenceEnd = startSequence;
uint32_t total = numKeys;
uint32_t total = keys.Length();
// sort keys and then generate ranges instead of singletons!
NS_QuickSort(keys, numKeys, sizeof(nsMsgKey), CompareKey, nullptr);
nsTArray<nsMsgKey> sorted(keys);
sorted.Sort();
for (uint32_t keyIndex = 0; keyIndex < total; keyIndex++) {
uint32_t curKey = keys[keyIndex];
uint32_t nextKey = (keyIndex + 1 < total) ? keys[keyIndex + 1] : 0xFFFFFFFF;
uint32_t curKey = sorted[keyIndex];
uint32_t nextKey =
(keyIndex + 1 < total) ? sorted[keyIndex + 1] : 0xFFFFFFFF;
bool lastKey = (nextKey == 0xFFFFFFFF);
if (lastKey) curSequenceEnd = curKey;
@ -1947,7 +1936,7 @@ static int CompareKey(const void *v1, const void *v2, void *) {
} else {
startSequence = nextKey;
curSequenceEnd = startSequence;
AppendUid(msgIds, keys[keyIndex]);
AppendUid(msgIds, sorted[keyIndex]);
if (!lastKey) msgIds += ',';
}
}
@ -2046,8 +2035,7 @@ NS_IMETHODIMP nsImapMailFolder::DeleteMessages(
// url listener into StoreImapFlags.
nsCOMPtr<nsIUrlListener> urlListener = do_QueryInterface(listener);
if (deleteMsgs) messageFlags |= kImapMsgSeenFlag;
rv = StoreImapFlags(messageFlags, deleteMsgs, srcKeyArray.Elements(),
srcKeyArray.Length(), urlListener);
rv = StoreImapFlags(messageFlags, deleteMsgs, srcKeyArray, urlListener);
if (NS_SUCCEEDED(rv)) {
if (mDatabase) {
@ -2839,7 +2827,7 @@ nsresult nsImapMailFolder::NormalEndHeaderParseStream(
nsMsgMessageFlags::Read | nsMsgMessageFlags::IMAPDeleted,
&newFlags);
StoreImapFlags(kImapMsgSeenFlag | kImapMsgDeletedFlag, true,
&m_curMsgUid, 1, nullptr);
{m_curMsgUid}, nullptr);
m_msgMovedByFilter = true;
} break;
case nsIMsgIncomingServer::moveDupsToTrash: {
@ -2856,7 +2844,7 @@ nsresult nsImapMailFolder::NormalEndHeaderParseStream(
case nsIMsgIncomingServer::markDupsRead: {
uint32_t newFlags;
newMsgHdr->OrFlags(nsMsgMessageFlags::Read, &newFlags);
StoreImapFlags(kImapMsgSeenFlag, true, &m_curMsgUid, 1, nullptr);
StoreImapFlags(kImapMsgSeenFlag, true, {m_curMsgUid}, nullptr);
} break;
}
int32_t numNewMessages;
@ -3247,7 +3235,7 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter,
mDatabase->MarkHdrRead(msgHdr, true, nullptr);
mDatabase->MarkImapDeleted(msgKey, true, nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag | kImapMsgDeletedFlag, true,
&msgKey, 1, nullptr);
{msgKey}, nullptr);
if (NS_FAILED(rv)) break;
// this will prevent us from adding the header to the db.
m_msgMovedByFilter = true;
@ -3325,17 +3313,17 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter,
} break;
case nsMsgFilterAction::MarkRead: {
mDatabase->MarkHdrRead(msgHdr, true, nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, true, &msgKey, 1, nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, true, {msgKey}, nullptr);
msgIsNew = false;
} break;
case nsMsgFilterAction::MarkUnread: {
mDatabase->MarkHdrRead(msgHdr, false, nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, false, &msgKey, 1, nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, false, {msgKey}, nullptr);
msgIsNew = true;
} break;
case nsMsgFilterAction::MarkFlagged: {
mDatabase->MarkHdrMarked(msgHdr, true, nullptr);
rv = StoreImapFlags(kImapMsgFlaggedFlag, true, &msgKey, 1, nullptr);
rv = StoreImapFlags(kImapMsgFlaggedFlag, true, {msgKey}, nullptr);
} break;
case nsMsgFilterAction::KillThread:
case nsMsgFilterAction::WatchThread: {
@ -3361,14 +3349,14 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter,
}
if (actionType == nsMsgFilterAction::KillThread) {
mDatabase->MarkHdrRead(msgHdr, true, nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, true, &msgKey, 1, nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, true, {msgKey}, nullptr);
msgIsNew = false;
}
} break;
case nsMsgFilterAction::KillSubthread: {
mDatabase->MarkHeaderKilled(msgHdr, true, nullptr);
mDatabase->MarkHdrRead(msgHdr, true, nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, true, &msgKey, 1, nullptr);
rv = StoreImapFlags(kImapMsgSeenFlag, true, {msgKey}, nullptr);
msgIsNew = false;
} break;
case nsMsgFilterAction::ChangePriority: {
@ -3382,7 +3370,7 @@ NS_IMETHODIMP nsImapMailFolder::ApplyFilterHit(nsIMsgFilter *filter,
filterAction->GetLabel(&filterLabel);
mDatabase->SetUint32PropertyByHdr(msgHdr, "label",
static_cast<uint32_t>(filterLabel));
rv = StoreImapFlags((filterLabel << 9), true, &msgKey, 1, nullptr);
rv = StoreImapFlags((filterLabel << 9), true, {msgKey}, nullptr);
} break;
case nsMsgFilterAction::AddTag: {
nsCString keyword;
@ -3560,7 +3548,7 @@ NS_IMETHODIMP nsImapMailFolder::PlaybackOfflineFolderCreate(
}
NS_IMETHODIMP
nsImapMailFolder::ReplayOfflineMoveCopy(nsMsgKey *aMsgKeys, uint32_t aNumKeys,
nsImapMailFolder::ReplayOfflineMoveCopy(const nsTArray<nsMsgKey> &aMsgKeys,
bool isMove, nsIMsgFolder *aDstFolder,
nsIUrlListener *aUrlListener,
nsIMsgWindow *aWindow) {
@ -3595,8 +3583,8 @@ nsImapMailFolder::ReplayOfflineMoveCopy(nsMsgKey *aMsgKeys, uint32_t aNumKeys,
if (opSrcUri.Equals(srcFolderUri)) {
nsMsgKey srcMessageKey;
currentOp->GetSrcMessageKey(&srcMessageKey);
for (uint32_t msgIndex = 0; msgIndex < aNumKeys; msgIndex++) {
if (srcMessageKey == aMsgKeys[msgIndex]) {
for (auto key : aMsgKeys) {
if (srcMessageKey == key) {
nsCOMPtr<nsIMsgDBHdr> fakeDestHdr;
dstFolderDB->GetMsgHdrForKey(offlineOps[opIndex],
getter_AddRefs(fakeDestHdr));
@ -3620,7 +3608,7 @@ nsImapMailFolder::ReplayOfflineMoveCopy(nsMsgKey *aMsgKeys, uint32_t aNumKeys,
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> resultUrl;
nsAutoCString uids;
AllocateUidStringFromKeys(aMsgKeys, aNumKeys, uids);
AllocateUidStringFromKeys(aMsgKeys, uids);
rv = imapService->OnlineMessageCopy(this, uids, aDstFolder, true, isMove,
aUrlListener, getter_AddRefs(resultUrl),
nullptr, aWindow);
@ -3649,7 +3637,7 @@ NS_IMETHODIMP nsImapMailFolder::AddMoveResultPseudoKey(nsMsgKey aMsgKey) {
}
NS_IMETHODIMP nsImapMailFolder::StoreImapFlags(int32_t flags, bool addFlags,
nsMsgKey *keys, uint32_t numKeys,
const nsTArray<nsMsgKey> &keys,
nsIUrlListener *aUrlListener) {
nsresult rv;
if (!WeAreOffline()) {
@ -3657,7 +3645,7 @@ NS_IMETHODIMP nsImapMailFolder::StoreImapFlags(int32_t flags, bool addFlags,
do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsAutoCString msgIds;
AllocateUidStringFromKeys(keys, numKeys, msgIds);
AllocateUidStringFromKeys(keys, msgIds);
if (addFlags)
imapService->AddMessageFlags(this, aUrlListener ? aUrlListener : this,
nullptr, msgIds, flags, true);
@ -3668,11 +3656,9 @@ NS_IMETHODIMP nsImapMailFolder::StoreImapFlags(int32_t flags, bool addFlags,
} else {
rv = GetDatabase();
if (NS_SUCCEEDED(rv) && mDatabase) {
uint32_t total = numKeys;
for (uint32_t keyIndex = 0; keyIndex < total; keyIndex++) {
for (auto key : keys) {
nsCOMPtr<nsIMsgOfflineImapOperation> op;
rv = mDatabase->GetOfflineOpForKey(keys[keyIndex], true,
getter_AddRefs(op));
rv = mDatabase->GetOfflineOpForKey(key, true, getter_AddRefs(op));
SetFlag(nsMsgFolderFlags::OfflineEvents);
if (NS_SUCCEEDED(rv) && op) {
imapMessageFlagsType newFlags;
@ -7018,7 +7004,7 @@ nsImapMailFolder::CopyMessages(
}
nsAutoCString messageIds;
rv = AllocateUidStringFromKeys(keyArray.Elements(), numMsgs, messageIds);
rv = AllocateUidStringFromKeys(keyArray, messageIds);
if (NS_FAILED(rv)) goto done;
nsCOMPtr<nsIUrlListener> urlListener;
@ -8253,17 +8239,17 @@ NS_IMETHODIMP
nsImapMailFolder::StoreCustomKeywords(nsIMsgWindow *aMsgWindow,
const nsACString &aFlagsToAdd,
const nsACString &aFlagsToSubtract,
nsMsgKey *aKeysToStore, uint32_t aNumKeys,
const nsTArray<nsMsgKey> &aKeysToStore,
nsIURI **_retval) {
if (aNumKeys == 0) return NS_OK;
if (aKeysToStore.IsEmpty()) return NS_OK;
nsresult rv = NS_OK;
if (WeAreOffline()) {
GetDatabase();
if (!mDatabase) return NS_ERROR_UNEXPECTED;
for (uint32_t keyIndex = 0; keyIndex < aNumKeys; keyIndex++) {
for (auto key : aKeysToStore) {
nsCOMPtr<nsIMsgOfflineImapOperation> op;
nsresult rv2 = mDatabase->GetOfflineOpForKey(aKeysToStore[keyIndex], true,
getter_AddRefs(op));
nsresult rv2 =
mDatabase->GetOfflineOpForKey(key, true, getter_AddRefs(op));
if (NS_FAILED(rv2)) rv = rv2;
SetFlag(nsMsgFolderFlags::OfflineEvents);
if (NS_SUCCEEDED(rv2) && op) {
@ -8281,7 +8267,7 @@ nsImapMailFolder::StoreCustomKeywords(nsIMsgWindow *aMsgWindow,
do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
nsAutoCString msgIds;
AllocateUidStringFromKeys(aKeysToStore, aNumKeys, msgIds);
AllocateUidStringFromKeys(aKeysToStore, msgIds);
return imapService->StoreCustomKeywords(this, aMsgWindow, aFlagsToAdd,
aFlagsToSubtract, msgIds, _retval);
}
@ -8304,16 +8290,14 @@ nsresult nsImapMailFolder::PlaybackCoalescedOperations() {
if (junkKeysToClassify && !junkKeysToClassify->IsEmpty())
StoreCustomKeywords(m_moveCoalescer->GetMsgWindow(),
NS_LITERAL_CSTRING("Junk"), EmptyCString(),
junkKeysToClassify->Elements(),
junkKeysToClassify->Length(), nullptr);
*junkKeysToClassify, nullptr);
junkKeysToClassify->Clear();
nsTArray<nsMsgKey> *nonJunkKeysToClassify =
m_moveCoalescer->GetKeyBucket(1);
if (nonJunkKeysToClassify && !nonJunkKeysToClassify->IsEmpty())
StoreCustomKeywords(m_moveCoalescer->GetMsgWindow(),
NS_LITERAL_CSTRING("NonJunk"), EmptyCString(),
nonJunkKeysToClassify->Elements(),
nonJunkKeysToClassify->Length(), nullptr);
*nonJunkKeysToClassify, nullptr);
nonJunkKeysToClassify->Clear();
return m_moveCoalescer->PlaybackMoves(ShowPreviewText());
}
@ -8337,7 +8321,7 @@ nsImapMailFolder::SetJunkScoreForMessages(nsIArray *aMessages,
: NS_LITERAL_CSTRING("Junk"),
aJunkScore.EqualsLiteral("0") ? NS_LITERAL_CSTRING("Junk")
: NS_LITERAL_CSTRING("NonJunk"),
keys.Elements(), keys.Length(), nullptr);
keys, nullptr);
if (mDatabase) mDatabase->Commit(nsMsgDBCommitType::kLargeCommit);
}
return rv;
@ -8595,8 +8579,7 @@ NS_IMETHODIMP nsImapMailFolder::AddKeywordsToMessages(
nsTArray<nsMsgKey> keys;
rv = BuildIdsAndKeyArray(aMessages, messageIds, keys);
NS_ENSURE_SUCCESS(rv, rv);
rv = StoreCustomKeywords(nullptr, aKeywords, EmptyCString(),
keys.Elements(), keys.Length(), nullptr);
rv = StoreCustomKeywords(nullptr, aKeywords, EmptyCString(), keys, nullptr);
if (mDatabase) mDatabase->Commit(nsMsgDBCommitType::kLargeCommit);
}
return rv;
@ -8610,8 +8593,7 @@ NS_IMETHODIMP nsImapMailFolder::RemoveKeywordsFromMessages(
nsTArray<nsMsgKey> keys;
nsresult rv = BuildIdsAndKeyArray(aMessages, messageIds, keys);
NS_ENSURE_SUCCESS(rv, rv);
rv = StoreCustomKeywords(nullptr, EmptyCString(), aKeywords,
keys.Elements(), keys.Length(), nullptr);
rv = StoreCustomKeywords(nullptr, EmptyCString(), aKeywords, keys, nullptr);
if (mDatabase) mDatabase->Commit(nsMsgDBCommitType::kLargeCommit);
}
return rv;

2
mailnews/imap/src/nsImapMailFolder.h
Просмотреть файл

@ -360,7 +360,7 @@ class nsImapMailFolder : public nsMsgDBFolder,
// send notification to copy service listener.
nsresult OnCopyCompleted(nsISupports *srcSupport, nsresult exitCode);
static nsresult AllocateUidStringFromKeys(nsMsgKey *keys, uint32_t numKeys,
static nsresult AllocateUidStringFromKeys(const nsTArray<nsMsgKey> &keys,
nsCString &msgIds);
static nsresult BuildIdsAndKeyArray(nsIArray *messages, nsCString &msgIds,
nsTArray<nsMsgKey> &keyArray);

16
mailnews/imap/src/nsImapOfflineSync.cpp
Просмотреть файл

@ -231,8 +231,7 @@ void nsImapOfflineSync::ProcessFlagOperation(nsIMsgOfflineImapOperation *op) {
if (!matchingFlagKeys.IsEmpty()) {
nsAutoCString uids;
nsImapMailFolder::AllocateUidStringFromKeys(
matchingFlagKeys.Elements(), matchingFlagKeys.Length(), uids);
nsImapMailFolder::AllocateUidStringFromKeys(matchingFlagKeys, uids);
uint32_t curFolderFlags;
m_currentFolder->GetFlags(&curFolderFlags);
@ -311,8 +310,7 @@ void nsImapOfflineSync::ProcessKeywordOperation(
nsIMsgOfflineImapOperation::kRemoveKeywords)
? keywords
: EmptyCString(),
matchingKeywordKeys.Elements(), matchingKeywordKeys.Length(),
getter_AddRefs(uriToStoreCustomKeywords));
matchingKeywordKeys, getter_AddRefs(uriToStoreCustomKeywords));
if (NS_SUCCEEDED(rv) && uriToStoreCustomKeywords) {
nsCOMPtr<nsIMsgMailNewsUrl> mailnewsUrl =
do_QueryInterface(uriToStoreCustomKeywords);
@ -503,9 +501,8 @@ void nsImapOfflineSync::ProcessMoveOperation(nsIMsgOfflineImapOperation *op) {
nsCOMPtr<nsIMsgImapMailFolder> imapFolder =
do_QueryInterface(m_currentFolder);
if (imapFolder && DestFolderOnSameServer(destFolder)) {
imapFolder->ReplayOfflineMoveCopy(matchingFlagKeys.Elements(),
matchingFlagKeys.Length(), true,
destFolder, this, m_window);
imapFolder->ReplayOfflineMoveCopy(matchingFlagKeys, true, destFolder, this,
m_window);
} else {
nsresult rv;
nsCOMPtr<nsIMutableArray> messages(
@ -611,9 +608,8 @@ void nsImapOfflineSync::ProcessCopyOperation(
nsCOMPtr<nsIMsgImapMailFolder> imapFolder =
do_QueryInterface(m_currentFolder);
if (imapFolder && DestFolderOnSameServer(destFolder)) {
rv = imapFolder->ReplayOfflineMoveCopy(matchingFlagKeys.Elements(),
matchingFlagKeys.Length(), false,
destFolder, this, m_window);
rv = imapFolder->ReplayOfflineMoveCopy(matchingFlagKeys, false, destFolder,
this, m_window);
} else {
nsCOMPtr<nsIMutableArray> messages(
do_CreateInstance(NS_ARRAY_CONTRACTID, &rv));

3
mailnews/imap/src/nsImapUndoTxn.cpp
Просмотреть файл

@ -390,8 +390,7 @@ NS_IMETHODIMP nsImapMoveCopyMsgTxn::OnStopRunningUrl(nsIURI* aUrl,
}
if (dstKeys.Length()) {
nsAutoCString uids;
nsImapMailFolder::AllocateUidStringFromKeys(dstKeys.Elements(),
dstKeys.Length(), uids);
nsImapMailFolder::AllocateUidStringFromKeys(dstKeys, uids);
rv = imapService->OnlineMessageCopy(dstFolder, uids, srcFolder, true,
true, nullptr, nullptr, nullptr,
nullptr);

1
mailnews/imap/test/unit/test_compactOfflineStore.js
Просмотреть файл

@ -101,7 +101,6 @@ var tests = [
0x0008,
true,
[msgHdr.messageKey],
1,
asyncUrlListener
);
yield false;

2
suite/mailnews/components/compose/content/MsgComposeCommands.js
Просмотреть файл

@ -2386,7 +2386,7 @@ function RemoveDraft()
if (folder instanceof Ci.nsIMsgImapMailFolder)
{
const kImapMsgDeletedFlag = 0x0008;
folder.storeImapFlags(kImapMsgDeletedFlag, true, [msgKey], 1, null);
folder.storeImapFlags(kImapMsgDeletedFlag, true, [msgKey], null);
}
}
} catch (ex) {}