From ee5c90894314c14e9e5c5b361ac872867a5f8a5c Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Sat, 1 Apr 2023 17:20:07 +0000
Subject: [PATCH] Update iOS app to ObjFW changes

FossilOrigin-Name: 3eecffa2af1b183b334ba3153d923b423a4dff8ad4b27fc25630b1987eef00ad
---
 CryptoPassphrase.h                     |  2 +-
 CryptoPassphrase.m                     |  2 +-
 LegacyPasswordGenerator.h              |  2 +-
 LegacyPasswordGenerator.m              |  2 +-
 NewPasswordGenerator.h                 |  2 +-
 NewPasswordGenerator.m                 |  2 +-
 PasswordGenerator.h                    |  2 +-
 iOS/AboutController.swift              |  2 +-
 iOS/AddSiteController.swift            |  2 +-
 iOS/AppDelegate.swift                  |  2 +-
 iOS/Base.lproj/LaunchScreen.storyboard |  8 ++++----
 iOS/HTTPServerDelegate.swift           |  2 +-
 iOS/MainViewController.swift           |  2 +-
 iOS/SelectKeyFileController.swift      |  2 +-
 iOS/ShowDetailsController.swift        |  2 +-
 iOS/SiteStorage.swift                  | 18 +++++++++---------
 iOS/bridge.h                           |  2 +-
 iOS/main.m                             |  4 ++--
 18 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/CryptoPassphrase.h b/CryptoPassphrase.h
index 4d7fee9..4a3ca53 100644
--- a/CryptoPassphrase.h
+++ b/CryptoPassphrase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/CryptoPassphrase.m b/CryptoPassphrase.m
index 6b5f319..9707b7e 100644
--- a/CryptoPassphrase.m
+++ b/CryptoPassphrase.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/LegacyPasswordGenerator.h b/LegacyPasswordGenerator.h
index 59c936d..275eb93 100644
--- a/LegacyPasswordGenerator.h
+++ b/LegacyPasswordGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/LegacyPasswordGenerator.m b/LegacyPasswordGenerator.m
index 98cca19..3ce85fb 100644
--- a/LegacyPasswordGenerator.m
+++ b/LegacyPasswordGenerator.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/NewPasswordGenerator.h b/NewPasswordGenerator.h
index 9150891..74a0a83 100644
--- a/NewPasswordGenerator.h
+++ b/NewPasswordGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/NewPasswordGenerator.m b/NewPasswordGenerator.m
index 1c4fe7c..720a73d 100644
--- a/NewPasswordGenerator.m
+++ b/NewPasswordGenerator.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/PasswordGenerator.h b/PasswordGenerator.h
index 012c671..f7ffdae 100644
--- a/PasswordGenerator.h
+++ b/PasswordGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/iOS/AboutController.swift b/iOS/AboutController.swift
index 7cbebe5..d8224ae 100644
--- a/iOS/AboutController.swift
+++ b/iOS/AboutController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/iOS/AddSiteController.swift b/iOS/AddSiteController.swift
index c862e55..e1d4829 100644
--- a/iOS/AddSiteController.swift
+++ b/iOS/AddSiteController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift
index 875bcb4..1177d12 100644
--- a/iOS/AppDelegate.swift
+++ b/iOS/AppDelegate.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/iOS/Base.lproj/LaunchScreen.storyboard b/iOS/Base.lproj/LaunchScreen.storyboard
index 7878f13..d5f3a81 100644
--- a/iOS/Base.lproj/LaunchScreen.storyboard
+++ b/iOS/Base.lproj/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -20,14 +20,14 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CryptoPassphrase" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GvW-cV-5uf">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="630"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="610"/>
                                 <fontDescription key="fontDescription" type="system" weight="black" pointSize="32"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                                 <color key="shadowColor" red="0.23921568627450979" green="0.396078431372549" blue="0.54509803921568623" alpha="1" colorSpace="calibratedRGB"/>
                                 <size key="shadowOffset" width="2" height="2"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2016 - 2021 Jonathan Schleifer" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8gr-rl-2PJ">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2016 - 2023 Jonathan Schleifer" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8gr-rl-2PJ">
                                 <rect key="frame" x="0.0" y="638" width="375" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="n2V-4D-npg"/>
diff --git a/iOS/HTTPServerDelegate.swift b/iOS/HTTPServerDelegate.swift
index ba6524f..3f571c5 100644
--- a/iOS/HTTPServerDelegate.swift
+++ b/iOS/HTTPServerDelegate.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/iOS/MainViewController.swift b/iOS/MainViewController.swift
index f91e439..582ae27 100644
--- a/iOS/MainViewController.swift
+++ b/iOS/MainViewController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/iOS/SelectKeyFileController.swift b/iOS/SelectKeyFileController.swift
index 3b13ab2..dfcedac 100644
--- a/iOS/SelectKeyFileController.swift
+++ b/iOS/SelectKeyFileController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/iOS/ShowDetailsController.swift b/iOS/ShowDetailsController.swift
index a0dfb20..1be1fd5 100644
--- a/iOS/ShowDetailsController.swift
+++ b/iOS/ShowDetailsController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/iOS/SiteStorage.swift b/iOS/SiteStorage.swift
index bcd39a4..726f5ed 100644
--- a/iOS/SiteStorage.swift
+++ b/iOS/SiteStorage.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
@@ -28,24 +28,24 @@ class SiteStorage: OFObject {
     private static let legacyField = NSNumber(value: 1)
     private static let keyFileField = NSNumber(value: 2)
 
-    private var path: OFString
+    private var IRI: OFIRI
     private var storage: [String: [NSNumber: AnyObject]]
     private var sites: [String]
 
     override init() {
         let fileManager = OFFileManager.default
-        let userDataURL = OFSystemInfo.userDataURL!
+        let userDataIRI = OFSystemInfo.userDataIRI!
 
-        if !fileManager.directoryExists(at: userDataURL) {
-            fileManager.createDirectory(at: userDataURL)
+        if !fileManager.directoryExists(at: userDataIRI) {
+            fileManager.createDirectory(at: userDataIRI)
         }
 
-        let URL = userDataURL.appendingPathComponent(
+        let IRI = userDataIRI.appendingPathComponent(
             OFString(utf8String: "sites.msgpack"))
 
         var storage: [String: [NSNumber: AnyObject]]? = nil
         OFException.try({
-            let decoded = (OFData(contentsOf: URL).objectByParsingMessagePack)
+            let decoded = (OFData(contentsOf: IRI).objectByParsingMessagePack)
                 as? OFDictionary<OFString, OFDictionary<OFNumber, AnyObject>>
             storage =
                 (decoded?.nsObject as? [String: [NSNumber: AnyObject]]) ?? [:]
@@ -53,7 +53,7 @@ class SiteStorage: OFObject {
             storage = [:]
         })
 
-        self.path = URL.fileSystemRepresentation!
+        self.IRI = IRI
         self.storage = storage!
         self.sites = self.storage.keys.sorted()
     }
@@ -115,7 +115,7 @@ class SiteStorage: OFObject {
     private func update() {
         let ofStorage = (storage as NSDictionary).ofObject
 
-        ofStorage.messagePackRepresentation.write(toFile: path)
+        ofStorage.messagePackRepresentation.write(to: IRI)
         sites = storage.keys.sorted()
     }
 }
diff --git a/iOS/bridge.h b/iOS/bridge.h
index 9c83da6..f54aa30 100644
--- a/iOS/bridge.h
+++ b/iOS/bridge.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
diff --git a/iOS/main.m b/iOS/main.m
index 644ee02..5e72f96 100644
--- a/iOS/main.m
+++ b/iOS/main.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
  * https://fossil.nil.im/cryptopassphrase
  *
@@ -32,7 +32,7 @@
 OF_APPLICATION_DELEGATE(OFAppDelegate)
 
 @implementation OFAppDelegate
-- (void)applicationDidFinishLaunching
+- (void)applicationDidFinishLaunching: (OFNotification *)notification
 {
 	int *argc;
 	char ***argv;