diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index c343b2e737e27cecd925888087c4be67c0967d00..7dd4be458cd0e5332ab32d61fa87690670b9865b 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -49,6 +49,7 @@
4751C6FC2344C8D1006B2A4D /* KeyTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4751C6FB2344C8D1006B2A4D /* KeyTableViewController.swift */; };
4751C7002344D37C006B2A4D /* SecretKey+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4751C6FE2344D37C006B2A4D /* SecretKey+CoreDataClass.swift */; };
4751C7012344D37C006B2A4D /* SecretKey+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4751C6FF2344D37C006B2A4D /* SecretKey+CoreDataProperties.swift */; };
+ 4751C70323464C81006B2A4D /* ImportKeyOverviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4751C70223464C80006B2A4D /* ImportKeyOverviewController.swift */; };
4756DE0E20402F8E00452288 /* invitationTextCensor.html in Resources */ = {isa = PBXBuildFile; fileRef = 4756DE0D20402F8E00452288 /* invitationTextCensor.html */; };
475B00331F7B9565006CDD41 /* SwiftPGP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475B00301F7B9565006CDD41 /* SwiftPGP.swift */; };
475B00341F7B9565006CDD41 /* Cryptography.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475B00311F7B9565006CDD41 /* Cryptography.swift */; };
@@ -301,6 +302,7 @@
4751C6FD2344D169006B2A4D /* enzevalos_iphone 8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "enzevalos_iphone 8.xcdatamodel"; sourceTree = "<group>"; };
4751C6FE2344D37C006B2A4D /* SecretKey+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SecretKey+CoreDataClass.swift"; sourceTree = "<group>"; };
4751C6FF2344D37C006B2A4D /* SecretKey+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SecretKey+CoreDataProperties.swift"; sourceTree = "<group>"; };
+ 4751C70223464C80006B2A4D /* ImportKeyOverviewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ImportKeyOverviewController.swift; path = /Users/Olli/enzevalos/test2/enzevalos_iphone/enzevalos_iphone/ImportKeyOverviewController.swift; sourceTree = "<absolute>"; };
4756DE0D20402F8E00452288 /* invitationTextCensor.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = invitationTextCensor.html; path = Invitation/invitationTextCensor.html; sourceTree = "<group>"; };
475B00301F7B9565006CDD41 /* SwiftPGP.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftPGP.swift; sourceTree = "<group>"; };
475B00311F7B9565006CDD41 /* Cryptography.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cryptography.swift; sourceTree = "<group>"; };
@@ -1047,6 +1049,7 @@
A1D5076D1E80254D00B68B38 /* keyView */ = {
isa = PBXGroup;
children = (
+ 4751C70223464C80006B2A4D /* ImportKeyOverviewController.swift */,
4751C6F923449699006B2A4D /* CryptoManagementViewController.swift */,
A1D5076E1E80257A00B68B38 /* KeyViewController.swift */,
477670C3228453FB00043604 /* ButtonCell.xib */,
@@ -1554,6 +1557,7 @@
4707096D1F8F9F4900657F41 /* ExportViewController.swift in Sources */,
F12060801DA540FE00F6EF37 /* RefreshControlExtension.swift in Sources */,
4751C6FC2344C8D1006B2A4D /* KeyTableViewController.swift in Sources */,
+ 4751C70323464C81006B2A4D /* ImportKeyOverviewController.swift in Sources */,
A13526811D955BDF00D3BFE1 /* enzevalos_iphone.xcdatamodeld in Sources */,
472F39821E1E5347009260FB /* Mail_Address+CoreDataProperties.swift in Sources */,
477548E221F77466000B22A8 /* SecurityIndicator.swift in Sources */,
diff --git a/enzevalos_iphone/Base.lproj/Main.storyboard b/enzevalos_iphone/Base.lproj/Main.storyboard
index 78c80a6e0bf627bbafcc28c299e3addd84013651..6a9d7bb39f48f2a04c54ff3c3ce4d9bc3afc2808 100644
--- a/enzevalos_iphone/Base.lproj/Main.storyboard
+++ b/enzevalos_iphone/Base.lproj/Main.storyboard
@@ -16,7 +16,7 @@
<objects>
<tableViewController storyboardIdentifier="UITableViewController-Ouw-WD-EV6" id="Ouw-WD-EV6" customClass="ReadViewController" customModule="enzevalos_iphone" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="8" sectionFooterHeight="1" id="oZT-OA-Re5">
- <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<sections>
@@ -182,7 +182,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qTi-rO-CH3">
- <rect key="frame" x="187.66666666666663" y="5.6666666666666679" width="186.33333333333337" height="33"/>
+ <rect key="frame" x="187.66666666666663" y="0.0" width="186.33333333333337" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="voC-CF-ncN"/>
</constraints>
@@ -591,6 +591,59 @@
</objects>
<point key="canvasLocation" x="3210" y="-1138"/>
</scene>
+ <!--Import Key Overview Controller-->
+ <scene sceneID="hig-sG-hkl">
+ <objects>
+ <tableViewController storyboardIdentifier="ImportKeyOverview" useStoryboardIdentifierAsRestorationIdentifier="YES" id="6Ib-ya-r4X" customClass="ImportKeyOverviewController" sceneMemberID="viewController">
+ <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="0W5-nq-uJy">
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <prototypes>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="InfoText" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InfoText" textLabel="RzJ-lh-4Kh" style="IBUITableViewCellStyleDefault" id="Qj6-zf-zg2">
+ <rect key="frame" x="0.0" y="28" width="414" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Qj6-zf-zg2" id="q93-0z-hqB">
+ <rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RzJ-lh-4Kh">
+ <rect key="frame" x="20" y="0.0" width="374" height="43.666666666666664"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ </tableViewCellContentView>
+ </tableViewCell>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="iTunesButton" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="iTunesButton" id="cyz-Hr-lcc" customClass="ButtonCell" customModule="enzevalos_iphone" customModuleProvider="target">
+ <rect key="frame" x="0.0" y="72" width="414" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cyz-Hr-lcc" id="1To-y3-zpU">
+ <rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </tableViewCellContentView>
+ </tableViewCell>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PasteButton" id="nu9-Sv-yyP" customClass="ButtonCell" customModule="enzevalos_iphone" customModuleProvider="target">
+ <rect key="frame" x="0.0" y="116" width="414" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nu9-Sv-yyP" id="RtY-T7-d0c">
+ <rect key="frame" x="0.0" y="0.0" width="414" height="43.666666666666664"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </tableViewCellContentView>
+ </tableViewCell>
+ </prototypes>
+ <connections>
+ <outlet property="dataSource" destination="6Ib-ya-r4X" id="wbc-5C-BFq"/>
+ <outlet property="delegate" destination="6Ib-ya-r4X" id="4gv-LS-Ksd"/>
+ </connections>
+ </tableView>
+ </tableViewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="slJ-Gq-9XY" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="4691" y="-1562"/>
+ </scene>
<!--Folder View Controller-->
<scene sceneID="QFr-kU-bDH">
<objects>
@@ -684,8 +737,8 @@
<constraint firstAttribute="width" constant="15" id="ons-Pp-k3n"/>
</constraints>
</imageView>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sfv-2Q-95I">
- <rect key="frame" x="0.0" y="15" width="15" height="18"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sfv-2Q-95I">
+ <rect key="frame" x="0.0" y="18" width="15" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="SmT-9e-ovi"/>
<constraint firstAttribute="width" constant="15" id="uKU-PK-flD"/>
@@ -775,7 +828,7 @@
<objects>
<tableViewController storyboardIdentifier="UITableViewController-ooe-0X-glz" id="ooe-0X-glz" customClass="ListViewController" customModule="enzevalos_iphone" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="ipK-4X-lVA">
- <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
@@ -861,7 +914,7 @@
<objects>
<tableViewController storyboardIdentifier="UITableViewController-8Di-x2-cWQ" useStoryboardIdentifierAsRestorationIdentifier="YES" id="8Di-x2-cWQ" customClass="ContactViewController" customModule="enzevalos_iphone" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="lK7-ug-OyQ">
- <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
@@ -1237,7 +1290,7 @@
<rect key="frame" x="0.0" y="809.33333333333337" width="414" 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="388" height="43.666666666666664"/>
+ <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ll6-yF-xkq">
@@ -1306,7 +1359,7 @@
<objects>
<viewController id="jYD-fk-aIP" customClass="KeyViewController" customModule="enzevalos_iphone" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="ZAH-bZ-S6n">
- <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<edgeInsets key="layoutMargins" top="10" left="20" bottom="10" right="20"/>
@@ -1489,7 +1542,7 @@
<objects>
<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="414" height="808"/>
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<prototypes>
@@ -1503,7 +1556,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QmG-XY-YlD">
<rect key="frame" x="20" y="10.999999999999972" width="374" height="503.33333333333326"/>
<subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="clip" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IEj-77-gTt">
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="clip" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IEj-77-gTt">
<rect key="frame" x="3" y="5" width="358" height="182.66666666666666"/>
<string key="text">Damit deine sicheren E-Mails gelesen werden können, muss man ein Geheimnis kennen. Dieses befindet sich momentan auf deinem Smartphone.
Um deine sicheren E-Mails auch auf einem anderen Gerät lesen zu können, muss das Geheimnis von diesem Gerät auf das andere übertragen werden. Wenn du das tun möchtest, öffne auf dem anderen Gerät die</string>
@@ -1977,7 +2030,7 @@ Um deine sicheren E-Mails auch auf einem anderen Gerät lesen zu können, muss d
</connections>
</barButtonItem>
<button key="titleView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="iUk-lk-1LN">
- <rect key="frame" x="161.66666666666666" y="6" width="91" height="32"/>
+ <rect key="frame" x="162" y="6" width="91" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<connections>
<action selector="iconButtonPressed:" destination="4Ey-v4-VeB" eventType="touchUpInside" id="Opj-Y1-Vtg"/>
@@ -2064,6 +2117,6 @@ Um deine sicheren E-Mails auch auf einem anderen Gerät lesen zu können, muss d
<segue reference="DcR-GX-scc"/>
<segue reference="NPH-pL-mw2"/>
<segue reference="7Fo-Cp-0Kl"/>
- <segue reference="PxQ-Nb-6Fq"/>
+ <segue reference="6Ug-AV-lba"/>
</inferredMetricsTieBreakers>
</document>
diff --git a/enzevalos_iphone/ExportInfoViewController.swift b/enzevalos_iphone/ExportInfoViewController.swift
index dd9b4868834a7401aac5d9928a2b713725cc8e98..9d008012a60b58890d8e51c86045c2a675eb25f0 100644
--- a/enzevalos_iphone/ExportInfoViewController.swift
+++ b/enzevalos_iphone/ExportInfoViewController.swift
@@ -69,7 +69,7 @@ class ExportInfoViewController: UITableViewController {
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "ExportInfoCell") as! ExportInfoCell
- cell.infoTextLabel.text = NSLocalizedString("ExportInfoViewText", comment: "")
+ cell.infoTextLabel.text = NSLocalizedString("Export.InfoView.Text", comment: "")
let qrCodeImage = QRCode.generate(input: "https://" + url)
let scaleX = cell.qrCode.frame.size.width / qrCodeImage.extent.size.width
diff --git a/enzevalos_iphone/ImportKeyOverviewController.swift b/enzevalos_iphone/ImportKeyOverviewController.swift
new file mode 100644
index 0000000000000000000000000000000000000000..652daa1ec7dc1654a93a966b8b2494f3cb296533
--- /dev/null
+++ b/enzevalos_iphone/ImportKeyOverviewController.swift
@@ -0,0 +1,117 @@
+//
+// ImportKeyOverviewController.swift
+//
+//
+// Created by Oliver Wiese on 03.10.19.
+//
+
+import UIKit
+
+class ImportKeyOverviewController: UITableViewController {
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+
+ // Uncomment the following line to preserve selection between presentations
+ // self.clearsSelectionOnViewWillAppear = false
+
+ // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+ // self.navigationItem.rightBarButtonItem = self.editButtonItem
+ }
+
+ // MARK: - Table view data source
+
+ override func numberOfSections(in tableView: UITableView) -> Int {
+ return 3
+ }
+
+ override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+ return 1
+ }
+
+
+ override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+ var identifier = "InfoText"
+ if indexPath.section == 0 {
+ // Info field
+ identifier = "InfoText"
+ let cell = tableView.dequeueReusableCell(withIdentifier: identifier, for: indexPath)
+ cell.textLabel?.text = "Eigentlich werden die Schlüssel zu den Identitäten in Mails gefunden. Aber du kannst auch Schlüssel mittels iTunes hinzufügen oder als Text einfügen. Letzteres kann verwendet werden um zum Beispiel einen PGP-Schlüssel von der Webseite einer Person zu importieren. Diese beginnen mit ======== Begin Public KEY ========...."
+ return cell
+ } else if indexPath.section == 1 {
+ // iTunes import
+ identifier = "iTunesButton"
+ if let cell = tableView.dequeueReusableCell(withIdentifier: identifier, for: indexPath) as? ButtonCell {
+ cell.button.setTitle(NSLocalizedString("Import.Button.Itunes", comment: "import from iTunes"), for: .disabled)
+ cell.id = KeyActions.Copy.hashValue
+ // cell.listener = self
+ // copyButton = cell
+ return cell
+
+ }
+
+
+ } else {
+ // paste import
+ identifier = "PasteButton"
+ if let cell = tableView.dequeueReusableCell(withIdentifier: identifier, for: indexPath) as? ButtonCell {
+ cell.button.setTitle(NSLocalizedString("Import.Button.Paste", comment: "import from clipboard"), for: .disabled)
+ cell.id = KeyActions.Copy.hashValue
+ // cell.listener = self
+ // copyButton = cell
+ return cell
+
+ }
+ }
+ // Configure the cell...
+ let cell = tableView.dequeueReusableCell(withIdentifier: identifier, for: indexPath)
+ return cell
+ }
+
+
+ /*
+ // Override to support conditional editing of the table view.
+ override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
+ // Return false if you do not want the specified item to be editable.
+ return true
+ }
+ */
+
+ /*
+ // Override to support editing the table view.
+ override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
+ if editingStyle == .delete {
+ // Delete the row from the data source
+ tableView.deleteRows(at: [indexPath], with: .fade)
+ } else if editingStyle == .insert {
+ // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
+ }
+ }
+ */
+
+ /*
+ // Override to support rearranging the table view.
+ override func tableView(_ tableView: UITableView, moveRowAt fromIndexPath: IndexPath, to: IndexPath) {
+
+ }
+ */
+
+ /*
+ // Override to support conditional rearranging of the table view.
+ override func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {
+ // Return false if you do not want the item to be re-orderable.
+ return true
+ }
+ */
+
+ /*
+ // MARK: - Navigation
+
+ // In a storyboard-based application, you will often want to do a little preparation before navigation
+ override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+ // Get the new view controller using segue.destination.
+ // Pass the selected object to the new view controller.
+ }
+ */
+
+}
diff --git a/enzevalos_iphone/de.lproj/Localizable.strings b/enzevalos_iphone/de.lproj/Localizable.strings
index b6865c0179c0267d69bb3ee7e9f24b438d4e19b9..018d883bcd9b2492ab96d0be5e236ced8da9f9fe 100644
--- a/enzevalos_iphone/de.lproj/Localizable.strings
+++ b/enzevalos_iphone/de.lproj/Localizable.strings
@@ -37,7 +37,7 @@
"Emailaddress" = "Mailadresse";
"EncryptionType" = "Verschlüsselungsart";
"EverythingCorrect" = "Alles richtig?";
-"ExportInfoViewText" = "Du kannst vertrauliche Mails auf einem Gerät nur lesen, wenn das Gerät kennt den geheimen Schlüssel. Der geheime Schlüssel befindet nur sich auf deinem iPhone. Er kann einfach und sicher übertragen werden. Wenn du das tun möchtest, öffne auf einem anderen Gerät die";
+"Export.InfoView.Text" = "Du kannst vertrauliche Mails auf einem Gerät nur lesen, wenn das Gerät kennt den geheimen Schlüssel. Der geheime Schlüssel befindet nur sich auf deinem iPhone. Er kann einfach und vertrauchlich per Mail übertragen werden. \n\n Zu erst muss auf dem anderen Gerät ein passendes Mailprogramm, zum Beispiel Thunderbird mit Enigmail, installiert werden. Auf unserer Webseite finden sich dafür mehr Informationen. \n\n Danach wird dein geheimer Schlüssel vertraulich an deine Mail-Adresse versendet. Auf dem anderen Gerät öffnest du die Mail und gibst einen Code ein. Der Code wird auf dem iPhone angezeigt. \n\n Mehr Informationen und ein Video befinden sich auf unserer Webseite. Bitte öffne den unteren Link auf deinem anderen Gerät bevor du fortsetzt. Linkt zur Webseite: ";
"ExportKeyMailWasSentTopLabel" = "Dein geheimer Schlüssel wurde in einer Mail an die Adresse";
"ExportKeyMailWasSentBottomLabel" = "geschickt.";
"ExportKeyMailWillBeSentTopLabel" = "Dein geheimer Schlüssel wird in einer Mail an die Adresse";
diff --git a/enzevalos_iphone/en.lproj/Localizable.strings b/enzevalos_iphone/en.lproj/Localizable.strings
index 325a7d590c7e4b9f842c228a63419b0df7b8393a..e6c606d8bee1ceacc52fe8693c21822a847b25bf 100644
--- a/enzevalos_iphone/en.lproj/Localizable.strings
+++ b/enzevalos_iphone/en.lproj/Localizable.strings
@@ -37,7 +37,7 @@
"Emailaddress" = "Mail address";
"EncryptionType" = "Encryption Type";
"EverythingCorrect" = "Everything correct?";
-"ExportInfoViewText" = "You can only read your confidential mails on a device if the device knows the secret. This secret is located on your iPhone. \nThis secret can be transferred easily and securely. If you want to do that, open on the other device the";
+"Export.InfoView.Text" = "You can only read your confidential mails on a device if the device with a the secret key. This secret key is located on your iPhone, but can be transferred easily and confidentially via mail. \n\n First, you have to install Thunderbird with Enigmail or another supported mail client on your other device. You find more information and instructions on our website. \n\n Second, your secret key will be send confidentially to yourself. On your other device, you open the mail and enter a code to import your secret key. The code will be shown on your iPhone. \n\n You find more information and a video on our website. Please, follow the link below on your other device and setup your device before continuing on your phone. Link to website: ";
"ExportKeyMailWasSentTopLabel" = "Your secret key was sent in a mail to the address";
"ExportKeyMailWasSentBottomLabel" = "";
"ExportKeyMailWillBeSentTopLabel" = "Your secret key will be sent in a mail to the address";