Skip to content

Commit

Permalink
Merge 5402c3b into d4f79aa
Browse files Browse the repository at this point in the history
  • Loading branch information
@timgarrels
timgarrels committed Jul 26, 2019
2 parents d4f79aa + 5402c3b commit b30dc32
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 27 deletions.
2 changes: 1 addition & 1 deletion packages/IMAPClient-Core.package/ICEmail.class/instance/expungeEmails.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ expungeEmails

| anICEndPoint |

anICEndPoint := folder endpoint select: self folder path.
anICEndPoint := self folder endpoint select: self folder path.
anICEndPoint expungeEmail.
self deleteEmailFromDisk
2 changes: 1 addition & 1 deletion packages/IMAPClient-Core.package/ICEmail.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"deleteEmailFromDisk" : "pm 6/2/2019 15:58",
"deleted" : "DH 7/19/2018 21:58",
"deleted:" : "DH 7/19/2018 19:43",
"expungeEmails" : "C.G. 7/25/2018 13:47",
"expungeEmails" : "tg 7/26/2019 13:57",
"flagged" : "C.G. 7/25/2018 13:47",
"flagged:" : "C.G. 7/25/2018 13:47",
"folder" : "ms 7/10/2016 13:31",
Expand Down
4 changes: 0 additions & 4 deletions packages/IMAPClient-Core.package/ICEndPoint.class/class/folderNameOfTrash.st
View file

This file was deleted.

4 changes: 2 additions & 2 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/deleteEmail..st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
delete
deleteEmail: anEmail

self sendCommand: (ICCommand deleteEmail: anEmail messageID).
self fetchNextResponse.
self moveEmail: anEmail to: self class folderNameOfTrash
self moveEmail: anEmail to: self folderNameOfTrash
9 changes: 7 additions & 2 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/folderFromResponse..st
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
protocol parse
folderFromResponse: responseLine

| folder folderPath parent |
| folder folderPath parent namePart|

folder := ICParser folderPathFrom: responseLine.

namePart := (responseLine copyAfter: ICCommand protocolQuote asCharacter).

folder := ICParser folderPathFrom: namePart.
self hierarchyDelimiter: folder hierarchyDelimiter.
folderPath := folder pathAsArray.

(responseLine includesSubstring: '\Trash') ifTrue: [self folderNameOfTrash: folderPath first].

parent := self rootFolder childFolderNamed: folderPath first
ifAbsent: [ICFolder named: folderPath first in: self rootFolder with: self].

Expand Down
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/folderNameOfTrash..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
folderNameOfTrash: aNameString

folderNameOfTrash := aNameString
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/folderNameOfTrash.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
folderNameOfTrash

^ folderNameOfTrash
2 changes: 1 addition & 1 deletion packages/IMAPClient-Core.package/ICEndPoint.class/instance/parseListResponse.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ protocol parse
parseListResponse

self fetchNextResponse.
self lastResponse do: [:each | self folderFromResponse: (each copyAfter: ICCommand protocolQuote asCharacter)]
self lastResponse do: [:each | self folderFromResponse: each]
9 changes: 5 additions & 4 deletions packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"errorNoConnection" : "tg 7/19/2019 09:39",
"errorNoPasswordSet" : "js 5/15/2016 13:51",
"errorNoUsernameSet" : "js 5/15/2016 13:51",
"folderNameOfTrash" : "tg 7/15/2019 12:42",
"removeConfiguration:" : "tg 7/8/2019 15:12" },
"instance" : {
"accountInfo" : "tg 7/10/2019 17:23",
Expand All @@ -34,14 +33,16 @@
"currentFolderName:" : "C.G. 7/25/2018 13:50",
"currentUIDs" : "pm 7/23/2019 15:07",
"currentUIDsFor:" : "pm 7/23/2019 13:34",
"deleteEmail:" : "pm 7/23/2019 13:36",
"deleteEmail:" : "tg 7/26/2019 14:12",
"expungeEmail" : "pm 7/23/2019 15:07",
"fatalErrorOccured" : "pm 6/9/2019 13:10",
"fatalErrorOccured:" : "C.G. 7/25/2018 12:33",
"fetchMailsBeginningAt:number:" : "pm 7/15/2019 20:28",
"fetchNextResponse" : "pm 7/15/2019 20:37",
"fillBodyFor:" : "pm 7/15/2019 20:42",
"folderFromResponse:" : "pm 7/25/2019 17:30",
"folderFromResponse:" : "tg 7/26/2019 14:31",
"folderNameOfTrash" : "tg 7/26/2019 14:12",
"folderNameOfTrash:" : "tg 7/26/2019 14:13",
"hierarchyDelimiter" : "mw 5/11/2018 10:37",
"hierarchyDelimiter:" : "mw 5/11/2018 10:37",
"isConnected" : "js 6/7/2016 10:13",
Expand All @@ -60,7 +61,7 @@
"moveEmail:to:" : "pm 7/23/2019 14:58",
"parseFetchHeaders:" : "pm 7/25/2019 15:40",
"parseFetchedFlagsAndPopulate:" : "pm 7/25/2019 17:45",
"parseListResponse" : "pm 7/24/2019 21:22",
"parseListResponse" : "tg 7/26/2019 14:20",
"ping" : "pm 7/23/2019 15:09",
"preventTimeout" : "lvm 7/23/2018 23:33",
"refreshConnectionProcess" : "pm 7/23/2019 15:09",
Expand Down
3 changes: 2 additions & 1 deletion packages/IMAPClient-Core.package/ICEndPoint.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"hierarchyDelimiter",
"currentFolderName",
"name",
"fatalErrorOccured" ],
"fatalErrorOccured",
"folderNameOfTrash" ],
"name" : "ICEndPoint",
"pools" : [
],
Expand Down
13 changes: 8 additions & 5 deletions packages/IMAPClient-UI.package/ICFolderDialog.class/instance/deleteEmail.st
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
email selection
deleteEmail

selectedEmail retrieveFlags.

(selectedEmail deleted)
ifTrue: [selectedEmail expungeEmails]
ifFalse: [selectedEmail deleteEmail].
self error: 'WARNING: This empties your trash and makes the selected mail unrecoverable.
Only proceed if you are confident you want this'.

self selectedEmail retrieveFlags.

(self selectedEmail deleted)
ifTrue: [self selectedEmail expungeEmails]
ifFalse: [self selectedEmail deleteEmail].

self selectedEmail: nil.
self
Expand Down
1 change: 1 addition & 0 deletions packages/IMAPClient-UI.package/ICFolderDialog.class/instance/loadOlderEmails.st
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
get emails
loadOlderEmails


self selectedFolder ifNotNil: [
[self loadOlderEmailsProcess ] forkAt: Processor userBackgroundPriority]
6 changes: 3 additions & 3 deletions packages/IMAPClient-UI.package/ICFolderDialog.class/instance/modifyFlag..st
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
flags
modifyFlag: aFlag

selectedEmail modifyFlag: aFlag.
selectedEmail retrieveFlags.
self selectedEmail modifyFlag: aFlag.
self selectedEmail retrieveFlags.

self
changed: #emailsOfSelectedFolder;
Expand Down
6 changes: 3 additions & 3 deletions packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"currentRemoteVatId" : "dl 6/23/2017 12:30",
"defaultBackgroundColor" : "C.G. 7/25/2018 14:16",
"deleteAccountButton:" : "tg 7/25/2019 20:28",
"deleteEmail" : "C.G. 7/25/2018 14:16",
"deleteEmail" : "tg 7/26/2019 14:37",
"dialogTitle" : "ms 6/26/2016 13:50",
"editAccount:with:" : "tg 7/25/2019 11:46",
"editAccountButton:" : "tg 7/11/2019 10:00",
Expand All @@ -50,9 +50,9 @@
"labelForDeletionAction:" : "C.G. 7/25/2018 14:19",
"labelForFolder:" : "tg 7/19/2019 09:19",
"labelForMail:" : "pm 6/26/2019 14:34",
"loadOlderEmails" : "tg 7/26/2019 13:34",
"loadOlderEmails" : "tg 7/26/2019 14:49",
"loadOlderEmailsProcess" : "DH 7/22/2018 22:02",
"modifyFlag:" : "DH 7/19/2018 19:52",
"modifyFlag:" : "tg 7/26/2019 13:52",
"moveEmail:" : "lvm 7/8/2018 11:46",
"numberOfFetchedFolders" : "C.G. 7/12/2018 08:14",
"numberOfFetchedFolders:" : "pm 6/9/2019 17:03",
Expand Down

0 comments on commit b30dc32

Please sign in to comment.