CryptoPassphrase  Check-in [604513acba]

Overview
Comment:iOS: Adjust to ObjFW changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 604513acba904b54db0279d35290e075101a9745f62154e78bfaa604bd091178
User & Date: js 2021-03-14 00:16:15
Context
2021-03-14
00:17
Update copyright check-in: a703cf8d62 user: js tags: trunk
00:16
iOS: Adjust to ObjFW changes check-in: 604513acba user: js tags: trunk
00:05
iOS: Restore the bundle identifier check-in: 5d6baa0a57 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to iOS/CryptoPassphrase.xcodeproj/project.pbxproj.

︙︙
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388

				CLANG_ENABLE_OBJC_WEAK = YES;
				DEVELOPMENT_TEAM = MXKNFCKFL6;
				ENABLE_BITCODE = NO;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",
					"$(PROJECT_DIR)/ObjFW/Frameworks",
				);
				HEADER_SEARCH_PATHS = ObjFW/include;
				INFOPLIST_FILE = Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				MARKETING_VERSION = 1.3;
				PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen";
				PRODUCT_NAME = "$(TARGET_NAME)";
				SWIFT_OBJC_BRIDGING_HEADER = bridge.h;
				SWIFT_OPTIMIZATION_LEVEL = "-Onone";








<








374
375
376
377
378
379
380

381
382
383
384
385
386
387

				CLANG_ENABLE_OBJC_WEAK = YES;
				DEVELOPMENT_TEAM = MXKNFCKFL6;
				ENABLE_BITCODE = NO;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",
					"$(PROJECT_DIR)/ObjFW/Frameworks",
				);

				INFOPLIST_FILE = Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				MARKETING_VERSION = 1.3;
				PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen";
				PRODUCT_NAME = "$(TARGET_NAME)";
				SWIFT_OBJC_BRIDGING_HEADER = bridge.h;
				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
︙︙
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414

				CLANG_ENABLE_OBJC_WEAK = YES;
				DEVELOPMENT_TEAM = MXKNFCKFL6;
				ENABLE_BITCODE = NO;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",
					"$(PROJECT_DIR)/ObjFW/Frameworks",
				);
				HEADER_SEARCH_PATHS = ObjFW/include;
				INFOPLIST_FILE = Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				MARKETING_VERSION = 1.3;
				PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen";
				PRODUCT_NAME = "$(TARGET_NAME)";
				SWIFT_OBJC_BRIDGING_HEADER = bridge.h;
				SWIFT_VERSION = 5.0;








<








399
400
401
402
403
404
405

406
407
408
409
410
411
412

				CLANG_ENABLE_OBJC_WEAK = YES;
				DEVELOPMENT_TEAM = MXKNFCKFL6;
				ENABLE_BITCODE = NO;
				FRAMEWORK_SEARCH_PATHS = (
					"$(inherited)",
					"$(PROJECT_DIR)/ObjFW/Frameworks",
				);

				INFOPLIST_FILE = Info.plist;
				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
				MARKETING_VERSION = 1.3;
				PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen";
				PRODUCT_NAME = "$(TARGET_NAME)";
				SWIFT_OBJC_BRIDGING_HEADER = bridge.h;
				SWIFT_VERSION = 5.0;
︙︙

Changes to iOS/SiteStorage.swift.

︙︙
41
42
43
44
45
46
47
48

49
50
51
52
53
54
55

        }

        let path = userDataPath.appendingPathComponent(
            OFString(utf8String: "sites.msgpack"))

        var storage: [String: [NSNumber: AnyObject]]? = nil
        OFException.try({
            let decoded = (OFData(contentsOfFile: path).messagePackValue)

                as? OFDictionary<OFString, OFDictionary<OFNumber, AnyObject>>
            storage =
                (decoded?.nsObject as? [String: [NSNumber: AnyObject]]) ?? [:]
        }, catch: { (OFException) in
            storage = [:]
        })









|
>








41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56

        }

        let path = userDataPath.appendingPathComponent(
            OFString(utf8String: "sites.msgpack"))

        var storage: [String: [NSNumber: AnyObject]]? = nil
        OFException.try({
            let decoded = (OFData(contentsOfFile: path)
                .objectByParsingMessagePack)
                as? OFDictionary<OFString, OFDictionary<OFNumber, AnyObject>>
            storage =
                (decoded?.nsObject as? [String: [NSNumber: AnyObject]]) ?? [:]
        }, catch: { (OFException) in
            storage = [:]
        })
︙︙