IOS-1823 - it crashes trying to present the screen IOS-1823
authorMartin Brude
Thu, 06 Feb 2020 10:06:03 +0100
branchIOS-1823
changeset 11672d39001d2062c
parent 11671 7cd6dd6dc713
child 11673 418a055df5c2
IOS-1823 - it crashes trying to present the screen
pEpForiOS.xcodeproj/project.pbxproj
pEpForiOS/Base.lproj/Handshake.storyboard
pEpForiOS/UI/EmailDisplay/EmailDetailView/EmailDetailViewController.swift
pEpForiOS/UI/Handshake/HandshakeViewControllerV2.swift
     1.1 --- a/pEpForiOS.xcodeproj/project.pbxproj	Wed Feb 05 16:35:04 2020 +0100
     1.2 +++ b/pEpForiOS.xcodeproj/project.pbxproj	Thu Feb 06 10:06:03 2020 +0100
     1.3 @@ -402,6 +402,7 @@
     1.4  		49DCCD2821E8ABDF00ABE487 /* ScreenshotTestUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 495F689921E6600500A10C63 /* ScreenshotTestUtil.swift */; };
     1.5  		5BC14ABF23E2EE78005F0AF3 /* HandshakeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC14ABE23E2EE78005F0AF3 /* HandshakeViewModel.swift */; };
     1.6  		5BC14AC923E47A55005F0AF3 /* HandshakeViewModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC14AC823E47A55005F0AF3 /* HandshakeViewModelTest.swift */; };
     1.7 +		5BC14AF023EB19B5005F0AF3 /* HandshakeViewControllerV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC14AEF23EB19B5005F0AF3 /* HandshakeViewControllerV2.swift */; };
     1.8  		8B69E3991E30F80E0022959E /* Appearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B69E3981E30F80E0022959E /* Appearance.swift */; };
     1.9  		A1014DA71D1173CD00C472A8 /* UIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436C5A8D1CFEDF59006A195F /* UIHelper.swift */; };
    1.10  		A1B50A841CD26FF100B1A997 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1B50A811CD26FF100B1A997 /* Constants.swift */; };
    1.11 @@ -920,6 +921,7 @@
    1.12  		49DCCD1F21E75BE300ABE487 /* nojavascript.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = nojavascript.pdf; sourceTree = "<group>"; };
    1.13  		5BC14ABE23E2EE78005F0AF3 /* HandshakeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HandshakeViewModel.swift; sourceTree = "<group>"; };
    1.14  		5BC14AC823E47A55005F0AF3 /* HandshakeViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HandshakeViewModelTest.swift; sourceTree = "<group>"; };
    1.15 +		5BC14AEF23EB19B5005F0AF3 /* HandshakeViewControllerV2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HandshakeViewControllerV2.swift; sourceTree = "<group>"; };
    1.16  		8B69E3981E30F80E0022959E /* Appearance.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Appearance.swift; sourceTree = "<group>"; };
    1.17  		A1B50A811CD26FF100B1A997 /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
    1.18  		B70A3A62220065F500EDCE61 /* String+pEp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+pEp.swift"; sourceTree = "<group>"; };
    1.19 @@ -1965,6 +1967,7 @@
    1.20  				B70D32A6205BCC120094A92A /* CellsAndSections */,
    1.21  				B70D32A5205BCC020094A92A /* ViewModel */,
    1.22  				438D5A701EA77CFC001A37E1 /* HandshakeViewController.swift */,
    1.23 +				5BC14AEF23EB19B5005F0AF3 /* HandshakeViewControllerV2.swift */,
    1.24  				5BC14ABE23E2EE78005F0AF3 /* HandshakeViewModel.swift */,
    1.25  				4306603623584629009C1FF4 /* UndoInfoContainer.swift */,
    1.26  			);
    1.27 @@ -2888,6 +2891,7 @@
    1.28  				220DCE371E0AB5CC002FE716 /* MessageSubjectCell.swift in Sources */,
    1.29  				1526596F216230B2006A78DF /* ComposeFieldModel.swift in Sources */,
    1.30  				492EF92D20C6957D004EAE14 /* ThreadViewController.swift in Sources */,
    1.31 +				5BC14AF023EB19B5005F0AF3 /* HandshakeViewControllerV2.swift in Sources */,
    1.32  				43257C821F50179800DDC7F0 /* BasicSaxParser.swift in Sources */,
    1.33  				150DF6D02052A13700A9DCF7 /* SecureWebViewController.swift in Sources */,
    1.34  				375BA08A238BFC4100BBFE7C /* ManualAccountSetupContainerView.swift in Sources */,
     2.1 --- a/pEpForiOS/Base.lproj/Handshake.storyboard	Wed Feb 05 16:35:04 2020 +0100
     2.2 +++ b/pEpForiOS/Base.lproj/Handshake.storyboard	Thu Feb 06 10:06:03 2020 +0100
     2.3 @@ -4,13 +4,14 @@
     2.4      <dependencies>
     2.5          <deployment identifier="iOS"/>
     2.6          <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
     2.7 +        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
     2.8          <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     2.9      </dependencies>
    2.10      <scenes>
    2.11          <!--Handshake View Controller-->
    2.12          <scene sceneID="IVD-QH-CTl">
    2.13              <objects>
    2.14 -                <tableViewController storyboardIdentifier="HandshakeViewControllerID" id="Jbh-LP-Jl1" customClass="HandshakeViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
    2.15 +                <tableViewController storyboardIdentifier="HandshakeViewControllerIDA" id="Jbh-LP-Jl1" customClass="HandshakeViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
    2.16                      <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="297" sectionHeaderHeight="28" sectionFooterHeight="28" id="oZy-Mt-k2w" userLabel="HandshakeTableView">
    2.17                          <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
    2.18                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
    2.19 @@ -235,7 +236,7 @@
    2.20                  </tableViewController>
    2.21                  <placeholder placeholderIdentifier="IBFirstResponder" id="Bd2-r6-Ksy" userLabel="First Responder" sceneMemberID="firstResponder"/>
    2.22              </objects>
    2.23 -            <point key="canvasLocation" x="8544.7999999999993" y="336.88155922038982"/>
    2.24 +            <point key="canvasLocation" x="9351" y="-448"/>
    2.25          </scene>
    2.26          <!--Language List View Controller-->
    2.27          <scene sceneID="EqX-ke-To3">
    2.28 @@ -316,7 +317,7 @@
    2.29          <!--Navigation Controller-->
    2.30          <scene sceneID="LdW-n0-VeJ">
    2.31              <objects>
    2.32 -                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="PZt-VJ-X5t" sceneMemberID="viewController">
    2.33 +                <navigationController storyboardIdentifier="HandshakeViewControllerID" automaticallyAdjustsScrollViewInsets="NO" useStoryboardIdentifierAsRestorationIdentifier="YES" id="PZt-VJ-X5t" sceneMemberID="viewController">
    2.34                      <toolbarItems/>
    2.35                      <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="0Ex-jP-6bo">
    2.36                          <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
    2.37 @@ -324,17 +325,262 @@
    2.38                      </navigationBar>
    2.39                      <nil name="viewControllers"/>
    2.40                      <connections>
    2.41 -                        <segue destination="Jbh-LP-Jl1" kind="relationship" relationship="rootViewController" id="nBy-aW-MRE"/>
    2.42 +                        <segue destination="ZyM-PO-eQ8" kind="presentation" identifier="segueHandshakeCollapsed" modalTransitionStyle="flipHorizontal" id="tgf-YO-hgX"/>
    2.43                      </connections>
    2.44                  </navigationController>
    2.45                  <placeholder placeholderIdentifier="IBFirstResponder" id="RUc-NB-W2N" userLabel="First Responder" sceneMemberID="firstResponder"/>
    2.46              </objects>
    2.47 -            <point key="canvasLocation" x="7548.75" y="338.02816901408448"/>
    2.48 +            <point key="canvasLocation" x="6878" y="338"/>
    2.49 +        </scene>
    2.50 +        <!--Handshake View ControllerV2-->
    2.51 +        <scene sceneID="ZpB-Nc-cY3">
    2.52 +            <objects>
    2.53 +                <viewController useStoryboardIdentifierAsRestorationIdentifier="YES" id="ZyM-PO-eQ8" customClass="HandshakeViewControllerV2" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
    2.54 +                    <view key="view" contentMode="scaleToFill" id="aVx-QE-VZP">
    2.55 +                        <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
    2.56 +                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
    2.57 +                        <subviews>
    2.58 +                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="crl-YO-ia8">
    2.59 +                                <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
    2.60 +                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
    2.61 +                                <prototypes>
    2.62 +                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="yMU-X4-4om">
    2.63 +                                        <rect key="frame" x="0.0" y="28" width="375" height="43.5"/>
    2.64 +                                        <autoresizingMask key="autoresizingMask"/>
    2.65 +                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="yMU-X4-4om" id="jkE-w4-XJN">
    2.66 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
    2.67 +                                            <autoresizingMask key="autoresizingMask"/>
    2.68 +                                        </tableViewCellContentView>
    2.69 +                                    </tableViewCell>
    2.70 +                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="handshakePartnerCell" rowHeight="370" id="dBo-wY-3Nn" userLabel="HandshakePartnerCell" customClass="HandshakePartnerTableViewCell" customModule="pEpForiOS" customModuleProvider="target">
    2.71 +                                        <rect key="frame" x="0.0" y="71.5" width="375" height="370"/>
    2.72 +                                        <autoresizingMask key="autoresizingMask"/>
    2.73 +                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dBo-wY-3Nn" id="PBy-V2-1ZV" userLabel="HandshakeContentView">
    2.74 +                                            <rect key="frame" x="0.0" y="0.0" width="375" height="370"/>
    2.75 +                                            <autoresizingMask key="autoresizingMask"/>
    2.76 +                                            <subviews>
    2.77 +                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="KMP-lx-Npd" userLabel="OuterStackView">
    2.78 +                                                    <rect key="frame" x="20" y="20" width="335" height="330"/>
    2.79 +                                                    <subviews>
    2.80 +                                                        <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="My0-y1-PM9" userLabel="HeaderStackView">
    2.81 +                                                            <rect key="frame" x="0.0" y="0.0" width="335" height="70"/>
    2.82 +                                                            <subviews>
    2.83 +                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nU9-3n-9JM" userLabel="HeaderView">
    2.84 +                                                                    <rect key="frame" x="8" y="0.0" width="319" height="70"/>
    2.85 +                                                                    <subviews>
    2.86 +                                                                        <imageView contentMode="scaleToFill" image="empty-avatar" translatesAutoresizingMaskIntoConstraints="NO" id="fkC-wD-aZH" userLabel="PartnerImage">
    2.87 +                                                                            <rect key="frame" x="0.0" y="0.0" width="64" height="64"/>
    2.88 +                                                                            <accessibility key="accessibilityConfiguration" identifier="partnerImageView"/>
    2.89 +                                                                            <constraints>
    2.90 +                                                                                <constraint firstAttribute="width" constant="64" id="91B-LU-LpQ"/>
    2.91 +                                                                                <constraint firstAttribute="height" constant="64" id="MfN-K8-v3x"/>
    2.92 +                                                                            </constraints>
    2.93 +                                                                        </imageView>
    2.94 +                                                                        <label opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" text="Hannibal Chew" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S81-yN-lUE" userLabel="PartnerNameLabel">
    2.95 +                                                                            <rect key="frame" x="78" y="15.5" width="221" height="33.5"/>
    2.96 +                                                                            <accessibility key="accessibilityConfiguration" identifier="partnerNameLabel"/>
    2.97 +                                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
    2.98 +                                                                            <nil key="textColor"/>
    2.99 +                                                                            <nil key="highlightedColor"/>
   2.100 +                                                                        </label>
   2.101 +                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" text="Mistrusted" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XAP-1X-nYK" userLabel="PrivacyStatusLabel">
   2.102 +                                                                            <rect key="frame" x="78" y="57" width="221" height="18"/>
   2.103 +                                                                            <accessibility key="accessibilityConfiguration" identifier="privacyStatusTitle"/>
   2.104 +                                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
   2.105 +                                                                            <nil key="textColor"/>
   2.106 +                                                                            <nil key="highlightedColor"/>
   2.107 +                                                                        </label>
   2.108 +                                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TCB-Zy-Xsu">
   2.109 +                                                                            <rect key="frame" x="48" y="46" width="24" height="24"/>
   2.110 +                                                                            <accessibility key="accessibilityConfiguration" identifier="pEpStatusImageView"/>
   2.111 +                                                                            <constraints>
   2.112 +                                                                                <constraint firstAttribute="width" secondItem="TCB-Zy-Xsu" secondAttribute="height" multiplier="1:1" id="Zhd-ho-mv3"/>
   2.113 +                                                                                <constraint firstAttribute="width" constant="24" id="z7k-sa-XzY"/>
   2.114 +                                                                            </constraints>
   2.115 +                                                                        </imageView>
   2.116 +                                                                    </subviews>
   2.117 +                                                                    <constraints>
   2.118 +                                                                        <constraint firstItem="TCB-Zy-Xsu" firstAttribute="leading" secondItem="fkC-wD-aZH" secondAttribute="trailing" constant="-16" id="1AL-fc-OTE"/>
   2.119 +                                                                        <constraint firstItem="XAP-1X-nYK" firstAttribute="top" secondItem="S81-yN-lUE" secondAttribute="bottom" constant="8" symbolic="YES" id="4St-fQ-mO7"/>
   2.120 +                                                                        <constraint firstItem="S81-yN-lUE" firstAttribute="leading" secondItem="fkC-wD-aZH" secondAttribute="trailing" constant="14" id="AoE-4r-FeF"/>
   2.121 +                                                                        <constraint firstItem="S81-yN-lUE" firstAttribute="centerY" secondItem="fkC-wD-aZH" secondAttribute="centerY" id="NpY-eW-2Qn"/>
   2.122 +                                                                        <constraint firstItem="fkC-wD-aZH" firstAttribute="top" secondItem="nU9-3n-9JM" secondAttribute="top" id="Ohh-2Z-EGc"/>
   2.123 +                                                                        <constraint firstItem="TCB-Zy-Xsu" firstAttribute="top" secondItem="fkC-wD-aZH" secondAttribute="bottom" constant="-18" id="TxY-8R-P0P"/>
   2.124 +                                                                        <constraint firstItem="XAP-1X-nYK" firstAttribute="leading" secondItem="S81-yN-lUE" secondAttribute="leading" id="ZYU-k9-Dc6"/>
   2.125 +                                                                        <constraint firstItem="fkC-wD-aZH" firstAttribute="leading" secondItem="nU9-3n-9JM" secondAttribute="leading" id="eJ1-6I-iv1"/>
   2.126 +                                                                        <constraint firstAttribute="bottom" secondItem="TCB-Zy-Xsu" secondAttribute="bottom" id="gRJ-VL-PAz"/>
   2.127 +                                                                        <constraint firstAttribute="trailing" secondItem="S81-yN-lUE" secondAttribute="trailing" constant="20" symbolic="YES" id="u8z-gX-zZU"/>
   2.128 +                                                                        <constraint firstAttribute="trailing" secondItem="XAP-1X-nYK" secondAttribute="trailing" constant="20" symbolic="YES" id="uqt-bL-G3h"/>
   2.129 +                                                                    </constraints>
   2.130 +                                                                </view>
   2.131 +                                                            </subviews>
   2.132 +                                                            <edgeInsets key="layoutMargins" top="0.0" left="8" bottom="0.0" right="8"/>
   2.133 +                                                        </stackView>
   2.134 +                                                        <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G3L-cB-he8" userLabel="PrivacyStatusDescriptionStackView">
   2.135 +                                                            <rect key="frame" x="0.0" y="90" width="335" height="42.5"/>
   2.136 +                                                            <subviews>
   2.137 +                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" verticalHuggingPriority="251" text="Your communication partner is mistrusted." textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HIb-Ji-yfV" userLabel="PrivacyStatusDescription">
   2.138 +                                                                    <rect key="frame" x="8" y="0.0" width="319" height="42.5"/>
   2.139 +                                                                    <accessibility key="accessibilityConfiguration" identifier="privacyStatusDescription"/>
   2.140 +                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   2.141 +                                                                    <nil key="textColor"/>
   2.142 +                                                                    <nil key="highlightedColor"/>
   2.143 +                                                                </label>
   2.144 +                                                            </subviews>
   2.145 +                                                            <edgeInsets key="layoutMargins" top="0.0" left="8" bottom="0.0" right="8"/>
   2.146 +                                                        </stackView>
   2.147 +                                                        <stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="751" distribution="fillProportionally" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="RT3-1U-A8N" userLabel="TrustwordsStackView">
   2.148 +                                                            <rect key="frame" x="0.0" y="152.5" width="335" height="45"/>
   2.149 +                                                            <subviews>
   2.150 +                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qnu-G6-wXn">
   2.151 +                                                                    <rect key="frame" x="8" y="0.0" width="335" height="45"/>
   2.152 +                                                                    <subviews>
   2.153 +                                                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="OUTDISTANCE BLAH BLAH2 BLAH3 BLAH4 BLAH5" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0uK-Ys-aO5" userLabel="TrustWordsLabel">
   2.154 +                                                                            <rect key="frame" x="0.0" y="0.0" width="225.5" height="45"/>
   2.155 +                                                                            <accessibility key="accessibilityConfiguration" label="trustWordsLabel"/>
   2.156 +                                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   2.157 +                                                                            <nil key="textColor"/>
   2.158 +                                                                            <nil key="highlightedColor"/>
   2.159 +                                                                        </label>
   2.160 +                                                                        <button opaque="NO" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GVU-Lg-dr3">
   2.161 +                                                                            <rect key="frame" x="295" y="0.0" width="30" height="30"/>
   2.162 +                                                                            <constraints>
   2.163 +                                                                                <constraint firstAttribute="height" constant="30" id="Gt7-FK-rhF"/>
   2.164 +                                                                                <constraint firstAttribute="width" constant="30" id="rJ7-vJ-zLb"/>
   2.165 +                                                                            </constraints>
   2.166 +                                                                            <state key="normal" image="pEpForiOS-icon-languagechange"/>
   2.167 +                                                                        </button>
   2.168 +                                                                    </subviews>
   2.169 +                                                                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
   2.170 +                                                                    <constraints>
   2.171 +                                                                        <constraint firstItem="GVU-Lg-dr3" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="0uK-Ys-aO5" secondAttribute="trailing" constant="30" id="R9E-8o-ER8"/>
   2.172 +                                                                        <constraint firstItem="0uK-Ys-aO5" firstAttribute="top" secondItem="Qnu-G6-wXn" secondAttribute="top" id="RBE-TI-zRT"/>
   2.173 +                                                                        <constraint firstAttribute="bottom" secondItem="0uK-Ys-aO5" secondAttribute="bottom" id="fof-TF-aDt"/>
   2.174 +                                                                        <constraint firstItem="0uK-Ys-aO5" firstAttribute="leading" secondItem="Qnu-G6-wXn" secondAttribute="leading" id="rGx-J4-l8K"/>
   2.175 +                                                                        <constraint firstAttribute="trailing" secondItem="GVU-Lg-dr3" secondAttribute="trailing" constant="10" id="s8b-23-dFy"/>
   2.176 +                                                                        <constraint firstItem="GVU-Lg-dr3" firstAttribute="top" secondItem="0uK-Ys-aO5" secondAttribute="top" id="t0u-Kf-8f5"/>
   2.177 +                                                                    </constraints>
   2.178 +                                                                </view>
   2.179 +                                                            </subviews>
   2.180 +                                                            <edgeInsets key="layoutMargins" top="0.0" left="8" bottom="0.0" right="8"/>
   2.181 +                                                        </stackView>
   2.182 +                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a6h-q0-Slk" userLabel="TrustButtonsView">
   2.183 +                                                            <rect key="frame" x="0.0" y="217.5" width="335" height="50"/>
   2.184 +                                                            <subviews>
   2.185 +                                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="sVr-xT-f8t" userLabel="WrongButton">
   2.186 +                                                                    <rect key="frame" x="5" y="0.0" width="60" height="50"/>
   2.187 +                                                                    <accessibility key="accessibilityConfiguration" label="wrongButton"/>
   2.188 +                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
   2.189 +                                                                    <state key="normal" title="Decline"/>
   2.190 +                                                                    <connections>
   2.191 +                                                                        <action selector="wrongAction:" destination="dBo-wY-3Nn" eventType="touchUpInside" id="ylJ-wg-tG9"/>
   2.192 +                                                                    </connections>
   2.193 +                                                                </button>
   2.194 +                                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="Q7n-8c-O25" userLabel="ConfirmButton">
   2.195 +                                                                    <rect key="frame" x="75" y="8.5" width="65" height="33"/>
   2.196 +                                                                    <accessibility key="accessibilityConfiguration" label="confirmButton"/>
   2.197 +                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
   2.198 +                                                                    <state key="normal" title="Confirm"/>
   2.199 +                                                                    <connections>
   2.200 +                                                                        <action selector="confirmAction:" destination="dBo-wY-3Nn" eventType="touchUpInside" id="i2R-kZ-4Ss"/>
   2.201 +                                                                    </connections>
   2.202 +                                                                </button>
   2.203 +                                                            </subviews>
   2.204 +                                                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
   2.205 +                                                            <constraints>
   2.206 +                                                                <constraint firstItem="sVr-xT-f8t" firstAttribute="top" secondItem="a6h-q0-Slk" secondAttribute="top" id="9SR-Ge-uZn"/>
   2.207 +                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Q7n-8c-O25" secondAttribute="trailing" constant="10" id="H65-XH-XiP"/>
   2.208 +                                                                <constraint firstItem="Q7n-8c-O25" firstAttribute="width" secondItem="sVr-xT-f8t" secondAttribute="width" multiplier="1.08333" id="Jhq-Hy-DgX"/>
   2.209 +                                                                <constraint firstItem="Q7n-8c-O25" firstAttribute="firstBaseline" secondItem="sVr-xT-f8t" secondAttribute="firstBaseline" id="Wuu-qM-w7l"/>
   2.210 +                                                                <constraint firstItem="Q7n-8c-O25" firstAttribute="leading" secondItem="sVr-xT-f8t" secondAttribute="trailing" constant="10" id="baM-ar-mRa"/>
   2.211 +                                                                <constraint firstItem="sVr-xT-f8t" firstAttribute="leading" secondItem="a6h-q0-Slk" secondAttribute="leading" constant="5" id="pbB-QS-1Co"/>
   2.212 +                                                                <constraint firstAttribute="bottom" secondItem="sVr-xT-f8t" secondAttribute="bottom" id="sXH-df-VH4"/>
   2.213 +                                                            </constraints>
   2.214 +                                                        </view>
   2.215 +                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XLY-Tc-o7v" userLabel="ResetContainer">
   2.216 +                                                            <rect key="frame" x="0.0" y="287.5" width="335" height="42.5"/>
   2.217 +                                                            <subviews>
   2.218 +                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reset all pEp data for this comunication partner:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K85-bq-q6Q" userLabel="Reset Label">
   2.219 +                                                                    <rect key="frame" x="0.0" y="0.0" width="199.5" height="42.5"/>
   2.220 +                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
   2.221 +                                                                    <nil key="textColor"/>
   2.222 +                                                                    <nil key="highlightedColor"/>
   2.223 +                                                                </label>
   2.224 +                                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6bf-Gd-X5g">
   2.225 +                                                                    <rect key="frame" x="207.5" y="5.5" width="54" height="32"/>
   2.226 +                                                                    <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   2.227 +                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
   2.228 +                                                                    <inset key="contentEdgeInsets" minX="5" minY="0.0" maxX="5" maxY="0.0"/>
   2.229 +                                                                    <state key="normal" title="Reset">
   2.230 +                                                                        <color key="titleColor" systemColor="tertiarySystemBackgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
   2.231 +                                                                    </state>
   2.232 +                                                                </button>
   2.233 +                                                            </subviews>
   2.234 +                                                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
   2.235 +                                                            <constraints>
   2.236 +                                                                <constraint firstItem="6bf-Gd-X5g" firstAttribute="leading" secondItem="K85-bq-q6Q" secondAttribute="trailing" constant="8" id="2J3-yf-67v"/>
   2.237 +                                                                <constraint firstAttribute="bottom" secondItem="K85-bq-q6Q" secondAttribute="bottom" id="IMl-2X-Lrd"/>
   2.238 +                                                                <constraint firstItem="K85-bq-q6Q" firstAttribute="leading" secondItem="XLY-Tc-o7v" secondAttribute="leading" id="MP1-HU-SON"/>
   2.239 +                                                                <constraint firstItem="K85-bq-q6Q" firstAttribute="centerY" secondItem="XLY-Tc-o7v" secondAttribute="centerY" id="bbX-d8-pP2"/>
   2.240 +                                                                <constraint firstItem="6bf-Gd-X5g" firstAttribute="centerY" secondItem="XLY-Tc-o7v" secondAttribute="centerY" id="lmZ-74-9bV"/>
   2.241 +                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="6bf-Gd-X5g" secondAttribute="trailing" constant="8" id="qa7-kR-LjQ"/>
   2.242 +                                                            </constraints>
   2.243 +                                                        </view>
   2.244 +                                                    </subviews>
   2.245 +                                                    <constraints>
   2.246 +                                                        <constraint firstItem="XLY-Tc-o7v" firstAttribute="top" secondItem="a6h-q0-Slk" secondAttribute="bottom" constant="20" id="oQH-1Y-dE4"/>
   2.247 +                                                        <constraint firstItem="6bf-Gd-X5g" firstAttribute="height" secondItem="Q7n-8c-O25" secondAttribute="height" multiplier="0.969697" id="ssu-eF-XIl"/>
   2.248 +                                                    </constraints>
   2.249 +                                                </stackView>
   2.250 +                                            </subviews>
   2.251 +                                            <constraints>
   2.252 +                                                <constraint firstAttribute="trailing" secondItem="KMP-lx-Npd" secondAttribute="trailing" constant="20" symbolic="YES" id="2Km-n4-tgg"/>
   2.253 +                                                <constraint firstItem="KMP-lx-Npd" firstAttribute="leading" secondItem="PBy-V2-1ZV" secondAttribute="leading" constant="20" symbolic="YES" id="8P3-DC-mnO"/>
   2.254 +                                                <constraint firstAttribute="bottom" secondItem="KMP-lx-Npd" secondAttribute="bottom" priority="999" constant="20" symbolic="YES" id="DOS-0Z-t37"/>
   2.255 +                                                <constraint firstItem="KMP-lx-Npd" firstAttribute="centerX" secondItem="PBy-V2-1ZV" secondAttribute="centerX" id="H6c-7q-1Wm"/>
   2.256 +                                                <constraint firstItem="KMP-lx-Npd" firstAttribute="top" secondItem="PBy-V2-1ZV" secondAttribute="top" priority="999" constant="20" symbolic="YES" id="aD5-dg-Gnz"/>
   2.257 +                                            </constraints>
   2.258 +                                        </tableViewCellContentView>
   2.259 +                                        <accessibility key="accessibilityConfiguration" identifier="handshakePartnerCell"/>
   2.260 +                                        <connections>
   2.261 +                                            <outlet property="confirmButton" destination="Q7n-8c-O25" id="CUJ-Dt-SsJ"/>
   2.262 +                                            <outlet property="pEpStatusImageView" destination="TCB-Zy-Xsu" id="MPw-QU-XfJ"/>
   2.263 +                                            <outlet property="partnerImageView" destination="fkC-wD-aZH" id="PEQ-Zm-gNi"/>
   2.264 +                                            <outlet property="partnerNameLabel" destination="S81-yN-lUE" id="xQx-bf-Qmd"/>
   2.265 +                                            <outlet property="privacyStatusDescription" destination="HIb-Ji-yfV" id="sfM-d2-wVl"/>
   2.266 +                                            <outlet property="privacyStatusTitle" destination="XAP-1X-nYK" id="9aH-og-Blo"/>
   2.267 +                                            <outlet property="resetButton" destination="6bf-Gd-X5g" id="E1p-8j-M78"/>
   2.268 +                                            <outlet property="trustButtonsView" destination="a6h-q0-Slk" id="Q4V-oO-Gm3"/>
   2.269 +                                            <outlet property="trustWordsLabel" destination="0uK-Ys-aO5" id="trP-OI-PQ0"/>
   2.270 +                                            <outlet property="wrongButton" destination="sVr-xT-f8t" id="uF7-QZ-mLR"/>
   2.271 +                                        </connections>
   2.272 +                                    </tableViewCell>
   2.273 +                                </prototypes>
   2.274 +                                <connections>
   2.275 +                                    <outlet property="dataSource" destination="ZyM-PO-eQ8" id="mZK-XQ-NrB"/>
   2.276 +                                    <outlet property="delegate" destination="ZyM-PO-eQ8" id="gD2-hp-h2P"/>
   2.277 +                                </connections>
   2.278 +                            </tableView>
   2.279 +                        </subviews>
   2.280 +                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
   2.281 +                        <constraints>
   2.282 +                            <constraint firstItem="crl-YO-ia8" firstAttribute="top" secondItem="Cc9-zb-MFC" secondAttribute="top" id="Waw-Rc-UTV"/>
   2.283 +                            <constraint firstAttribute="trailing" secondItem="crl-YO-ia8" secondAttribute="trailing" id="eez-K7-mjM"/>
   2.284 +                            <constraint firstItem="crl-YO-ia8" firstAttribute="leading" secondItem="aVx-QE-VZP" secondAttribute="leading" id="lU7-u9-5d7"/>
   2.285 +                            <constraint firstItem="crl-YO-ia8" firstAttribute="bottom" secondItem="Cc9-zb-MFC" secondAttribute="bottom" id="pvS-zR-eeo"/>
   2.286 +                        </constraints>
   2.287 +                        <viewLayoutGuide key="safeArea" id="Cc9-zb-MFC"/>
   2.288 +                    </view>
   2.289 +                    <navigationItem key="navigationItem" id="YKE-S1-jhy"/>
   2.290 +                </viewController>
   2.291 +                <placeholder placeholderIdentifier="IBFirstResponder" id="OAD-MK-tHj" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
   2.292 +            </objects>
   2.293 +            <point key="canvasLocation" x="7846" y="338"/>
   2.294          </scene>
   2.295          <!--Handshake View Controller-->
   2.296          <scene sceneID="fkV-CG-vte">
   2.297              <objects>
   2.298 -                <tableViewController storyboardIdentifier="HandshakeViewControllerIDBackup" id="0Ip-9m-l0L" customClass="HandshakeViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   2.299 +                <tableViewController storyboardIdentifier="HandshakeViewControllerIDBackup" useStoryboardIdentifierAsRestorationIdentifier="YES" id="0Ip-9m-l0L" customClass="HandshakeViewController" customModule="pEpForiOS" customModuleProvider="target" sceneMemberID="viewController">
   2.300                      <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="297" sectionHeaderHeight="28" sectionFooterHeight="28" id="ep9-du-3fS" userLabel="HandshakeTableView">
   2.301                          <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
   2.302                          <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
   2.303 @@ -500,7 +746,7 @@
   2.304                  </tableViewController>
   2.305                  <placeholder placeholderIdentifier="IBFirstResponder" id="UFC-BE-nJ5" userLabel="First Responder" sceneMemberID="firstResponder"/>
   2.306              </objects>
   2.307 -            <point key="canvasLocation" x="8545" y="1045"/>
   2.308 +            <point key="canvasLocation" x="8545" y="1125"/>
   2.309          </scene>
   2.310      </scenes>
   2.311      <resources>
     3.1 --- a/pEpForiOS/UI/EmailDisplay/EmailDetailView/EmailDetailViewController.swift	Wed Feb 05 16:35:04 2020 +0100
     3.2 +++ b/pEpForiOS/UI/EmailDisplay/EmailDetailView/EmailDetailViewController.swift	Thu Feb 06 10:06:03 2020 +0100
     3.3 @@ -581,7 +581,7 @@
     3.4              destination.viewModel = viewModel?.getMoveToFolderViewModel(forMessageRepresentedByItemAt: indexPath)
     3.5          case .segueHandshake, .segueHandshakeCollapsed:
     3.6              guard let nv = segue.destination as? UINavigationController,
     3.7 -                let vc = nv.topViewController as? HandshakeViewController else {
     3.8 +                let vc = nv.topViewController as? HandshakeViewControllerV2 else {
     3.9                      Log.shared.errorAndCrash("No DVC?")
    3.10                      break
    3.11              }
    3.12 @@ -600,7 +600,7 @@
    3.13                                                                    width: 0,
    3.14                                                                    height: 0)
    3.15              vc.appConfig = appConfig
    3.16 -            vc.message = message
    3.17 +//            vc.message = message
    3.18              break
    3.19          case .noSegue:
    3.20              break
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/pEpForiOS/UI/Handshake/HandshakeViewControllerV2.swift	Thu Feb 06 10:06:03 2020 +0100
     4.3 @@ -0,0 +1,39 @@
     4.4 +//
     4.5 +//  HandshakeViewControllerV2.swift
     4.6 +//  pEp
     4.7 +//
     4.8 +//  Created by Martin Brude on 05/02/2020.
     4.9 +//  Copyright © 2020 p≡p Security S.A. All rights reserved.
    4.10 +//
    4.11 +
    4.12 +import UIKit
    4.13 +
    4.14 +class HandshakeViewControllerV2: BaseViewController {
    4.15 +
    4.16 +    override func viewDidLoad() {
    4.17 +        super.viewDidLoad()
    4.18 +
    4.19 +        // Do any additional setup after loading the view.
    4.20 +    }
    4.21 +}
    4.22 +
    4.23 +
    4.24 +extension HandshakeViewControllerV2 : UITableViewDelegate  {
    4.25 +    
    4.26 +}
    4.27 +
    4.28 +extension HandshakeViewControllerV2 : UITableViewDataSource  {
    4.29 +    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
    4.30 +        return 1
    4.31 +    }
    4.32 +    
    4.33 +    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
    4.34 +        
    4.35 +        if let cell = tableView.dequeueReusableCell(withIdentifier: "handshakePartnerCell",
    4.36 +                                                    for: indexPath) as? HandshakePartnerTableViewCell {
    4.37 +            return cell
    4.38 +        }
    4.39 +
    4.40 +        return UITableViewCell()
    4.41 +    }
    4.42 +}