diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index 57e7d39a8b347e8b9999de33389556e5fec5b645..d470eaabd8aa688c436989a27f138ab005f9f1be 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -59,6 +59,8 @@
476916A2216B86CF00491527 /* EnzevalosContact+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 476916A1216B86CF00491527 /* EnzevalosContact+CoreDataClass.swift */; };
47691A8A1ECB56D1004BCFC5 /* Mail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47691A891ECB56D1004BCFC5 /* Mail.swift */; };
47691A8C1ECC3EC7004BCFC5 /* EphemeralMail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47691A8B1ECC3EC7004BCFC5 /* EphemeralMail.swift */; };
+ 476EEF9922A872BF00BB4EF7 /* enzevalos_iphoneUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 476EEF9822A872BF00BB4EF7 /* enzevalos_iphoneUITests.swift */; };
+ 476EEFA122A873A800BB4EF7 /* OnboardingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 476EEFA022A873A800BB4EF7 /* OnboardingTest.swift */; };
477548DE21F5DABE000B22A8 /* MailServerConnectionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477548DD21F5DABE000B22A8 /* MailServerConnectionError.swift */; };
477548E221F77466000B22A8 /* SecurityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477548E121F77466000B22A8 /* SecurityIndicator.swift */; };
477548E421F77BA0000B22A8 /* StudyParameterProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477548E321F77BA0000B22A8 /* StudyParameterProtocol.swift */; };
@@ -79,9 +81,6 @@
479C649621F2139B00A01071 /* support_pk.asc in Resources */ = {isa = PBXBuildFile; fileRef = 479C649521F2139B00A01071 /* support_pk.asc */; };
479C649A21F45DAF00A01071 /* HideShowPasswordTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479C649821F45DAF00A01071 /* HideShowPasswordTextField.swift */; };
479C649B21F45DAF00A01071 /* PasswordToggleVisibilityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479C649921F45DAF00A01071 /* PasswordToggleVisibilityView.swift */; };
- 47A5D6D42294A8F60084F81D /* OnboardingTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A5D6D32294A8F60084F81D /* OnboardingTest.swift */; };
- 47A5D6D92294B4EC0084F81D /* ObjectivePGP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47CEF4EC2052C3E600887CDB /* ObjectivePGP.framework */; };
- 47A5D6DA2294B50E0084F81D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 47F867E12052B48E00AA832F /* libz.tbd */; settings = {ATTRIBUTES = (Required, ); }; };
47A5D6E22294BF3B0084F81D /* TempKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A5D6E12294BF3A0084F81D /* TempKey.swift */; };
47A5D6E42294BFF50084F81D /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A5D6E32294BFF50084F81D /* Logger.swift */; };
47C22281218AFD6300BD2C2B /* AutocryptTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47C22280218AFD6300BD2C2B /* AutocryptTest.swift */; };
@@ -137,7 +136,6 @@
A13526791D955BDF00D3BFE1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A13526781D955BDF00D3BFE1 /* AppDelegate.swift */; };
A13526811D955BDF00D3BFE1 /* enzevalos_iphone.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = A135267F1D955BDF00D3BFE1 /* enzevalos_iphone.xcdatamodeld */; };
A13526861D955BDF00D3BFE1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A13526841D955BDF00D3BFE1 /* LaunchScreen.storyboard */; };
- A135269C1D955BE000D3BFE1 /* enzevalos_iphoneUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A135269B1D955BE000D3BFE1 /* enzevalos_iphoneUITests.swift */; };
A142E70921E7919F000395E3 /* IntroContactViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A142E70821E7919F000395E3 /* IntroContactViewController.swift */; };
A15D215B223BE5F4003E0CE0 /* TempAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = A15D215A223BE5F4003E0CE0 /* TempAttachment.swift */; };
A15D215D223BE614003E0CE0 /* attachment.eml in Resources */ = {isa = PBXBuildFile; fileRef = A15D215C223BE614003E0CE0 /* attachment.eml */; };
@@ -186,7 +184,6 @@
A1F992391DA7DD2E0073BF1B /* InboxTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A1F9923B1DA7DD2E0073BF1B /* InboxTableViewCell.xib */; };
A1FA44A721E10E1400DB02AC /* TravelHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1FA44A621E10E1400DB02AC /* TravelHandler.swift */; };
AC4001CA169DC07A7A1E3AD3 /* Pods_enzevalos_iphone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94EE54279AB591E0CAB8EFD8 /* Pods_enzevalos_iphone.framework */; };
- D630501DC9A8FA6EAD919B96 /* Pods_enzevalos_iphoneUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF232CF5EE5EE7B9838EBDF4 /* Pods_enzevalos_iphoneUITests.framework */; };
F113C3851F30D06800E7F1D6 /* QRScannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F113C3841F30D06800E7F1D6 /* QRScannerView.swift */; };
F113C38B1F3344C200E7F1D6 /* ViewControllerPannable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F113C38A1F3344C200E7F1D6 /* ViewControllerPannable.swift */; };
F119D2901E364B59001D732A /* AnimatedSendIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = F119D28F1E364B59001D732A /* AnimatedSendIcon.swift */; };
@@ -212,14 +209,14 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- A135268D1D955BE000D3BFE1 /* PBXContainerItemProxy */ = {
+ 476EEF9B22A872BF00BB4EF7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A135266D1D955BDF00D3BFE1 /* Project object */;
proxyType = 1;
remoteGlobalIDString = A13526741D955BDF00D3BFE1;
remoteInfo = enzevalos_iphone;
};
- A13526981D955BE000D3BFE1 /* PBXContainerItemProxy */ = {
+ A135268D1D955BE000D3BFE1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = A135266D1D955BDF00D3BFE1 /* Project object */;
proxyType = 1;
@@ -298,6 +295,10 @@
476916A1216B86CF00491527 /* EnzevalosContact+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EnzevalosContact+CoreDataClass.swift"; sourceTree = "<group>"; };
47691A891ECB56D1004BCFC5 /* Mail.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mail.swift; sourceTree = "<group>"; };
47691A8B1ECC3EC7004BCFC5 /* EphemeralMail.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EphemeralMail.swift; sourceTree = "<group>"; };
+ 476EEF9622A872BF00BB4EF7 /* enzevalos_iphoneUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = enzevalos_iphoneUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+ 476EEF9822A872BF00BB4EF7 /* enzevalos_iphoneUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = enzevalos_iphoneUITests.swift; sourceTree = "<group>"; };
+ 476EEF9A22A872BF00BB4EF7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 476EEFA022A873A800BB4EF7 /* OnboardingTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingTest.swift; sourceTree = "<group>"; };
477548DD21F5DABE000B22A8 /* MailServerConnectionError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailServerConnectionError.swift; sourceTree = "<group>"; };
477548E121F77466000B22A8 /* SecurityIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityIndicator.swift; sourceTree = "<group>"; };
477548E321F77BA0000B22A8 /* StudyParameterProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyParameterProtocol.swift; sourceTree = "<group>"; };
@@ -314,7 +315,6 @@
479C649521F2139B00A01071 /* support_pk.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = support_pk.asc; sourceTree = "<group>"; };
479C649821F45DAF00A01071 /* HideShowPasswordTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HideShowPasswordTextField.swift; sourceTree = "<group>"; };
479C649921F45DAF00A01071 /* PasswordToggleVisibilityView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordToggleVisibilityView.swift; sourceTree = "<group>"; };
- 47A5D6D32294A8F60084F81D /* OnboardingTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTest.swift; sourceTree = "<group>"; };
47A5D6D52294B4830084F81D /* GTMAppAuth.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GTMAppAuth.framework; sourceTree = BUILT_PRODUCTS_DIR; };
47A5D6DB2294B5220084F81D /* libz.1.1.3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.1.1.3.tbd; path = usr/lib/libz.1.1.3.tbd; sourceTree = SDKROOT; };
47A5D6DD2294B5480084F81D /* AppAuth.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppAuth.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -384,9 +384,6 @@
A13526801D955BDF00D3BFE1 /* enzevalos_iphone.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = enzevalos_iphone.xcdatamodel; sourceTree = "<group>"; };
A135268C1D955BE000D3BFE1 /* enzevalos_iphoneTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = enzevalos_iphoneTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
A13526921D955BE000D3BFE1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- A13526971D955BE000D3BFE1 /* enzevalos_iphoneUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = enzevalos_iphoneUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
- A135269B1D955BE000D3BFE1 /* enzevalos_iphoneUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = enzevalos_iphoneUITests.swift; sourceTree = "<group>"; };
- A135269D1D955BE000D3BFE1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A142E70821E7919F000395E3 /* IntroContactViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntroContactViewController.swift; sourceTree = "<group>"; };
A15D215A223BE5F4003E0CE0 /* TempAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TempAttachment.swift; sourceTree = "<group>"; };
A15D215C223BE614003E0CE0 /* attachment.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = attachment.eml; sourceTree = "<group>"; };
@@ -480,6 +477,13 @@
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
+ 476EEF9322A872BF00BB4EF7 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
A13526721D955BDF00D3BFE1 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -505,16 +509,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- A13526941D955BE000D3BFE1 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 47A5D6DA2294B50E0084F81D /* libz.tbd in Frameworks */,
- 47A5D6D92294B4EC0084F81D /* ObjectivePGP.framework in Frameworks */,
- D630501DC9A8FA6EAD919B96 /* Pods_enzevalos_iphoneUITests.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -611,6 +605,16 @@
name = protocols;
sourceTree = "<group>";
};
+ 476EEF9722A872BF00BB4EF7 /* enzevalos_iphoneUITests */ = {
+ isa = PBXGroup;
+ children = (
+ 476EEF9822A872BF00BB4EF7 /* enzevalos_iphoneUITests.swift */,
+ 476EEFA022A873A800BB4EF7 /* OnboardingTest.swift */,
+ 476EEF9A22A872BF00BB4EF7 /* Info.plist */,
+ );
+ path = enzevalos_iphoneUITests;
+ sourceTree = "<group>";
+ };
477548DC21F5DA46000B22A8 /* mail */ = {
isa = PBXGroup;
children = (
@@ -809,7 +813,7 @@
47CEF4EA2052C3C700887CDB /* ObjectivePGP.framework */,
A13526771D955BDF00D3BFE1 /* enzevalos_iphone */,
A135268F1D955BE000D3BFE1 /* enzevalos_iphoneTests */,
- A135269A1D955BE000D3BFE1 /* enzevalos_iphoneUITests */,
+ 476EEF9722A872BF00BB4EF7 /* enzevalos_iphoneUITests */,
A13526761D955BDF00D3BFE1 /* Products */,
24472862977D71D3F0AD0D58 /* Pods */,
78280F99990BFF65543B7F0B /* Frameworks */,
@@ -821,7 +825,7 @@
children = (
A13526751D955BDF00D3BFE1 /* enzevalos_iphone.app */,
A135268C1D955BE000D3BFE1 /* enzevalos_iphoneTests.xctest */,
- A13526971D955BE000D3BFE1 /* enzevalos_iphoneUITests.xctest */,
+ 476EEF9622A872BF00BB4EF7 /* enzevalos_iphoneUITests.xctest */,
);
name = Products;
sourceTree = "<group>";
@@ -886,16 +890,6 @@
path = enzevalos_iphoneTests;
sourceTree = "<group>";
};
- A135269A1D955BE000D3BFE1 /* enzevalos_iphoneUITests */ = {
- isa = PBXGroup;
- children = (
- A135269B1D955BE000D3BFE1 /* enzevalos_iphoneUITests.swift */,
- 47A5D6D32294A8F60084F81D /* OnboardingTest.swift */,
- A135269D1D955BE000D3BFE1 /* Info.plist */,
- );
- path = enzevalos_iphoneUITests;
- sourceTree = "<group>";
- };
A13A166421E6918600757890 /* views */ = {
isa = PBXGroup;
children = (
@@ -1100,6 +1094,24 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
+ 476EEF9522A872BF00BB4EF7 /* enzevalos_iphoneUITests */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 476EEF9D22A872BF00BB4EF7 /* Build configuration list for PBXNativeTarget "enzevalos_iphoneUITests" */;
+ buildPhases = (
+ 476EEF9222A872BF00BB4EF7 /* Sources */,
+ 476EEF9322A872BF00BB4EF7 /* Frameworks */,
+ 476EEF9422A872BF00BB4EF7 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ 476EEF9C22A872BF00BB4EF7 /* PBXTargetDependency */,
+ );
+ name = enzevalos_iphoneUITests;
+ productName = enzevalos_iphoneUITests;
+ productReference = 476EEF9622A872BF00BB4EF7 /* enzevalos_iphoneUITests.xctest */;
+ productType = "com.apple.product-type.bundle.ui-testing";
+ };
A13526741D955BDF00D3BFE1 /* enzevalos_iphone */ = {
isa = PBXNativeTarget;
buildConfigurationList = A13526A01D955BE000D3BFE1 /* Build configuration list for PBXNativeTarget "enzevalos_iphone" */;
@@ -1140,25 +1152,6 @@
productReference = A135268C1D955BE000D3BFE1 /* enzevalos_iphoneTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
- A13526961D955BE000D3BFE1 /* enzevalos_iphoneUITests */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = A13526A61D955BE000D3BFE1 /* Build configuration list for PBXNativeTarget "enzevalos_iphoneUITests" */;
- buildPhases = (
- CB3E7E0953A94645ED8E830A /* [CP] Check Pods Manifest.lock */,
- A13526931D955BE000D3BFE1 /* Sources */,
- A13526941D955BE000D3BFE1 /* Frameworks */,
- A13526951D955BE000D3BFE1 /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- A13526991D955BE000D3BFE1 /* PBXTargetDependency */,
- );
- name = enzevalos_iphoneUITests;
- productName = enzevalos_iphoneUITests;
- productReference = A13526971D955BE000D3BFE1 /* enzevalos_iphoneUITests.xctest */;
- productType = "com.apple.product-type.bundle.ui-testing";
- };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -1168,10 +1161,16 @@
KnownAssetTags = (
MailCoreRessources,
);
- LastSwiftUpdateCheck = 0730;
+ LastSwiftUpdateCheck = 1010;
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "fu-berlin";
TargetAttributes = {
+ 476EEF9522A872BF00BB4EF7 = {
+ CreatedOnToolsVersion = 10.1;
+ DevelopmentTeam = VJ9C93G68Y;
+ ProvisioningStyle = Automatic;
+ TestTargetID = A13526741D955BDF00D3BFE1;
+ };
A13526741D955BDF00D3BFE1 = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = VJ9C93G68Y;
@@ -1194,12 +1193,6 @@
DevelopmentTeam = 4377G946WP;
LastSwiftMigration = 1010;
};
- A13526961D955BE000D3BFE1 = {
- CreatedOnToolsVersion = 7.3.1;
- DevelopmentTeam = 4377G946WP;
- LastSwiftMigration = 1010;
- TestTargetID = A13526741D955BDF00D3BFE1;
- };
};
};
buildConfigurationList = A13526701D955BDF00D3BFE1 /* Build configuration list for PBXProject "enzevalos_iphone" */;
@@ -1218,12 +1211,19 @@
targets = (
A13526741D955BDF00D3BFE1 /* enzevalos_iphone */,
A135268B1D955BE000D3BFE1 /* enzevalos_iphoneTests */,
- A13526961D955BE000D3BFE1 /* enzevalos_iphoneUITests */,
+ 476EEF9522A872BF00BB4EF7 /* enzevalos_iphoneUITests */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
+ 476EEF9422A872BF00BB4EF7 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
A13526731D955BDF00D3BFE1 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -1289,13 +1289,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- A13526951D955BE000D3BFE1 /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
@@ -1371,24 +1364,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
- CB3E7E0953A94645ED8E830A /* [CP] Check Pods Manifest.lock */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
- "${PODS_ROOT}/Manifest.lock",
- );
- name = "[CP] Check Pods Manifest.lock";
- outputPaths = (
- "$(DERIVED_FILE_DIR)/Pods-enzevalos_iphoneUITests-checkManifestLockResult.txt",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
- showEnvVarsInLog = 0;
- };
D6F0EB205D61EA8C8A045390 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -1410,6 +1385,15 @@
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
+ 476EEF9222A872BF00BB4EF7 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 476EEFA122A873A800BB4EF7 /* OnboardingTest.swift in Sources */,
+ 476EEF9922A872BF00BB4EF7 /* enzevalos_iphoneUITests.swift in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
A13526711D955BDF00D3BFE1 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -1558,27 +1542,18 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- A13526931D955BE000D3BFE1 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 47A5D6D42294A8F60084F81D /* OnboardingTest.swift in Sources */,
- A135269C1D955BE000D3BFE1 /* enzevalos_iphoneUITests.swift in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- A135268E1D955BE000D3BFE1 /* PBXTargetDependency */ = {
+ 476EEF9C22A872BF00BB4EF7 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = A13526741D955BDF00D3BFE1 /* enzevalos_iphone */;
- targetProxy = A135268D1D955BE000D3BFE1 /* PBXContainerItemProxy */;
+ targetProxy = 476EEF9B22A872BF00BB4EF7 /* PBXContainerItemProxy */;
};
- A13526991D955BE000D3BFE1 /* PBXTargetDependency */ = {
+ A135268E1D955BE000D3BFE1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = A13526741D955BDF00D3BFE1 /* enzevalos_iphone */;
- targetProxy = A13526981D955BE000D3BFE1 /* PBXContainerItemProxy */;
+ targetProxy = A135268D1D955BE000D3BFE1 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@@ -1652,6 +1627,56 @@
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
+ 476EEF9E22A872BF00BB4EF7 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+ CODE_SIGN_IDENTITY = "iPhone Developer";
+ CODE_SIGN_STYLE = Automatic;
+ DEVELOPMENT_TEAM = VJ9C93G68Y;
+ GCC_C_LANGUAGE_STANDARD = gnu11;
+ INFOPLIST_FILE = enzevalos_iphoneUITests/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+ MTL_FAST_MATH = YES;
+ PRODUCT_BUNDLE_IDENTIFIER = "FU-Berlin.enzevalos-iphoneUITests";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+ SWIFT_VERSION = 4.2;
+ TARGETED_DEVICE_FAMILY = "1,2";
+ TEST_TARGET_NAME = enzevalos_iphone;
+ };
+ name = Debug;
+ };
+ 476EEF9F22A872BF00BB4EF7 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+ CODE_SIGN_IDENTITY = "iPhone Developer";
+ CODE_SIGN_STYLE = Automatic;
+ DEVELOPMENT_TEAM = VJ9C93G68Y;
+ GCC_C_LANGUAGE_STANDARD = gnu11;
+ INFOPLIST_FILE = enzevalos_iphoneUITests/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+ MTL_FAST_MATH = YES;
+ PRODUCT_BUNDLE_IDENTIFIER = "FU-Berlin.enzevalos-iphoneUITests";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 4.2;
+ TARGETED_DEVICE_FAMILY = "1,2";
+ TEST_TARGET_NAME = enzevalos_iphone;
+ };
+ name = Release;
+ };
A135269E1D955BE000D3BFE1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -1932,59 +1957,18 @@
};
name = Release;
};
- A13526A71D955BE000D3BFE1 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 66E758F271CD65AB3E5FE7A7 /* Pods-enzevalos_iphoneUITests.debug.xcconfig */;
- buildSettings = {
- BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/enzevalos_iphone.app/enzevalos_iphone";
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(PROJECT_DIR)/enzevalos_iphone",
- "$(PROJECT_DIR)_workspace",
- );
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- INFOPLIST_FILE = enzevalos_iphoneUITests/Info.plist;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"${PODS_ROOT}/OpenSSL-Universal/lib-ios\"",
- "$(inherited)",
- );
- PRODUCT_BUNDLE_IDENTIFIER = "fu-berlin.enzevalos-iphoneUITests";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.2;
- TEST_TARGET_NAME = enzevalos_iphone;
- };
- name = Debug;
- };
- A13526A81D955BE000D3BFE1 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 8B87EFB6CEAA31452F744015 /* Pods-enzevalos_iphoneUITests.release.xcconfig */;
- buildSettings = {
- BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/enzevalos_iphone.app/enzevalos_iphone";
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(PROJECT_DIR)/enzevalos_iphone",
- "$(PROJECT_DIR)_workspace",
- );
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- INFOPLIST_FILE = enzevalos_iphoneUITests/Info.plist;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"${PODS_ROOT}/OpenSSL-Universal/lib-ios\"",
- "$(inherited)",
- );
- PRODUCT_BUNDLE_IDENTIFIER = "fu-berlin.enzevalos-iphoneUITests";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.2;
- TEST_TARGET_NAME = enzevalos_iphone;
- };
- name = Release;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
+ 476EEF9D22A872BF00BB4EF7 /* Build configuration list for PBXNativeTarget "enzevalos_iphoneUITests" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 476EEF9E22A872BF00BB4EF7 /* Debug */,
+ 476EEF9F22A872BF00BB4EF7 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
A13526701D955BDF00D3BFE1 /* Build configuration list for PBXProject "enzevalos_iphone" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -2012,15 +1996,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- A13526A61D955BE000D3BFE1 /* Build configuration list for PBXNativeTarget "enzevalos_iphoneUITests" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- A13526A71D955BE000D3BFE1 /* Debug */,
- A13526A81D955BE000D3BFE1 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
/* End XCConfigurationList section */
/* Begin XCVersionGroup section */
diff --git a/enzevalos_iphoneUITests/Info.plist b/enzevalos_iphoneUITests/Info.plist
index ba72822e8728ef2951005e49b6c27a2f1da6572d..6c40a6cd0c4af2f0d93b697fbfb066793681b045 100644
--- a/enzevalos_iphoneUITests/Info.plist
+++ b/enzevalos_iphoneUITests/Info.plist
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
- <string>en</string>
+ <string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
@@ -16,8 +16,6 @@
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
diff --git a/enzevalos_iphoneUITests/OnboardingTest.swift b/enzevalos_iphoneUITests/OnboardingTest.swift
index 887258d652e70cf2d8237d2d4e9473ef129eb8d8..82aef80123b5d98cdc29c1dc729f37c2aff71677 100644
--- a/enzevalos_iphoneUITests/OnboardingTest.swift
+++ b/enzevalos_iphoneUITests/OnboardingTest.swift
@@ -27,6 +27,7 @@ class OnboardingTest: XCTestCase {
}
+
func testLogging() {
// Use recording to get started writing UI tests.
// Use XCTAssert and related functions to verify your tests produce the correct results.
@@ -36,5 +37,32 @@ class OnboardingTest: XCTestCase {
app/*@START_MENU_TOKEN@*/.staticTexts["OnboardSubTextAccessibilityIdentifier"]/*[[".staticTexts[\"You, the sender and both mail providers know the content of the mail but who sent the mail?\\nSender addresses can be freely chosen. A fraud can impersonate a person when using a known mail address as sender address.\"]",".staticTexts[\"OnboardSubTextAccessibilityIdentifier\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/.swipeLeft()
app.otherElements["OnboardInputViewAccessibilityIdentifier"].swipeLeft()
}
+
+
+
+
+
+ private static func loadAccounts() -> [String:(name: String, pw: String)] {
+ let bundle = Bundle(for: self)
+ var newAccounts = [String:(name: String, pw: String)]()
+ guard let url = bundle.url(forResource: "accounts", withExtension: "json"), let data = try? Data(contentsOf: url), let jsonDic = try? JSONSerialization.jsonObject(with: data, options: .mutableLeaves) else {
+ XCTFail()
+ return [:]
+ }
+ if let dic = jsonDic as? Dictionary<String, Any>{
+ if let accounts = dic["accounts"], let array = accounts as? Array<Any> {
+ for elem in array {
+ if let account = elem as? Dictionary<String, String> {
+ if let id = account["id"], let username = account["username"] , let pw = account["password"] {
+ newAccounts[id] = (username, pw)
+ }
+ }
+ }
+ }
+
+ }
+ return newAccounts
+ }
+
}
diff --git a/enzevalos_iphoneUITests/enzevalos_iphoneUITests.swift b/enzevalos_iphoneUITests/enzevalos_iphoneUITests.swift
index 689dabb1cfc920e1c9961b2e87eec2c183dddf8a..a3e0498584b28df69c2c501d8250e83c341ab3a4 100644
--- a/enzevalos_iphoneUITests/enzevalos_iphoneUITests.swift
+++ b/enzevalos_iphoneUITests/enzevalos_iphoneUITests.swift
@@ -2,19 +2,8 @@
// enzevalos_iphoneUITests.swift
// enzevalos_iphoneUITests
//
-// Created by jakobsbode on 23.09.16.
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
+// Created by Oliver Wiese on 05.06.19.
+// Copyright © 2019 fu-berlin. All rights reserved.
//
import XCTest
@@ -22,12 +11,11 @@ import XCTest
class enzevalos_iphoneUITests: XCTestCase {
override func setUp() {
- super.setUp()
-
// Put setup code here. This method is called before the invocation of each test method in the class.
// In UI tests it is usually best to stop immediately when a failure occurs.
continueAfterFailure = false
+
// UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
XCUIApplication().launch()
@@ -36,7 +24,6 @@ class enzevalos_iphoneUITests: XCTestCase {
override func tearDown() {
// Put teardown code here. This method is called after the invocation of each test method in the class.
- super.tearDown()
}
func testExample() {