Skip to content

Commit

Permalink
Merge branch 'develop' into readme
Browse files Browse the repository at this point in the history
  • Loading branch information
Alorcus committed Aug 5, 2022
2 parents 1c23aa6 + 12bd318 commit 490b46c
Show file tree
Hide file tree
Showing 278 changed files with 669 additions and 663 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
ssl: aBool
ssl: aBoolean

ssl := aBool
ssl := aBoolean
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"port:" : "tg 7/10/2019 17:11",
"printOn:" : "an 6/16/2022 20:29",
"ssl" : "tg 7/10/2019 20:21",
"ssl:" : "tg 7/10/2019 17:34",
"ssl:" : "hsp 8/5/2022 20:40",
"username" : "fr 7/26/2019 15:37",
"username:" : "an 6/16/2022 20:29",
"usernameAsIMAPString" : "tg 7/10/2019 17:18" } }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
An ICAccountSettings is the backbone of the settings for each endpoint. It holds all saved settings.
An ICAccountSettings is the backbone of the settings for each endPoint. It holds all saved settings.

For each setting, there is an instance variable (with getter and setter) with the saved setting stored in it.
To add a new setting, you need to add a "class>>[Setting]ID" getter, add an instance variable to hold the setting, amend "class>>newFrom:", "class>>displayNames" and "serializeToJson". Now all thats left is to add the UI in ICSettingsDialog for the new setting.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"classvars" : [
],
"commentStamp" : "an 7/24/2022 12:56",
"commentStamp" : "Hannes Spitz4 8/5/2022 17:33",
"instvars" : [
"notSyncedFolders",
"foldersPerMoveMenu" ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
accountInfo: anObject
accountInfo: anAccountInfo

accountInfo := anObject
accountInfo := anAccountInfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
lastResponse: anObject
lastResponse: anOrderedCollection

lastResponse := anObject
lastResponse := anOrderedCollection
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
storedCommands: anObject
storedCommands: aCommandStorage

storedCommands := anObject
storedCommands := aCommandStorage
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
stream: anObject
stream: aStream

stream := anObject
stream := aStream
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"refreshConnectionIntervalInSeconds" : "sf 6/4/2021 16:13" },
"instance" : {
"accountInfo" : "sf 7/26/2021 11:53",
"accountInfo:" : "sf 6/4/2021 13:53",
"accountInfo:" : "hsp 8/5/2022 20:24",
"allUIDs" : "an 6/16/2022 20:29",
"assembleResponse" : "an 6/16/2022 20:29",
"checkConnected" : "an 6/16/2022 20:29",
Expand All @@ -30,7 +30,7 @@
"isCommandStorageEmpty" : "an 6/16/2022 20:29",
"isConnected" : "an 6/16/2022 20:29",
"lastResponse" : "JST 6/6/2021 14:22",
"lastResponse:" : "JST 6/6/2021 14:22",
"lastResponse:" : "an 8/5/2022 21:15",
"listSubfoldersOf:filterBy:" : "an 6/16/2022 20:29",
"loggedIn" : "sf 6/4/2021 17:47",
"loggedIn:" : "sf 6/4/2021 17:45",
Expand All @@ -47,7 +47,7 @@
"sendNextCommands" : "RJPG 7/22/2022 11:19",
"setFlag:of:" : "sf 6/4/2021 16:54",
"storedCommands" : "sf 6/24/2021 16:04",
"storedCommands:" : "sf 6/24/2021 16:02",
"storedCommands:" : "an 8/5/2022 21:15",
"stream" : "sf 6/4/2021 13:31",
"stream:" : "sf 6/4/2021 13:30",
"stream:" : "hsp 8/5/2022 20:25",
"throwErrorIfNotLoggedIn" : "an 6/16/2022 20:29" } }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
email: anObject
email: anEmail

email := anObject
email := anEmail
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
name: anObject
name: aString

name := anObject
name := aString
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"instance" : {
"asString" : "lro 6/3/2021 11:48",
"email" : "EG 5/21/2021 00:03",
"email:" : "EG 5/21/2021 00:03",
"email:" : "hsp 8/5/2022 20:25",
"name" : "EG 5/21/2021 00:03",
"name:" : "EG 5/21/2021 00:03" } }
"name:" : "an 8/5/2022 21:15" } }
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
instance creation
newWith: anAccountInfo

| endpoint |
endpoint := self new.
endpoint connectionHandler accountInfo: anAccountInfo.
endpoint accountSettings: (ICAccountSettings newFrom: endpoint readWriter readAccountSettings).
| endPoint |
endPoint := self new.
endPoint connectionHandler accountInfo: anAccountInfo.
endPoint accountSettings: (ICAccountSettings newFrom: endPoint readWriter readAccountSettings).

^ endpoint
^ endPoint
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
connectionHandler: anObject
connectionHandler: aConnectionHandler

connectionHandler := anObject
connectionHandler := aConnectionHandler
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
hierarchyDelimiter: anObject
hierarchyDelimiter: aString

hierarchyDelimiter := anObject
hierarchyDelimiter := aString
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
protocol handling
parseFetchedFlagsAndPopulateFromEmails: anOrderdCollection
parseFetchedFlagsAndPopulateFromEmails: anOrderedCollection

| flagsPerUID |
flagsPerUID := ICParser parseFetchedFlagsAndPopulate: self lastResponse.

anOrderdCollection do: [:email |
anOrderedCollection do: [:email |
flagsPerUID
at: email uniqueID asString
ifPresent: [:flags | self updateFlagsFor: email with: flags]]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
readWriter: anObject
readWriter: aReadWriter

readWriter := anObject
readWriter := aReadWriter
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
protocol handling - fetch
retrieveAllFlagsFromEmails: anOrderdCollection
retrieveAllFlagsFromEmails: anOrderedCollection

self isConnected ifTrue: [
self connectionHandler fetchAllFlags.
self parseFetchedFlagsAndPopulateFromEmails: anOrderdCollection]
self parseFetchedFlagsAndPopulateFromEmails: anOrderedCollection]
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"connectionConfigurations" : "tg 7/8/2019 15:14",
"connectionConfigurations:" : "pm 6/19/2019 14:49",
"eraseStoredPasswords" : "an 6/16/2022 20:29",
"newWith:" : "an 7/8/2022 12:26",
"newWith:" : "Hannes Spitz4 8/5/2022 17:18",
"removeConfiguration:" : "NH 7/15/2020 09:55" },
"instance" : {
"accountInfo" : "sf 6/4/2021 13:58",
Expand All @@ -20,7 +20,7 @@
"connect" : "sf 6/4/2021 13:57",
"connectAndLogin" : "an 6/16/2022 20:29",
"connectionHandler" : "JST 6/5/2021 20:25",
"connectionHandler:" : "sf 6/4/2021 11:46",
"connectionHandler:" : "hsp 8/5/2022 20:27",
"currentFolder" : "Hannes Spitz4 8/2/2022 17:05",
"currentFolderName" : "C.G. 7/25/2018 13:50",
"currentFolderName:" : "C.G. 7/25/2018 13:50",
Expand All @@ -38,7 +38,7 @@
"getFolderFor:" : "sf 7/26/2021 11:46",
"getFolderType:" : "FK 8/4/2022 09:50",
"hierarchyDelimiter" : "JST 7/12/2021 19:06",
"hierarchyDelimiter:" : "sf 6/7/2021 15:47",
"hierarchyDelimiter:" : "an 8/5/2022 21:15",
"isCommandStorageEmpty" : "an 6/16/2022 20:29",
"isConnected" : "an 6/16/2022 20:29",
"lastResponse" : "sf 6/4/2021 17:58",
Expand All @@ -54,14 +54,14 @@
"mustBeUpdated:with:" : "an 6/16/2022 20:29",
"parseFetchHeaders:" : "Hannes Spitz4 8/1/2022 20:45",
"parseFetchedFlagsAndPopulate:" : "Hannes Spitz4 7/11/2022 17:58",
"parseFetchedFlagsAndPopulateFromEmails:" : "Hannes Spitz4 8/2/2022 17:05",
"parseFetchedFlagsAndPopulateFromEmails:" : "hsp 8/5/2022 20:37",
"parseListResponse" : "FK 8/3/2022 20:26",
"preventTimeout" : "sf 6/4/2021 17:02",
"readWriter" : "sf 6/4/2021 18:03",
"readWriter:" : "sf 6/4/2021 18:03",
"readWriter:" : "hsp 8/5/2022 20:27",
"resetDeletedFlagWhenRecovering:" : "Hannes Spitz4 7/27/2022 16:33",
"resetFlag:of:" : "Hannes Spitz4 7/27/2022 16:33",
"retrieveAllFlagsFromEmails:" : "RJPG 7/22/2022 13:10",
"retrieveAllFlagsFromEmails:" : "hsp 8/5/2022 20:37",
"retrieveBody:" : "lro 8/6/2021 00:03",
"retrieveFlagsFrom:to:in:" : "Hannes Spitz4 7/31/2022 15:20",
"rootDirectoryName" : "an 6/16/2022 20:29",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ An ICFileReadWriter is a JSON File Writer and Reader handling the file system st

Instance Variables:
directoryToFolderDictionary: Dictionary that maps a folder instance to each directory.
endpoint: Endpoint instance.
endPoint: EndPoint instance.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
instance creation
newWith: anEndpoint
newWith: anICEndPoint

^ self new
endpoint: anEndpoint;
endPoint: anICEndPoint;
yourself
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ delete file
delete: anICEmail in: anICFolder

| filePath |
filePath := self endpoint maildirFileName: anICFolder folderName.
filePath := self endPoint maildirFileName: anICFolder folderName.
FileDirectory default / filePath
deleteFileNamed: anICEmail id
ifAbsent: [CannotDeleteFileException new messageText: 'file not found: ', filePath, FileDirectory slash, anICEmail id].
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
directoryToFolderDictionary

^ directoryToFolderDictionary ifNil: [directoryToFolderDictionary := Dictionary newFrom: {self rootDirectory -> self endpoint rootFolder}]
^ directoryToFolderDictionary ifNil: [directoryToFolderDictionary := Dictionary newFrom: {self rootDirectory -> self endPoint rootFolder}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
directoryToFolderDictionaryReset

directoryToFolderDictionary := Dictionary newFrom: {self rootDirectory -> self endpoint rootFolder}
directoryToFolderDictionary := Dictionary newFrom: {self rootDirectory -> self endPoint rootFolder}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ directoryVisitor
currentFolder := ICFolder
named: folderName
in: (self directoryToFolderDictionary at: directory containingDirectory)
with: self endpoint
with: self endPoint
of: #Generic]
ifFalse: [
self assert: matchingFolder size = 1 description: 'Critical Error. FolderName is not Unique!'.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
endPoint: anICEndPoint

endPoint := anICEndPoint
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
endPoint

^ endPoint

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
loadedFolders: anOrderdCollection
loadedFolders: anOrderedCollection

loadedFolders := anOrderdCollection
loadedFolders := anOrderedCollection
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ read file
read: aFile for: anICFolder

anICFolder setFrom: (Json readFrom: aFile).
anICFolder isTrashFolder ifTrue: [self endpoint folderNameOfTrash: anICFolder folderName]
anICFolder isTrashFolder ifTrue: [self endPoint folderNameOfTrash: anICFolder folderName]
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ readAccountSettings
^ Json readFrom: (self rootDirectory
assureExistence;
fileNamed: 'settings')]
on: JsonIncompleteError
on: Error
do: [^ JsonObject new]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
rootDirectory

^ (FileDirectory default directoryNamed: 'Maildir') directoryNamed: self endpoint rootDirectoryName
^ (FileDirectory default directoryNamed: 'Maildir') directoryNamed: self endPoint rootDirectoryName
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
synchronize
syncFromDisk

self loadedEmails: self endpoint collectAllEmails.
self loadedFolders: self endpoint collectAllFolders.
self endpoint unlinkAllEmails.
self loadedEmails: self endPoint collectAllEmails.
self loadedFolders: self endPoint collectAllFolders.
self endPoint unlinkAllEmails.
self directoryToFolderDictionaryReset.
self readEmailsFromDisk.
self resetLoadedObjects
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ write file
write: anICEmail in: anICFolder

| folderPath |
folderPath := self endpoint maildirFileName: anICFolder folderName.
folderPath := self endPoint maildirFileName: anICFolder folderName.
(FileDirectory default / folderPath) assureExistence.
FileStream forceNewFileNamed: folderPath, FileDirectory slash, anICEmail id do: [:stream |
stream
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ write file
writeFolder: anICFolder

| maildirFileName |
maildirFileName := self endpoint maildirFileName: anICFolder folderName.
maildirFileName := self endPoint maildirFileName: anICFolder folderName.
(FileDirectory default / maildirFileName) assureExistence.
FileStream
forceNewFileNamed: maildirFileName, FileDirectory slash, self class folderInfosFileName
Expand Down
Loading

0 comments on commit 490b46c

Please sign in to comment.