diff --git a/enzevalos_iphone/Base.lproj/Main.storyboard b/enzevalos_iphone/Base.lproj/Main.storyboard
index fea1ca5e10fc1e8835543bf4a99a9c3250dd9b68..466cdbb63336899d70db2fef079a95aa26ac717a 100644
--- a/enzevalos_iphone/Base.lproj/Main.storyboard
+++ b/enzevalos_iphone/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Amm-QN-vA7">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Amm-QN-vA7">
<device id="retina4_0" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -771,7 +771,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" text="Kontakt ist noch nicht verifiziert" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lXU-0n-bPI">
- <rect key="frame" x="94" y="36" width="132" height="20.5"/>
+ <rect key="frame" x="94" y="26" width="132" height="41"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -891,14 +891,14 @@
<rect key="frame" x="0.0" y="27.5" width="280" height="14.5"/>
<subviews>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progressViewStyle="bar" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="PRw-ew-SPh">
- <rect key="frame" x="0.0" y="6.5" width="246.5" height="2.5"/>
+ <rect key="frame" x="0.0" y="6.5" width="245.5" height="2.5"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Llp-CL-OJA"/>
</constraints>
<color key="trackTintColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
</progressView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="xx %" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h2w-il-8sh">
- <rect key="frame" x="254.5" y="0.0" width="25.5" height="14.5"/>
+ <rect key="frame" x="253.5" y="0.0" width="26.5" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -920,14 +920,14 @@
<rect key="frame" x="0.0" y="77.5" width="280" height="14.5"/>
<subviews>
<progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="ZFX-bP-Gr0">
- <rect key="frame" x="0.0" y="6.5" width="246.5" height="2"/>
+ <rect key="frame" x="0.0" y="6.5" width="245.5" height="2"/>
<constraints>
<constraint firstAttribute="height" constant="2" id="7yh-7q-Xvm"/>
</constraints>
<color key="trackTintColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
</progressView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="xx %" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gyb-Ou-ZxY">
- <rect key="frame" x="254.5" y="0.0" width="25.5" height="14.5"/>
+ <rect key="frame" x="253.5" y="0.0" width="26.5" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -1015,7 +1015,7 @@
<rect key="frame" x="0.0" y="545.5" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dM9-jb-EcN" id="tvN-re-z1Z">
- <rect key="frame" x="0.0" y="0.0" width="287" height="43.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="294" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VTZ-4w-fot">
@@ -1035,7 +1035,7 @@
<rect key="frame" x="0.0" y="589.5" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Lke-0s-P0i" id="QYX-AX-hbo">
- <rect key="frame" x="0.0" y="0.0" width="287" height="43.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="294" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
<connections>
@@ -1046,7 +1046,7 @@
<rect key="frame" x="0.0" y="633.5" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hTc-vs-AIl" id="pJ9-4e-7at">
- <rect key="frame" x="0.0" y="0.0" width="287" height="43.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="294" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ll6-yF-xkq">
@@ -1057,13 +1057,13 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="751" verticalHuggingPriority="751" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="coq-va-tcb">
- <rect key="frame" x="60" y="14" width="42" height="21"/>
+ <rect key="frame" x="60" y="11" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wnj-Bb-1Ox">
- <rect key="frame" x="102" y="16" width="177" height="18"/>
+ <rect key="frame" x="102" y="13" width="177" height="18"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -1286,7 +1286,7 @@
<!--Export Info View Controller-->
<scene sceneID="V39-4m-XUG">
<objects>
- <tableViewController id="7Pd-d5-0wz" customClass="ExportInfoViewController" customModule="enzevalos_iphone" customModuleProvider="target" sceneMemberID="viewController">
+ <tableViewController storyboardIdentifier="exportInfoViewController" id="7Pd-d5-0wz" customClass="ExportInfoViewController" customModule="enzevalos_iphone" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" sectionIndexMinimumDisplayRowCount="1" rowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="2Uv-bd-pB1">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1375,7 +1375,7 @@ Um deine sicheren E-Mails auch auf einem anderen Gerät lesen zu können, muss d
<navigationItem key="navigationItem" id="I2V-E8-CuG">
<barButtonItem key="rightBarButtonItem" title="Item" id="r6d-3b-eed">
<connections>
- <segue destination="Dxf-zr-T68" kind="show" id="HCo-4N-uff"/>
+ <action selector="nextButtonTouch:" destination="7Pd-d5-0wz" id="SiZ-US-XQ9"/>
</connections>
</barButtonItem>
</navigationItem>
@@ -1387,7 +1387,7 @@ Um deine sicheren E-Mails auch auf einem anderen Gerät lesen zu können, muss d
<!--Export View Controller-->
<scene sceneID="He1-rP-VEe">
<objects>
- <tableViewController id="Dxf-zr-T68" customClass="ExportViewController" customModule="enzevalos_iphone" customModuleProvider="target" sceneMemberID="viewController">
+ <tableViewController storyboardIdentifier="exportViewController" id="Dxf-zr-T68" customClass="ExportViewController" customModule="enzevalos_iphone" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="1" sectionHeaderHeight="18" sectionFooterHeight="18" id="h3p-jv-yUQ">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
diff --git a/enzevalos_iphone/ExportInfoViewController.swift b/enzevalos_iphone/ExportInfoViewController.swift
index 82b1e2271dd7ab5c5ebfa4438f618ca168b5d12d..6118febc80bc8777cb7e0c81baa157e34e5f0360 100644
--- a/enzevalos_iphone/ExportInfoViewController.swift
+++ b/enzevalos_iphone/ExportInfoViewController.swift
@@ -22,11 +22,29 @@ import UIKit
class ExportInfoViewController: UITableViewController {
let url = "userpage.fu-berlin.de/letterbox/faq.html#otherDevices"
+ var calledFromTravel = false
@IBAction func websiteButtonTouch(_ sender: Any) {
UIApplication.shared.openURL(URL(string: "https://" + url)!)
}
+ @IBAction func nextButtonTouch(_ sender: Any) {
+ navigationController?.pushViewController(ExportViewController.storyboardInstance(travelCall: calledFromTravel)!, animated: true)
+ }
+
+ static let storyboardID = "exportInfoViewController"
+
+ //WARNING: there are still segues in use!
+ static func storyboardInstance(travelCall calledFromTravel: Bool = false) -> ExportInfoViewController? {
+ let storyboard = UIStoryboard(name:
+ "Main", bundle: nil)
+ if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? ExportInfoViewController {
+ controller.calledFromTravel = calledFromTravel
+ return controller
+ }
+ return nil
+ }
+
override func viewDidLoad() {
super.viewDidLoad()
tableView.rowHeight = UITableViewAutomaticDimension
diff --git a/enzevalos_iphone/ExportViewController.swift b/enzevalos_iphone/ExportViewController.swift
index 7320da58c37df9bcd577a7775c831c7b8dfcdd02..6cb462105be5787b87d4f922c5be7ea358e20697 100644
--- a/enzevalos_iphone/ExportViewController.swift
+++ b/enzevalos_iphone/ExportViewController.swift
@@ -24,7 +24,20 @@ class ExportViewController: UITableViewController {
var alreadySent = false
var sentToAddress = (UserManager.loadUserValue(Attribute.userAddr) as! String)
var passcode = ""
-
+ var calledFromTravel = false
+
+ static let storyboardID = "exportViewController"
+
+ static func storyboardInstance(travelCall calledFromTravel: Bool = false) -> ExportViewController? {
+ let storyboard = UIStoryboard(name:
+ "Main", bundle: nil)
+ if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? ExportViewController {
+ controller.calledFromTravel = calledFromTravel
+ return controller
+ }
+ return nil
+ }
+
override func viewWillDisappear(_ animated: Bool) {
// Logger.queue.async(flags: .barrier) {
Logger.log(exportKeyViewClose: 2)
@@ -118,7 +131,11 @@ class ExportViewController: UITableViewController {
}
let cell = tableView.dequeueReusableCell(withIdentifier: "ExportSecretCell") as! ExportSecretCell
- cell.infoTextLabel.text = NSLocalizedString("codeExplanation", comment: "")
+ if calledFromTravel {
+ cell.infoTextLabel.text = NSLocalizedString("codeExplanationTravel", comment: "")
+ } else {
+ cell.infoTextLabel.text = NSLocalizedString("codeExplanation", comment: "")
+ }
cell.setSecretToLabels(secret: passcode)
return cell
}
diff --git a/enzevalos_iphone/SwiftPGP.swift b/enzevalos_iphone/SwiftPGP.swift
index 4fb88689c21efbc2275dca2f670dd0464a091a2c..6a3d6d231ce1965ff5b88508b4f763bc6b183efa 100644
--- a/enzevalos_iphone/SwiftPGP.swift
+++ b/enzevalos_iphone/SwiftPGP.swift
@@ -168,6 +168,10 @@ class SwiftPGP: Encryption {
return nil
}
+ func deleteExportPasscodes() throws {
+ try exportPwKeyChain.removeAll()
+ }
+
private func loadPassword(id: String) -> String?{
do{
if let pw = try pwKeyChain.getString(id) {
diff --git a/enzevalos_iphone/de.lproj/Localizable.strings b/enzevalos_iphone/de.lproj/Localizable.strings
index db8f4f394d56153f6fe8bba1f68503f518a8407b..c87800c653d0bc4509eccf66a59c593a9ed0b0b6 100644
--- a/enzevalos_iphone/de.lproj/Localizable.strings
+++ b/enzevalos_iphone/de.lproj/Localizable.strings
@@ -20,6 +20,7 @@
"Cc" = "Kopie";
"Checkmarks" = "Du hast Nachrichten von den Adressen mit Haken bekommen";
"codeExplanation" = "Um dein Geheimnis auf dem anderen Gerät benutzen zu können, benötigst du den folgenden Code. Dieser wird in dieser Ansicht wieder zu finden sein, damit du ihn leicht abtippen kannst.";
+"codeExplanationTravel" = "Um dein Geheimnis auf dem anderen Gerät benutzen zu können, benötigst du den folgenden Code. Notiere ihn dir jetzt und lasse die Notiz zuhause, damit deine Geheimnisse während der Reise geschützt sind.";
"CouldNotConnect" = "Die Verbindung zum Server konnte nicht hergestellt werden. Bitte überprüfe die folgenden Angaben und passe sie ggf. an.";
"ConnectingToMailServer" = "Verbinde zum Mailserver";
"Contacts" = "Kontakte";
diff --git a/enzevalos_iphone/en.lproj/Localizable.strings b/enzevalos_iphone/en.lproj/Localizable.strings
index c8c42edbff4c739e6b53c63177cefc3062f7bb0f..84b0b8a8dd09dfdd67280ae526ba01fc3f54a4b6 100644
--- a/enzevalos_iphone/en.lproj/Localizable.strings
+++ b/enzevalos_iphone/en.lproj/Localizable.strings
@@ -20,6 +20,7 @@
"Cc" = "CC";
"Checkmarks" = "You received Mails from Mailadresses with checkmarks";
"codeExplanation" = "In order to use the secret on an other device, you need the following code. You can find the code again in this view, if you want to transfer it later.";
+"codeExplanationTravel" = "In order to use the secret on an other device, you need the following code. Make a note of it now and leave it at home to ensure your secret is secure, while you travel.";
"CouldNotConnect" = "Couldn't connect to server. Please check your data and modify it maybe.";
"ConnectingToMailServer" = "Connecting to mailserver";
"Contacts" = "Contacts";