IOS-586 manual account setup goes back to inbox
authorDirk Zimmermann <dirk@pep-project.org>
Tue, 20 Jun 2017 11:21:36 +0200
changeset 231139c9697875ec
parent 2310 822fdfcfcad7
child 2312 337bdf8f538e
IOS-586 manual account setup goes back to inbox
pEpForiOS/Base.lproj/AccountCreation.storyboard
pEpForiOS/UI/AccountsAndFolders/LoginTableViewController.swift
pEpForiOS/UI/EmailDisplay/EmailListViewController.swift
pEpForiOS/UI/ImapSetup/SMTPSettingsTableView.swift
     1.1 --- a/pEpForiOS/Base.lproj/AccountCreation.storyboard	Tue Jun 20 11:08:47 2017 +0200
     1.2 +++ b/pEpForiOS/Base.lproj/AccountCreation.storyboard	Tue Jun 20 11:21:36 2017 +0200
     1.3 @@ -520,9 +520,11 @@
     1.4                          <outlet property="serverValue" destination="HIi-Wv-jJs" id="yqf-Es-fSK"/>
     1.5                          <outlet property="transportSecurity" destination="Cjb-ue-OdU" id="W8X-Rm-6rK"/>
     1.6                          <segue destination="6yd-9e-jF0" kind="show" identifier="viewLogSegue" id="ohe-5h-dsJ"/>
     1.7 +                        <segue destination="4H2-fK-y3g" kind="unwind" identifier="backToEmailListSegue" unwindAction="segueUnwindAccountAddedWithSegue:" id="KmU-Ae-tvH"/>
     1.8                      </connections>
     1.9                  </tableViewController>
    1.10                  <placeholder placeholderIdentifier="IBFirstResponder" id="SBU-82-njk" userLabel="First Responder" sceneMemberID="firstResponder"/>
    1.11 +                <exit id="4H2-fK-y3g" userLabel="Exit" sceneMemberID="exit"/>
    1.12              </objects>
    1.13              <point key="canvasLocation" x="9512.7999999999993" y="-395.35232383808096"/>
    1.14          </scene>
    1.15 @@ -731,7 +733,7 @@
    1.16                          <outlet property="passwordTableViewCell" destination="P2h-Ib-u2Z" id="hX5-6a-pXa"/>
    1.17                          <outlet property="user" destination="DeX-GP-Ixx" id="8Zf-6t-dbe"/>
    1.18                          <segue destination="kdj-h1-w8d" kind="show" identifier="viewLogSegue" id="YY2-Tz-gVa"/>
    1.19 -                        <segue destination="Tgf-OP-JhX" kind="unwind" identifier="BackToEmailList" unwindAction="segueUnwindAccountAddedWithSegue:" id="xqz-o7-LHm"/>
    1.20 +                        <segue destination="Tgf-OP-JhX" kind="unwind" identifier="backToEmailList" unwindAction="segueUnwindAccountAdded:" id="xqz-o7-LHm"/>
    1.21                      </connections>
    1.22                  </tableViewController>
    1.23                  <placeholder placeholderIdentifier="IBFirstResponder" id="AeT-eg-YVi" userLabel="First Responder" sceneMemberID="firstResponder"/>
     2.1 --- a/pEpForiOS/UI/AccountsAndFolders/LoginTableViewController.swift	Tue Jun 20 11:08:47 2017 +0200
     2.2 +++ b/pEpForiOS/UI/AccountsAndFolders/LoginTableViewController.swift	Tue Jun 20 11:21:36 2017 +0200
     2.3 @@ -201,7 +201,7 @@
     2.4      public enum SegueIdentifier: String {
     2.5          case noSegue
     2.6          case viewLogSegue
     2.7 -        case BackToEmailList
     2.8 +        case backToEmailList
     2.9          case manualConfigSegue
    2.10      }
    2.11  
    2.12 @@ -228,7 +228,7 @@
    2.13              switch result {
    2.14              case .ok:
    2.15                  // unwind back to INBOX on success
    2.16 -                self.performSegue(withIdentifier: .BackToEmailList, sender: self)
    2.17 +                self.performSegue(withIdentifier: .backToEmailList, sender: self)
    2.18              case .imapError(let err):
    2.19                  self.handleLoginError(error: err)
    2.20              case .smtpError(let err):
     3.1 --- a/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Tue Jun 20 11:08:47 2017 +0200
     3.2 +++ b/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Tue Jun 20 11:21:36 2017 +0200
     3.3 @@ -410,10 +410,8 @@
     3.4      }
     3.5      
     3.6      @IBAction func segueUnwindAccountAdded(segue: UIStoryboardSegue) {
     3.7 -
     3.8      }
     3.9  
    3.10 -
    3.11      func didChangeInternal(messageFolder: MessageFolder) {
    3.12          if let folder = config?.folder,
    3.13              let message = messageFolder as? Message,
     4.1 --- a/pEpForiOS/UI/ImapSetup/SMTPSettingsTableView.swift	Tue Jun 20 11:08:47 2017 +0200
     4.2 +++ b/pEpForiOS/UI/ImapSetup/SMTPSettingsTableView.swift	Tue Jun 20 11:21:36 2017 +0200
     4.3 @@ -208,7 +208,7 @@
     4.4              switch result {
     4.5              case .ok:
     4.6                  // unwind back to INBOX on success
     4.7 -                self.dismiss(animated: true, completion: nil)
     4.8 +                self.performSegue(withIdentifier: .backToEmailListSegue, sender: self)
     4.9              case .imapError(let err):
    4.10                  self.showErrorMessage(err.localizedDescription)
    4.11              case .smtpError(let err):
    4.12 @@ -222,9 +222,9 @@
    4.13  }
    4.14  
    4.15  extension SMTPSettingsTableView: SegueHandlerType {
    4.16 -    
    4.17     public enum SegueIdentifier: String {
    4.18      case noSegue
    4.19      case viewLogSegue
    4.20 +    case backToEmailListSegue
    4.21      }
    4.22  }