IOS-83 act on trustwords choice
authorDirk Zimmermann <dirk@pep-project.org>
Thu, 16 Feb 2017 12:01:12 +0100
changeset 1718b3c04048bce9
parent 1717 b3c9f5a9d85e
child 1719 f75d911a3309
IOS-83 act on trustwords choice
pEpForiOS/Base.lproj/Main.storyboard
pEpForiOS/UI/EmailDisplay/EmailListViewController.swift
pEpForiOS/UI/Handshake/TrustwordsTableViewController.swift
     1.1 --- a/pEpForiOS/Base.lproj/Main.storyboard	Thu Feb 16 12:05:48 2017 +0100
     1.2 +++ b/pEpForiOS/Base.lproj/Main.storyboard	Thu Feb 16 12:01:12 2017 +0100
     1.3 @@ -2237,7 +2237,7 @@
     1.4                                                          <action selector="fingerprintButtonTapped:" destination="lsn-TN-3vZ" eventType="touchUpInside" id="kZt-D5-nv6"/>
     1.5                                                      </connections>
     1.6                                                  </button>
     1.7 -                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aHd-UR-pu5">
     1.8 +                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aHd-UR-pu5">
     1.9                                                      <rect key="frame" x="15" y="20" width="352" height="36"/>
    1.10                                                      <string key="text">Ask your partner: What are your Trust Words? 
    1.11  Then compare to the correct answer shown below.</string>
    1.12 @@ -2245,7 +2245,7 @@
    1.13                                                      <color key="textColor" red="0.34901960780000002" green="0.34901960780000002" blue="0.34901960780000002" alpha="1" colorSpace="calibratedRGB"/>
    1.14                                                      <nil key="highlightedColor"/>
    1.15                                                  </label>
    1.16 -                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zfz-MF-3Y8">
    1.17 +                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zfz-MF-3Y8">
    1.18                                                      <rect key="frame" x="15" y="71" width="352" height="64.5"/>
    1.19                                                      <string key="text">SNOW ADDICT SWIFT SWEETY 
    1.20  POWERFUL DONUT ALIGATORS
    1.21 @@ -2447,9 +2447,11 @@
    1.22                          <outlet property="trustwordsLabel" destination="Zfz-MF-3Y8" id="uDU-Fz-NxY"/>
    1.23                          <outlet property="trustwordsLanaguageLabel" destination="mUu-Az-xb3" id="xEW-fh-3t1"/>
    1.24                          <segue destination="JYd-mR-vle" kind="presentation" identifier="segueFingerprint" modalTransitionStyle="crossDissolve" id="1Qm-rM-DSR"/>
    1.25 +                        <segue destination="ohM-cL-Xp8" kind="unwind" identifier="unwindTrustedUntrustedWithSegue:" unwindAction="unwindTrustedUntrustedWithSegue:" id="e2T-HB-LTk"/>
    1.26                      </connections>
    1.27                  </tableViewController>
    1.28                  <placeholder placeholderIdentifier="IBFirstResponder" id="aMO-1d-a9s" userLabel="First Responder" sceneMemberID="firstResponder"/>
    1.29 +                <exit id="ohM-cL-Xp8" userLabel="Exit" sceneMemberID="exit"/>
    1.30              </objects>
    1.31              <point key="canvasLocation" x="7992.8000000000002" y="1181.5592203898052"/>
    1.32          </scene>
     2.1 --- a/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Thu Feb 16 12:05:48 2017 +0100
     2.2 +++ b/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Thu Feb 16 12:01:12 2017 +0100
     2.3 @@ -373,6 +373,13 @@
     2.4              }
     2.5          }
     2.6      }
     2.7 +
     2.8 +    /**
     2.9 +     For the unwind segue from the trustwords controller, when the user chose "trust" or
    2.10 +     "no trust".
    2.11 +     */
    2.12 +    @IBAction func unwindTrustedUntrusted(segue: UIStoryboardSegue) {
    2.13 +    }
    2.14  }
    2.15  
    2.16  // MARK: - MessageFolderDelegate
     3.1 --- a/pEpForiOS/UI/Handshake/TrustwordsTableViewController.swift	Thu Feb 16 12:05:48 2017 +0100
     3.2 +++ b/pEpForiOS/UI/Handshake/TrustwordsTableViewController.swift	Thu Feb 16 12:01:12 2017 +0100
     3.3 @@ -90,7 +90,6 @@
     3.4      }
     3.5  
     3.6      func togglePicker(indexPath: IndexPath) {
     3.7 -        
     3.8          if languagePickerHeight.constant == 0 {
     3.9              tableView .scrollToRow(at: indexPath, at: .top, animated: true)
    3.10              showLangPicker()
    3.11 @@ -125,11 +124,11 @@
    3.12          tableView.reloadData()
    3.13      }
    3.14      
    3.15 -    @IBAction func confirmTrustwordsTapped(_ sender: RoundedButton) {
    3.16 +    @IBAction func confirmTrustwordsTapped(_ sender: UIButton) {
    3.17          PEPUtil.trust(identity: partnerIdentity)
    3.18      }
    3.19      
    3.20 -    @IBAction func wrongTrustwordsTapped(_ sender: RoundedButton) {
    3.21 +    @IBAction func wrongTrustwordsTapped(_ sender: UIButton) {
    3.22          PEPUtil.mistrust(identity: partnerIdentity)
    3.23      }
    3.24  }