diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index 77e691c65a0fe38f6dd3cfb979976a91a2544c04..5b7ec155e6f394127969d8666a81d6b0ec98aee5 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -365,7 +365,7 @@
F12041FD1DA409A5002E4940 /* ListViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F12041FC1DA409A5002E4940 /* ListViewCell.swift */; };
F12060801DA540FE00F6EF37 /* RefreshControlExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F120607F1DA540FE00F6EF37 /* RefreshControlExtension.swift */; };
F12060821DA552FC00F6EF37 /* MailHandlerDelegator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F12060811DA552FC00F6EF37 /* MailHandlerDelegator.swift */; };
- F120A7D31F7937BB006D5BF1 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
+ F120A7D31F7937BB006D5BF1 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
F14239C11F30A99C00998A83 /* QRCodeGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F14239C01F30A99C00998A83 /* QRCodeGenerator.swift */; };
F14D189C1ED880680080515D /* nchr-private.gpg in Resources */ = {isa = PBXBuildFile; fileRef = F14D18981ED880680080515D /* nchr-private.gpg */; };
F14D189D1ED880680080515D /* nchr-public.gpg in Resources */ = {isa = PBXBuildFile; fileRef = F14D18991ED880680080515D /* nchr-public.gpg */; };
@@ -731,7 +731,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- F120A7D31F7937BB006D5BF1 /* (null) in Frameworks */,
+ F120A7D31F7937BB006D5BF1 /* BuildFile in Frameworks */,
472F396E1E14F384009260FB /* CoreData.framework in Frameworks */,
9935BC866A86C4A4B9819F35 /* Pods_enzevalos_iphone.framework in Frameworks */,
);
@@ -1645,22 +1645,16 @@
);
inputPaths = (
"${SRCROOT}/../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone-frameworks.sh",
- "${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework",
"${BUILT_PRODUCTS_DIR}/BZipCompression/BZipCompression.framework",
"${BUILT_PRODUCTS_DIR}/FrameAccessor/FrameAccessor.framework",
- "${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework",
- "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
"${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
"${BUILT_PRODUCTS_DIR}/Onboard/Onboard.framework",
"${BUILT_PRODUCTS_DIR}/VENTokenField/VENTokenField.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppAuth.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BZipCompression.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FrameAccessor.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Onboard.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/VENTokenField.framework",
@@ -1739,11 +1733,11 @@
);
inputPaths = (
"${SRCROOT}/../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone-resources.sh",
- "${PODS_CONFIGURATION_BUILD_DIR}/HockeySDK/HockeySDKResources.bundle",
+ "$PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
- "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/HockeySDKResources.bundle",
+ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
@@ -1793,11 +1787,11 @@
);
inputPaths = (
"${SRCROOT}/../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphone-AdHoc/Pods-enzevalos_iphone-AdHoc-resources.sh",
- "${PODS_CONFIGURATION_BUILD_DIR}/HockeySDK/HockeySDKResources.bundle",
+ "$PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
- "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/HockeySDKResources.bundle",
+ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
@@ -1811,7 +1805,7 @@
);
inputPaths = (
"${SRCROOT}/../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests-resources.sh",
- $PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle,
+ "$PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
@@ -1859,22 +1853,16 @@
);
inputPaths = (
"${SRCROOT}/../enzevalos_iphone_workspace/Pods/Target Support Files/Pods-enzevalos_iphone-AdHoc/Pods-enzevalos_iphone-AdHoc-frameworks.sh",
- "${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework",
"${BUILT_PRODUCTS_DIR}/BZipCompression/BZipCompression.framework",
"${BUILT_PRODUCTS_DIR}/FrameAccessor/FrameAccessor.framework",
- "${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework",
- "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
"${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
"${BUILT_PRODUCTS_DIR}/Onboard/Onboard.framework",
"${BUILT_PRODUCTS_DIR}/VENTokenField/VENTokenField.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppAuth.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BZipCompression.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FrameAccessor.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Onboard.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/VENTokenField.framework",
diff --git a/enzevalos_iphone.xcodeproj/xcuserdata/Olli.xcuserdatad/xcschemes/xcschememanagement.plist b/enzevalos_iphone.xcodeproj/xcuserdata/Olli.xcuserdatad/xcschemes/xcschememanagement.plist
index c64e3e6eb030ba24348bcdf1e1dd25ee2c32ef1e..a14697ff72a6336b9e92e4aa49bdd06346fd2a15 100644
--- a/enzevalos_iphone.xcodeproj/xcuserdata/Olli.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/enzevalos_iphone.xcodeproj/xcuserdata/Olli.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,11 +4,21 @@
<dict>
<key>SchemeUserState</key>
<dict>
+ <key>enzevalos_iphone-AdHoc.xcscheme_^#shared#^_</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>2</integer>
+ </dict>
<key>enzevalos_iphone.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
</dict>
+ <key>enzevalos_iphone.xcscheme_^#shared#^_</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>1</integer>
+ </dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift
index bbfe9bb321992f4e3de94ae6d2d46eddc81c61e6..e6a27d53ec0bbc1564585daaf8d220efe7ea9ac1 100644
--- a/enzevalos_iphone/MailHandler.swift
+++ b/enzevalos_iphone/MailHandler.swift
@@ -972,12 +972,10 @@ class MailHandler {
let pgp = SwiftPGP()
var keyIds = [String]()
if sender != nil, let adr = DataHandler.handler.findMailAddress(adr: sender!){
- //if let keys = adr.keys{
- for k in adr.publicKeys{
- let key = k as! PersistentKey
- keyIds.append(key.keyID)
- }
- //}
+ for k in adr.publicKeys{
+ let key = k as! PersistentKey
+ keyIds.append(key.keyID)
+ }
}
if let a = autocrypt{
let key = try! pgp.importKeys(key: a.key, pw: nil, isSecretKey: false, autocrypt: true)
diff --git a/enzevalos_iphone/SwiftPGP.swift b/enzevalos_iphone/SwiftPGP.swift
index 97e4ddddaeaef4626c2da2d75c0ecc0b4f19ad35..0ec50a9879de9016d5ad553f0068239b6b23710c 100644
--- a/enzevalos_iphone/SwiftPGP.swift
+++ b/enzevalos_iphone/SwiftPGP.swift
@@ -99,7 +99,9 @@ class SwiftPGP: Encryption{
if let keyIDs = keys{
for id in keyIDs.split(separator: ";"){
if let key = loadKey(id: String(id)){
- myKeys.insert(key)
+ if key.isSecret{
+ myKeys.insert(key)
+ }
}
}
}
@@ -123,18 +125,20 @@ class SwiftPGP: Encryption{
keychain[data: id] = data
}
}
- if let keys = try? keychain.getString("secretKeys"){
- if var ids = keys{
- ids = ids + ";"+id
- keychain["secretKeys"] = ids
+ if key.isSecret{
+ if let keys = try? keychain.getString("secretKeys"){
+ if var ids = keys{
+ ids = ids + ";"+id
+ keychain["secretKeys"] = ids
+ }
+ else{
+ keychain["secretKeys"] = id
+ }
}
else{
keychain["secretKeys"] = id
}
}
- else{
- keychain["secretKeys"] = id
- }
return id
}
@@ -184,11 +188,16 @@ class SwiftPGP: Encryption{
func generateKey(adr: String) -> String{
if oldSecretKeys.count > 0{
+ var primkey: Key?
for key in oldSecretKeys{
if vaildAddress(key: key).contains(adr){
- return key.keyID.longIdentifier
+ _ = storeKey(key: key)
+ primkey = key
}
}
+ if let key = primkey{
+ return key.keyID.longIdentifier
+ }
}
let gen = KeyGenerator()
let pw: String? = nil
@@ -440,7 +449,6 @@ class SwiftPGP: Encryption{
return SignatureState.ValidSignature
} catch {
let nsError = error as NSError
- print(error)
switch nsError.code {
case 7: // no public key
return SignatureState.NoPublicKey