add invitation mode to options

enzevalos_iphone/DataHandler.swift

@@ -651,6 +651,7 @@ class DataHandler {
     func createMail(_ uid: UInt64, sender: MCOAddress?, receivers: [MCOAddress], cc: [MCOAddress], time: Date, received: Bool, subject: String, body: String?, flags: MCOMessageFlag, record: KeyRecord?, autocrypt: AutocryptContact?, decryptedData: CryptoObject?, folderPath: String, secretKey: String?, references: [String] = [], mailagent: String? = nil, messageID: String? = nil) -> PersistentMail? {
         let myfolder = findFolder(with: folderPath) as Folder
         let finding = findNum("PersistentMail", type: "uid", search: uid)
+        
         let mail: PersistentMail
         var mails: [PersistentMail] = []
 

enzevalos_iphone/Settings.bundle/Root.plist

@@ -2,8 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>Title</key>
-    <string>Mail 2.0</string>
+	<key>Title</key>
+	<string>Mail 2.0</string>
 	<key>StringsTable</key>
 	<string>Root</string>
 	<key>PreferenceSpecifiers</key>
@@ -34,6 +34,38 @@
 			<key>DefaultValue</key>
 			<string>Verfasst mit Letterbox. Mehr Informationen: http://letterbox.imp.fu-berlin.de?invitation=0</string>
 		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Invitation</string>
+			<key>Key</key>
+			<string>Invitation</string>
+		</dict>
+		<dict>
+			<key>Titles</key>
+			<array>
+				<string>Free text</string>
+				<string>Invitation mail</string>
+				<string>Censored mail</string>
+				<string>Encrypted mail</string>
+			</array>
+			<key>Key</key>
+			<string>Invitation.Mode</string>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Title</key>
+			<string>Invitation mode</string>
+			<key>Values</key>
+			<array>
+				<integer>3</integer>
+				<integer>0</integer>
+				<integer>2</integer>
+				<integer>1</integer>
+			</array>
+			<key>DefaultValue</key>
+			<string>1</string>
+		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>

enzevalos_iphone/StudySettings.swift

@@ -60,7 +60,7 @@ class StudySettings {
     
     public static var invitationEnabled: Bool{
         get {
-            return true //invitationsmode == InvitationMode.Censorship || invitationsmode == InvitationMode.PasswordEnc
+            return true
         }
     }
     static var freeTextInvitationTitle: String {
@@ -101,6 +101,7 @@ class StudySettings {
     
     static var invitationsmode: InvitationMode{
         get{
+            return UserManager.loadInvitationMode()
             let value = UserDefaults.standard.integer(forKey: StudyParamter.Invitation.keyName)
             if let mode = InvitationMode.init(rawValue: value){
                 return mode

enzevalos_iphone/UserData.swift

@@ -186,14 +186,20 @@ struct UserManager {
     }
 
     static func loadUserSignature() -> String {
-        let enabled = UserDefaults.standard.bool(forKey: "Signature.Switch")
-        let sig = UserDefaults.standard.string(forKey: "Signature.Text")
         if UserDefaults.standard.bool(forKey: "Signature.Switch"), let sig = UserDefaults.standard.string(forKey: "Signature.Text") {
-return "\n\n______________________________\n\n\(sig.trimmingCharacters(in: .whitespacesAndNewlines))\n\n"
+                return "\n\n______________________________\n\n\(sig.trimmingCharacters(in: .whitespacesAndNewlines))\n\n"
         }
 
         return ""
     }
+    
+    static func loadInvitationMode()-> InvitationMode{
+        let mode = UserDefaults.standard.integer(forKey: "Invitation.Mode")
+        if let invitationmode = InvitationMode(rawValue: mode){
+            return invitationmode
+        }
+        return InvitationMode.Censorship
+    }
 
     static func resetUserValues() {
         for a in Attribute.allAttributes {

enzevalos_iphone/en.lproj/Localizable.strings

@@ -64,7 +64,7 @@
 "KeyNotFound" = "No Key Found. This is an error, contact the developers!";
 "Letter" = "Letter";
 "LetterDamaged" = "Damaged Letter";
-"LetterDescription" = "• A confidential mail\n• Written by the stated sender\n• Needs participation of sender and receiver. Therefor you can invite contacts in the app.";
+"LetterDescription" = "• A confidential mail\n• Written by the stated sender\n• Needs participation of sender and receiver. You can invite contacts in the app.";
 "mail from" = "mail from";
 "Message" = "Message";
 "MoreInformation" = "More Information";