From 2d69e050960c2d6350648ceaf20eba3e04d936ac Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Sun, 25 Aug 2024 10:48:32 +0000
Subject: [PATCH 1/5] [iOS] Remove key upload functionality

It was never finished and uploading a key file unencrypted via WiFi is a
bad idea anyway.

FossilOrigin-Name: 0c2ffe58fdc61f477675a204326a34910f476539441b81af07db77518955d844
---
 iOS/Base.lproj/Main.storyboard                | 23 ++++-----
 .../project.pbxproj                           |  4 --
 iOS/HTTPServerDelegate.swift                  | 27 -----------
 iOS/SelectKeyFileController.swift             | 47 -------------------
 4 files changed, 9 insertions(+), 92 deletions(-)
 delete mode 100644 iOS/HTTPServerDelegate.swift

diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index ecda3b6..2fc70cc 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BN3-Y7-zvx">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BN3-Y7-zvx">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,7 +13,7 @@
             <objects>
                 <navigationController id="BN3-Y7-zvx" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="K8n-wn-irC">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -40,14 +40,14 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="CMc-ZN-RAn">
-                                <rect key="frame" x="0.0" y="44" width="375" height="51"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="56"/>
                                 <textInputTraits key="textInputTraits"/>
                                 <connections>
                                     <outlet property="delegate" destination="P19-6i-fpd" id="G7P-7f-gbO"/>
                                 </connections>
                             </searchBar>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="eoq-EJ-t3s">
-                                <rect key="frame" x="0.0" y="95" width="375" height="572"/>
+                                <rect key="frame" x="0.0" y="120" width="375" height="547"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <connections>
                                     <outlet property="dataSource" destination="P19-6i-fpd" id="1sa-qY-oQx"/>
@@ -101,7 +101,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2xd-QR-99d">
-                                <rect key="frame" x="0.0" y="44" width="375" height="623"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
                                 <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
                                     <outlet property="delegate" destination="MZ3-iZ-Dsf" id="uKq-6T-ltJ"/>
@@ -234,7 +234,7 @@
                                         <rect key="frame" x="0.0" y="186" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Oqt-88-vl9" id="j4y-Zr-ep4">
-                                            <rect key="frame" x="0.0" y="0.0" width="350.5" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="348.5" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Key file" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uyw-CW-atj">
@@ -247,7 +247,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="None" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wv8-GU-ahj">
-                                                    <rect key="frame" x="124" y="11.5" width="217.5" height="21"/>
+                                                    <rect key="frame" x="124" y="11.5" width="215.5" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -309,7 +309,7 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="QAR-8T-qhV">
-                                <rect key="frame" x="0.0" y="44.5" width="375" height="43.5"/>
+                                <rect key="frame" x="0.0" y="50" width="375" height="43.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="QAR-8T-qhV" id="u3r-6g-c9v">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@@ -325,11 +325,6 @@
                     <toolbarItems/>
                     <navigationItem key="navigationItem" id="bWa-Dd-f4f">
                         <nil key="title"/>
-                        <barButtonItem key="rightBarButtonItem" enabled="NO" title="Upload" id="85s-WF-868">
-                            <connections>
-                                <action selector="upload:" destination="4bs-rP-TxE" id="DnV-UG-h0y"/>
-                            </connections>
-                        </barButtonItem>
                     </navigationItem>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
                 </tableViewController>
diff --git a/iOS/CryptoPassphrase.xcodeproj/project.pbxproj b/iOS/CryptoPassphrase.xcodeproj/project.pbxproj
index 5fd2497..59af805 100644
--- a/iOS/CryptoPassphrase.xcodeproj/project.pbxproj
+++ b/iOS/CryptoPassphrase.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		4B5BCEFB22B5CF3200E551BD /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5BCEFA22B5CF3200E551BD /* MainViewController.swift */; };
 		4B5BCEFD22B5D98800E551BD /* SelectKeyFileController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5BCEFC22B5D98800E551BD /* SelectKeyFileController.swift */; };
 		4B5BCEFF22B5E36900E551BD /* ShowDetailsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5BCEFE22B5E36900E551BD /* ShowDetailsController.swift */; };
-		4B93656E22B5ADA00099DD08 /* HTTPServerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B93656D22B5ADA00099DD08 /* HTTPServerDelegate.swift */; };
 		4B93657022B5AE2C0099DD08 /* AboutController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B93656F22B5AE2C0099DD08 /* AboutController.swift */; };
 		4B93657222B5B1FB0099DD08 /* AddSiteController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B93657122B5B1FB0099DD08 /* AddSiteController.swift */; };
 		4B9525251F96BB900095F259 /* ObjFW.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9525231F96BB820095F259 /* ObjFW.framework */; };
@@ -56,7 +55,6 @@
 		4B5BCEFA22B5CF3200E551BD /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
 		4B5BCEFC22B5D98800E551BD /* SelectKeyFileController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectKeyFileController.swift; sourceTree = "<group>"; };
 		4B5BCEFE22B5E36900E551BD /* ShowDetailsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowDetailsController.swift; sourceTree = "<group>"; };
-		4B93656D22B5ADA00099DD08 /* HTTPServerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPServerDelegate.swift; sourceTree = "<group>"; };
 		4B93656F22B5AE2C0099DD08 /* AboutController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutController.swift; sourceTree = "<group>"; };
 		4B93657122B5B1FB0099DD08 /* AddSiteController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSiteController.swift; sourceTree = "<group>"; };
 		4B9525231F96BB820095F259 /* ObjFW.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjFW.framework; path = Frameworks/ObjFW.framework; sourceTree = "<group>"; };
@@ -110,7 +108,6 @@
 				4B93656F22B5AE2C0099DD08 /* AboutController.swift */,
 				4B93657122B5B1FB0099DD08 /* AddSiteController.swift */,
 				4B5BCEF822B5B94C00E551BD /* AppDelegate.swift */,
-				4B93656D22B5ADA00099DD08 /* HTTPServerDelegate.swift */,
 				4B2E52F01DA942840040D091 /* Info.plist */,
 				4B2E52ED1DA942840040D091 /* LaunchScreen.storyboard */,
 				4B2E52E81DA942840040D091 /* Main.storyboard */,
@@ -223,7 +220,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				4B5BCEF922B5B94C00E551BD /* AppDelegate.swift in Sources */,
-				4B93656E22B5ADA00099DD08 /* HTTPServerDelegate.swift in Sources */,
 				4B5BCEFB22B5CF3200E551BD /* MainViewController.swift in Sources */,
 				4B93657222B5B1FB0099DD08 /* AddSiteController.swift in Sources */,
 				4BA115D21DA9432D007ED4EA /* LegacyPasswordGenerator.m in Sources */,
diff --git a/iOS/HTTPServerDelegate.swift b/iOS/HTTPServerDelegate.swift
deleted file mode 100644
index 97e7727..0000000
--- a/iOS/HTTPServerDelegate.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
- *
- * https://fl.nil.im/cryptopassphrase
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-import Foundation
-import ObjFW
-
-class HTTPServerDelegate: OFObject, OFHTTPServerDelegate {
-    func server(_ server: OFHTTPServer, didReceive request: OFHTTPRequest,
-                requestBody: OFStream?, response: OFHTTPResponse) {
-        print("\(request)")
-    }
-}
diff --git a/iOS/SelectKeyFileController.swift b/iOS/SelectKeyFileController.swift
index 0ad2f37..e13aa30 100644
--- a/iOS/SelectKeyFileController.swift
+++ b/iOS/SelectKeyFileController.swift
@@ -23,21 +23,6 @@ class SelectKeyFileController: UITableViewController {
     public var addSiteController: AddSiteController?
 
     private var keyFiles: [String] = []
-    private var httpServer: OFHTTPServer
-    private var httpServerDelegate: HTTPServerDelegate
-    private var httpServerThread: OFThread
-
-    required init?(coder aDecoder: NSCoder) {
-        httpServer = OFHTTPServer()
-        httpServer.host = "127.0.0.1".ofObject
-
-        httpServerDelegate = HTTPServerDelegate()
-        httpServer.delegate = self.httpServerDelegate
-
-        httpServerThread = OFThread()
-
-        super.init(coder: aDecoder)
-    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -58,13 +43,6 @@ class SelectKeyFileController: UITableViewController {
             navigationController?.popViewController(animated: true)
             return
         }
-
-        httpServerThread.start()
-    }
-
-    override func viewDidDisappear(_ animated: Bool) {
-        httpServerThread.runLoop.stop()
-        httpServerThread.join()
     }
 
     override func tableView(_ tableView: UITableView,
@@ -92,29 +70,4 @@ class SelectKeyFileController: UITableViewController {
 
         self.navigationController?.popViewController(animated: true)
     }
-
-    @IBAction func upload(_ sender: Any?) {
-        let timer = OFTimer.scheduledTimer(withTimeInterval: 0,
-                                           repeats: false) { (OFTimer) in
-            self.httpServer.port = 0
-            self.httpServer.start()
-
-            let message =
-                "Navigate to http://\(self.httpServer.host!.nsObject):" +
-                "\(self.httpServer.port)/ in your browser.\n\n" +
-                "Press OK when done."
-            let alert = UIAlertController(title: "Server Running",
-                                          message: message,
-                                          preferredStyle: .alert)
-            alert.addAction(
-                UIAlertAction(title: "OK", style: .default, handler: nil))
-
-            DispatchQueue.main.sync {
-                self.present(alert, animated: true) {
-                    self.httpServer.stop()
-                }
-            }
-        }
-        httpServerThread.runLoop.add(timer)
-    }
 }

From a8b4dc943f409a6b35502f273c9510fc503bf15d Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Sat, 21 Dec 2024 20:55:46 +0000
Subject: [PATCH 2/5] Update copyright

FossilOrigin-Name: 32913793c8ee46edae2797f5e1063ed0a034aa77da6bcad037899286a53dc5c9
---
 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/MainViewController.swift      | 2 +-
 iOS/SelectKeyFileController.swift | 2 +-
 iOS/ShowDetailsController.swift   | 2 +-
 iOS/SiteStorage.swift             | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CryptoPassphrase.h b/CryptoPassphrase.h
index eb9a949..4b91ae2 100644
--- a/CryptoPassphrase.h
+++ b/CryptoPassphrase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/CryptoPassphrase.m b/CryptoPassphrase.m
index 759553a..8040e02 100644
--- a/CryptoPassphrase.m
+++ b/CryptoPassphrase.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/LegacyPasswordGenerator.h b/LegacyPasswordGenerator.h
index 0565d5c..811589a 100644
--- a/LegacyPasswordGenerator.h
+++ b/LegacyPasswordGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/LegacyPasswordGenerator.m b/LegacyPasswordGenerator.m
index 20a539f..0d266dc 100644
--- a/LegacyPasswordGenerator.m
+++ b/LegacyPasswordGenerator.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/NewPasswordGenerator.h b/NewPasswordGenerator.h
index 8fea2e0..a7ba274 100644
--- a/NewPasswordGenerator.h
+++ b/NewPasswordGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/NewPasswordGenerator.m b/NewPasswordGenerator.m
index d348d58..95732dc 100644
--- a/NewPasswordGenerator.m
+++ b/NewPasswordGenerator.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/PasswordGenerator.h b/PasswordGenerator.h
index 54d3bcb..556403d 100644
--- a/PasswordGenerator.h
+++ b/PasswordGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/iOS/AboutController.swift b/iOS/AboutController.swift
index 68c2d6a..ed42236 100644
--- a/iOS/AboutController.swift
+++ b/iOS/AboutController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/iOS/AddSiteController.swift b/iOS/AddSiteController.swift
index cad824b..bf7c51f 100644
--- a/iOS/AddSiteController.swift
+++ b/iOS/AddSiteController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift
index 3c29da4..7f1d64e 100644
--- a/iOS/AppDelegate.swift
+++ b/iOS/AppDelegate.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/iOS/MainViewController.swift b/iOS/MainViewController.swift
index 897c6c6..2bc6d18 100644
--- a/iOS/MainViewController.swift
+++ b/iOS/MainViewController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/iOS/SelectKeyFileController.swift b/iOS/SelectKeyFileController.swift
index e13aa30..adb237f 100644
--- a/iOS/SelectKeyFileController.swift
+++ b/iOS/SelectKeyFileController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/iOS/ShowDetailsController.swift b/iOS/ShowDetailsController.swift
index a401d4e..c05da72 100644
--- a/iOS/ShowDetailsController.swift
+++ b/iOS/ShowDetailsController.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *
diff --git a/iOS/SiteStorage.swift b/iOS/SiteStorage.swift
index a2ee1a7..5d69b82 100644
--- a/iOS/SiteStorage.swift
+++ b/iOS/SiteStorage.swift
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
  * https://fl.nil.im/cryptopassphrase
  *

From a6d5cc9bf9fd37bb727de7e379c0d3f675c9868b Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Sat, 21 Dec 2024 20:58:20 +0000
Subject: [PATCH 3/5] Add .fossil-settings

FossilOrigin-Name: b64bd1e5b7be7de7f114c30fa2f6d72283e3221a38977c468cf6e8d6cff13df2
---
 .fossil-settings/ignore-glob | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .fossil-settings/ignore-glob

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
new file mode 100644
index 0000000..a5c8b01
--- /dev/null
+++ b/.fossil-settings/ignore-glob
@@ -0,0 +1,2 @@
+iOS/CryptoPassphrase.xcodeproj/project.xcworkspace
+iOS/CryptoPassphrase.xcodeproj/xcuserdata

From de918b4b0786b5fd384faa73ff2f0d21dcf97b2c Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Sun, 22 Jun 2025 22:34:20 +0200
Subject: [PATCH 4/5] Convert .fossil/ignore-glob to .gitignore

---
 .fossil-settings/ignore-glob | 2 --
 .gitignore                   | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 .fossil-settings/ignore-glob
 create mode 100644 .gitignore

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
deleted file mode 100644
index a5c8b01..0000000
--- a/.fossil-settings/ignore-glob
+++ /dev/null
@@ -1,2 +0,0 @@
-iOS/CryptoPassphrase.xcodeproj/project.xcworkspace
-iOS/CryptoPassphrase.xcodeproj/xcuserdata
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8ab4517
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/iOS/CryptoPassphrase.xcodeproj/project.xcworkspace
+/iOS/CryptoPassphrase.xcodeproj/xcuserdata

From d984b1781e2fc6961877261822206856eb517bc7 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Tue, 24 Jun 2025 18:19:21 +0200
Subject: [PATCH 5/5] Update URL

---
 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/MainViewController.swift      | 2 +-
 iOS/SelectKeyFileController.swift | 2 +-
 iOS/ShowDetailsController.swift   | 2 +-
 iOS/SiteStorage.swift             | 2 +-
 iOS/bridge.h                      | 2 +-
 iOS/main.m                        | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CryptoPassphrase.h b/CryptoPassphrase.h
index 4b91ae2..305f762 100644
--- a/CryptoPassphrase.h
+++ b/CryptoPassphrase.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/CryptoPassphrase.m b/CryptoPassphrase.m
index 8040e02..6f5ab0d 100644
--- a/CryptoPassphrase.m
+++ b/CryptoPassphrase.m
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/LegacyPasswordGenerator.h b/LegacyPasswordGenerator.h
index 811589a..14d98bf 100644
--- a/LegacyPasswordGenerator.h
+++ b/LegacyPasswordGenerator.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/LegacyPasswordGenerator.m b/LegacyPasswordGenerator.m
index 0d266dc..5972561 100644
--- a/LegacyPasswordGenerator.m
+++ b/LegacyPasswordGenerator.m
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/NewPasswordGenerator.h b/NewPasswordGenerator.h
index a7ba274..b934583 100644
--- a/NewPasswordGenerator.h
+++ b/NewPasswordGenerator.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/NewPasswordGenerator.m b/NewPasswordGenerator.m
index 95732dc..2eefd35 100644
--- a/NewPasswordGenerator.m
+++ b/NewPasswordGenerator.m
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/PasswordGenerator.h b/PasswordGenerator.h
index 556403d..890bfb6 100644
--- a/PasswordGenerator.h
+++ b/PasswordGenerator.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/iOS/AboutController.swift b/iOS/AboutController.swift
index ed42236..4cd5d61 100644
--- a/iOS/AboutController.swift
+++ b/iOS/AboutController.swift
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/iOS/AddSiteController.swift b/iOS/AddSiteController.swift
index bf7c51f..ff8a54e 100644
--- a/iOS/AddSiteController.swift
+++ b/iOS/AddSiteController.swift
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift
index 7f1d64e..452edf0 100644
--- a/iOS/AppDelegate.swift
+++ b/iOS/AppDelegate.swift
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/iOS/MainViewController.swift b/iOS/MainViewController.swift
index 2bc6d18..0effddc 100644
--- a/iOS/MainViewController.swift
+++ b/iOS/MainViewController.swift
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/iOS/SelectKeyFileController.swift b/iOS/SelectKeyFileController.swift
index adb237f..50ea5ea 100644
--- a/iOS/SelectKeyFileController.swift
+++ b/iOS/SelectKeyFileController.swift
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/iOS/ShowDetailsController.swift b/iOS/ShowDetailsController.swift
index c05da72..6cfad18 100644
--- a/iOS/ShowDetailsController.swift
+++ b/iOS/ShowDetailsController.swift
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/iOS/SiteStorage.swift b/iOS/SiteStorage.swift
index 5d69b82..827a704 100644
--- a/iOS/SiteStorage.swift
+++ b/iOS/SiteStorage.swift
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2024 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/iOS/bridge.h b/iOS/bridge.h
index 144ce6f..684f5e5 100644
--- a/iOS/bridge.h
+++ b/iOS/bridge.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/iOS/main.m b/iOS/main.m
index 8bc94b4..e7a9a9f 100644
--- a/iOS/main.m
+++ b/iOS/main.m
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016 - 2023 Jonathan Schleifer <js@nil.im>
  *
- * https://fl.nil.im/cryptopassphrase
+ * https://git.nil.im/js/CryptoPassphrase
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above