IOS-615 cleanup IOS-615-duplicated-first-mail
authorbuff <andreas@pep-project.org>
Wed, 09 Aug 2017 19:14:25 +0200
branchIOS-615-duplicated-first-mail
changeset 2687bb1dcce7a0d6
parent 2686 6a70b3094b64
child 2688 71970819ca7b
IOS-615 cleanup
pEpForiOS/Background/FetchMessagesOperation.swift
pEpForiOS/UI/EmailDisplay/EmailListViewController.swift
pEpForiOSTests/Background/FetchMessagesOperationTest.swift
     1.1 --- a/pEpForiOS/Background/FetchMessagesOperation.swift	Wed Aug 09 19:13:44 2017 +0200
     1.2 +++ b/pEpForiOS/Background/FetchMessagesOperation.swift	Wed Aug 09 19:14:25 2017 +0200
     1.3 @@ -70,7 +70,7 @@
     1.4          // that is mandatorily case-insensitive.
     1.5          if self.folderToOpen.lowercased() == ImapSync.defaultImapInboxName.lowercased() {
     1.6              if let folder = CdFolder.first(attributes: ["folderTypeRawValue": FolderType.inbox.rawValue,
     1.7 -                                          "account": account]) {
     1.8 +                                                        "account": account]) {
     1.9                  self.folderToOpen = folder.name!
    1.10              }
    1.11          }
     2.1 --- a/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Wed Aug 09 19:13:44 2017 +0200
     2.2 +++ b/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Wed Aug 09 19:14:25 2017 +0200
     2.3 @@ -98,7 +98,6 @@
     2.4          MessageModelConfig.messageFolderDelegate = nil
     2.5      }
     2.6  
     2.7 -    //BUFF: folder without account!
     2.8      func setupConfig() {
     2.9          guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else {
    2.10              Log.shared.errorAndCrash(component: #function, errorString: "No AppDelegate?")
     3.1 --- a/pEpForiOSTests/Background/FetchMessagesOperationTest.swift	Wed Aug 09 19:13:44 2017 +0200
     3.2 +++ b/pEpForiOSTests/Background/FetchMessagesOperationTest.swift	Wed Aug 09 19:14:25 2017 +0200
     3.3 @@ -96,7 +96,8 @@
     3.4          }
     3.5          fetch2Op.addDependency(fetchOp)
     3.6          queue.addOperation(fetch2Op)
     3.7 -        waitForExpectations(timeout: TestUtil.waitTime, handler: { error in
     3.8 +        //BUF: waittime
     3.9 +        waitForExpectations(timeout: TestUtil.waitTimeForever, handler: { error in
    3.10              XCTAssertNil(error)
    3.11              XCTAssertFalse(fetchOp.hasErrors())
    3.12              XCTAssertFalse(fetch2Op.hasErrors())