Skip to content
Snippets Groups Projects
Commit 207445f4 authored by Oliver Wiese's avatar Oliver Wiese
Browse files

add missing authentication files (merge error)

parent ad0da2c0
Branches
Tags
3 merge requests!58Onboarding screens swift ui merge dev,!55WIP: Resolve "UI for gamifcation & stats",!47Provisional fix for OpenSSL 1.1+, needs testing
Show whitespace changes
Inline Side-by-side
enzevalos_iphone.xcodeproj/project.pbxproj
+ 34
− 19
View file @ 207445f4
......@@ -139,6 +139,10 @@
47E7BE5F22319B7D00C8EF94 /* SecureMailFromMac.eml in Resources */ = {isa = PBXBuildFile; fileRef = 47E7BE5E22319B7D00C8EF94 /* SecureMailFromMac.eml */; };
47E7BE6122319B8F00C8EF94 /* PlainMailFromMac.eml in Resources */ = {isa = PBXBuildFile; fileRef = 47E7BE6022319B8F00C8EF94 /* PlainMailFromMac.eml */; };
47E7BE632232BD0A00C8EF94 /* SignedEncMailFromMac.eml in Resources */ = {isa = PBXBuildFile; fileRef = 47E7BE622232BD0A00C8EF94 /* SignedEncMailFromMac.eml */; };
47EABF09241A9C8700774A93 /* AuthenticationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47EABF06241A9C8700774A93 /* AuthenticationModel.swift */; };
47EABF0A241A9C8700774A93 /* AuthenticationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47EABF07241A9C8700774A93 /* AuthenticationViewModel.swift */; };
47EABF0B241A9C8700774A93 /* AuthenticationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47EABF08241A9C8700774A93 /* AuthenticationScreen.swift */; };
47EABF0D241A9CA800774A93 /* MailAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47EABF0C241A9CA800774A93 /* MailAccount.swift */; };
47F0376E22A7278A0005C9DE /* accounts.json in Resources */ = {isa = PBXBuildFile; fileRef = 47F0376D22A7278A0005C9DE /* accounts.json */; };
47F79240203492E3005E7DB6 /* KeyRecord+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F7923E203492E3005E7DB6 /* KeyRecord+CoreDataClass.swift */; };
47F79241203492E3005E7DB6 /* KeyRecord+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F7923F203492E3005E7DB6 /* KeyRecord+CoreDataProperties.swift */; };
......@@ -165,10 +169,6 @@
8428A8711F436A1E007649A5 /* GamificationStatusViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A86D1F436A1E007649A5 /* GamificationStatusViewController.swift */; };
8428A8831F436AC9007649A5 /* GamificationDataUnitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428A8561F4369EA007649A5 /* GamificationDataUnitTest.swift */; };
8428A8841F436ACC007649A5 /* GamificationElements.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8428A8541F4369CF007649A5 /* GamificationElements.xcassets */; };
976EEBED240D47C3006FE574 /* AuthenticationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 976EEBEC240D47C3006FE574 /* AuthenticationViewModel.swift */; };
9771AA8C241161190023A096 /* MailAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9771AA8B241161190023A096 /* MailAccount.swift */; };
97AACD2424178C230078A68E /* AuthenticationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AACD2324178C230078A68E /* AuthenticationModel.swift */; };
97B2F4D6240D321B000DB34E /* AuthenticationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97B2F4D5240D321B000DB34E /* AuthenticationScreen.swift */; };
988C9C5D240D507A006213F0 /* PhishingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 988C9C5C240D507A006213F0 /* PhishingTests.swift */; };
A102AA8A1EDDB4F40024B457 /* videoOnboarding2.m4v in Resources */ = {isa = PBXBuildFile; fileRef = A102AA891EDDB4E80024B457 /* videoOnboarding2.m4v */; };
A1083A541E8BFEA6003666B7 /* Onboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1083A531E8BFEA6003666B7 /* Onboarding.swift */; };
......@@ -534,6 +534,10 @@
47E7BE5E22319B7D00C8EF94 /* SecureMailFromMac.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SecureMailFromMac.eml; sourceTree = "<group>"; };
47E7BE6022319B8F00C8EF94 /* PlainMailFromMac.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PlainMailFromMac.eml; sourceTree = "<group>"; };
47E7BE622232BD0A00C8EF94 /* SignedEncMailFromMac.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SignedEncMailFromMac.eml; sourceTree = "<group>"; };
47EABF06241A9C8700774A93 /* AuthenticationModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationModel.swift; sourceTree = "<group>"; };
47EABF07241A9C8700774A93 /* AuthenticationViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationViewModel.swift; sourceTree = "<group>"; };
47EABF08241A9C8700774A93 /* AuthenticationScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationScreen.swift; sourceTree = "<group>"; };
47EABF0C241A9CA800774A93 /* MailAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MailAccount.swift; sourceTree = "<group>"; };
47F0376D22A7278A0005C9DE /* accounts.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = accounts.json; sourceTree = "<group>"; };
47F7923E203492E3005E7DB6 /* KeyRecord+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyRecord+CoreDataClass.swift"; sourceTree = "<group>"; };
47F7923F203492E3005E7DB6 /* KeyRecord+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyRecord+CoreDataProperties.swift"; sourceTree = "<group>"; };
......@@ -566,10 +570,8 @@
8B87EFB6CEAA31452F744015 /* Pods-enzevalos_iphoneUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphoneUITests.release.xcconfig"; path = "../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests.release.xcconfig"; sourceTree = "<group>"; };
91B6C9020C660BEA78FAEF28 /* Pods-enzevalos_iphone.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphone.debug.xcconfig"; path = "../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone.debug.xcconfig"; sourceTree = "<group>"; };
94EE54279AB591E0CAB8EFD8 /* Pods_enzevalos_iphone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_enzevalos_iphone.framework; sourceTree = BUILT_PRODUCTS_DIR; };
976EEBEC240D47C3006FE574 /* AuthenticationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationViewModel.swift; sourceTree = "<group>"; };
9771AA8B241161190023A096 /* MailAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailAccount.swift; sourceTree = "<group>"; };
97AACD2324178C230078A68E /* AuthenticationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationModel.swift; sourceTree = "<group>"; };
97B2F4D5240D321B000DB34E /* AuthenticationScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationScreen.swift; sourceTree = "<group>"; };
988C9C5C240D507A006213F0 /* PhishingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhishingTests.swift; sourceTree = "<group>"; };
9A132EDE8BCA06ACDB505C22 /* Pods-enzevalos_iphoneUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphoneUITests.debug.xcconfig"; path = "../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests.debug.xcconfig"; sourceTree = "<group>"; };
9B3D62838C729BAC6832270A /* Pods-enzevalos_iphone-AdHoc.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphone-AdHoc.debug.xcconfig"; path = "../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphone-AdHoc/Pods-enzevalos_iphone-AdHoc.debug.xcconfig"; sourceTree = "<group>"; };
......@@ -1119,6 +1121,26 @@
name = data;
sourceTree = "<group>";
};
47EABF04241A9C6400774A93 /* Recovered References */ = {
isa = PBXGroup;
children = (
97AACD2324178C230078A68E /* AuthenticationModel.swift */,
9771AA8B241161190023A096 /* MailAccount.swift */,
);
name = "Recovered References";
sourceTree = "<group>";
};
47EABF05241A9C7000774A93 /* Authentication */ = {
isa = PBXGroup;
children = (
47EABF0C241A9CA800774A93 /* MailAccount.swift */,
47EABF06241A9C8700774A93 /* AuthenticationModel.swift */,
47EABF08241A9C8700774A93 /* AuthenticationScreen.swift */,
47EABF07241A9C8700774A93 /* AuthenticationViewModel.swift */,
);
name = Authentication;
sourceTree = "<group>";
};
47F0376C22A7278A0005C9DE /* private */ = {
isa = PBXGroup;
children = (
......@@ -1194,17 +1216,6 @@
name = Data;
sourceTree = "<group>";
};
97B2F4D4240D31E6000DB34E /* authentication */ = {
isa = PBXGroup;
children = (
97B2F4D5240D321B000DB34E /* AuthenticationScreen.swift */,
976EEBEC240D47C3006FE574 /* AuthenticationViewModel.swift */,
9771AA8B241161190023A096 /* MailAccount.swift */,
97AACD2324178C230078A68E /* AuthenticationModel.swift */,
);
name = authentication;
sourceTree = "<group>";
};
A10DE41E1EFAA140005E8189 /* folders */ = {
isa = PBXGroup;
children = (
......@@ -1256,6 +1267,7 @@
A13526761D955BDF00D3BFE1 /* Products */,
24472862977D71D3F0AD0D58 /* Pods */,
78280F99990BFF65543B7F0B /* Frameworks */,
47EABF04241A9C6400774A93 /* Recovered References */,
);
sourceTree = "<group>";
};
......@@ -1272,6 +1284,7 @@
A13526771D955BDF00D3BFE1 /* enzevalos_iphone */ = {
isa = PBXGroup;
children = (
47EABF05241A9C7000774A93 /* Authentication */,
476406872416B54D00C7D426 /* SwiftUI */,
476403FA2413F95300C7D426 /* OpenSSL */,
A1B9999D21DE7CD2002563F6 /* Travel */,
......@@ -1964,7 +1977,6 @@
479C649A21F45DAF00A01071 /* HideShowPasswordTextField.swift in Sources */,
47CEAC98222541B40075B7DC /* MailSession.swift in Sources */,
F119D2901E364B59001D732A /* AnimatedSendIcon.swift in Sources */,
97AACD2424178C230078A68E /* AuthenticationModel.swift in Sources */,
4707096D1F8F9F4900657F41 /* ExportViewController.swift in Sources */,
F12060801DA540FE00F6EF37 /* RefreshControlExtension.swift in Sources */,
4751C6FC2344C8D1006B2A4D /* KeyTableViewController.swift in Sources */,
......@@ -2005,11 +2017,13 @@
A15D215B223BE5F4003E0CE0 /* TempAttachment.swift in Sources */,
4706D65F225B7B6B00B3F1D3 /* ItunesHandler.swift in Sources */,
3EC35F2D200376A1008BDF95 /* SendViewController+Invitation.swift in Sources */,
47EABF0A241A9C8700774A93 /* AuthenticationViewModel.swift in Sources */,
475B00341F7B9565006CDD41 /* Cryptography.swift in Sources */,
A1EB057C1D956838008659C1 /* MailHandler.swift in Sources */,
A182182E21E50D8D00918A29 /* IntroButtonViewController.swift in Sources */,
4764069D2416B54D00C7D426 /* Stroke.swift in Sources */,
478AF715222FD5C600AEF69E /* IncomingMail.swift in Sources */,
47EABF09241A9C8700774A93 /* AuthenticationModel.swift in Sources */,
47C036FF2347C0F5006295E8 /* ImportKeyOverviewController.swift in Sources */,
A1EB05881D956879008659C1 /* AddressHandler.swift in Sources */,
472F39701E14F75C009260FB /* DataHandler.swift in Sources */,
......@@ -2023,19 +2037,20 @@
474994022261E4E6000F8DA5 /* SimpleSendIcon.swift in Sources */,
A12F91D821F3A99800AB0589 /* NSLayoutConstraintExtension.swift in Sources */,
71DFE5BA240679E80042019C /* HeaderExtractionValues.swift in Sources */,
47EABF0D241A9CA800774A93 /* MailAccount.swift in Sources */,
A18E7D771FBDE5D9002F7CC9 /* LoggingEventType.swift in Sources */,
F1984D741E1E92B300804E1E /* LabelStyleKit.swift in Sources */,
A1FA44A721E10E1400DB02AC /* TravelHandler.swift in Sources */,
47E7376E22845EC400972401 /* SecretKeyTableViewController.swift in Sources */,
478154A721FF3F0900A931EC /* Warning.swift in Sources */,
4764069F2416B5A600C7D426 /* NewOnboardingView.swift in Sources */,
47EABF0B241A9C8700774A93 /* AuthenticationScreen.swift in Sources */,
8428A8681F436A11007649A5 /* SubBadgeTableViewCell.swift in Sources */,
A1EB05861D956872008659C1 /* FrequentCell.swift in Sources */,
F12041FB1DA3FBF7002E4940 /* ListViewController.swift in Sources */,
F18B445E1E7044B70080C041 /* FlipTransition.swift in Sources */,
472F397E1E1D0B0B009260FB /* EnzevalosContact+CoreDataProperties.swift in Sources */,
4751C6FA23449699006B2A4D /* CryptoManagementViewController.swift in Sources */,
9771AA8C241161190023A096 /* MailAccount.swift in Sources */,
478154AC21FF6A9600A931EC /* Mailbot.swift in Sources */,
8428A86E1F436A1E007649A5 /* BadgeCase.swift in Sources */,
A1B49E5D21E54CBF00ED86FC /* IntroContactTableViewController.swift in Sources */,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment