From 3df702469a3c6d59bc69b6d42db07c3703f70a99 Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Thu, 26 Oct 2017 13:45:33 +0200
Subject: [PATCH] handle own secret export key messages
---
enzevalos_iphone/MailHandler.swift | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift
index 65b12e1b..f587d283 100644
--- a/enzevalos_iphone/MailHandler.swift
+++ b/enzevalos_iphone/MailHandler.swift
@@ -237,7 +237,7 @@ class MailHandler {
let userID :MCOAddress = MCOAddress(displayName: useraddr, mailbox: useraddr)
createHeader(builder, toEntrys: [useraddr], ccEntrys: [], bccEntrys: [], subject: "Autocrypt Setup Message 2")
- builder.header.setExtraHeaderValue("v1", forName: "Autocrypt-Setup-Message")
+ builder.header.setExtraHeaderValue("v0", forName: "Autocrypt-Setup-Message")
/*
@@ -569,6 +569,16 @@ class MailHandler {
if let _ = header?.extraHeaderValue(forName: AUTOCRYPTHEADER) {
autocrypt = AutocryptContact(header: header!)
}
+
+ if let _ = header?.extraHeaderValue(forName: "Autocrypt-Setup-Message"){
+ // own key export message -> Drop message?.
+ // TODO: Distinguish between other keys (future work)
+ if newMailCallback != nil{
+ newMailCallback!()
+ }
+ return
+ }
+
if let to = header?.to {
for r in to {
--
GitLab