v2.6.7

johannes-schliephake · May 31, 2023 · d214206 · d214206
2 parents bf21c69 + c332a82
commit d214206
Show file tree

Hide file tree

Showing 24 changed files with 216 additions and 90 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,76 @@
+name: 🐞 Bug Report
+description: File a bug report
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please take the time to fill out this bug report as detailed as possible. Only then it is possible to understand and fix the issue.
+  - type: input
+    attributes:
+      label: iOS App Version
+      description: You can find the version info on the app's *Settings* page.
+      placeholder: E.g. 2.6.6
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: iOS Version
+      description: You can find your iOS version under *System Settings* → *General* → *About*.
+      placeholder: E.g. iOS 16.4
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Device Model
+      placeholder: E.g. iPhone 13, iPad Air 4th generation
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Nextcloud Server Version
+      description: You can find the version of your Nextcloud server in the web interface. Open the top right menu → *About*, then switch to the second pane.
+      placeholder: E.g. 26.0.0
+  - type: input
+    attributes:
+      label: Server App Version
+      description: You can find the version of your Passwords server app on the admin's *Apps* page.
+      placeholder: E.g. 2023.4.0
+  - type: textarea
+    attributes:
+      label: Peculiarities of Your Setup
+      placeholder: E.g. SSO, LDAP, server behind a proxy, ...
+  - type: textarea
+    attributes:
+      label: Observed Behavior
+      description: Describe the bug you experienced.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: Describe what you expected to happen instead.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: If the bug can be triggered reliably, provide step-by-step instructions on what to do to cause this behavior.
+      placeholder: |
+        1.
+        2.
+        3.
+        ...
+  - type: checkboxes
+    attributes:
+      label: Debugging
+      options:
+        - label: I did install the [TestFlight](https://testflight.apple.com/join/iuljLJ4u) version to check the log on the app's *Settings* page → *Log*.
+        - label: I did check for iOS logs named *Passwords* under *System Settings* → *Privacy & Security* → *Analytics & Improvements* → *Analytics Data*.
+        - label: I did check for Nextcloud logs on the admin's *Logging* page.
+  - type: textarea
+    attributes:
+      label: Logs
+      description: You can copy and paste any relevant logs here.
+      placeholder: This will be automatically formatted into code.
+      render: shell
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,18 @@
+name: 🚀 Feature Request
+description: Suggest an idea
+labels: ["feature"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please take the time to fill out this feature request as detailed as possible. This will help to understand your idea and the resulting requirements.
+  - type: textarea
+    attributes:
+      label: Feature Description
+      description: Describe in detail what the feature should do.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Rationale
+      description: Describe why this feature is important for you and how it would benefit other users.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,16 +8,16 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.705.0)
-    aws-sdk-core (3.170.0)
+    aws-partitions (1.739.0)
+    aws-sdk-core (3.171.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.62.0)
+    aws-sdk-kms (1.63.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.119.0)
+    aws-sdk-s3 (1.120.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.211.0)
+    fastlane (2.212.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -107,9 +107,9 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-versioning (0.5.1)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.33.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-core (0.10.0)
+    google-apis-androidpublisher_v3 (0.37.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -118,18 +118,18 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.16.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-playcustomapp_v1 (0.12.0)
-      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.19.0)
       google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
+    google-cloud-errors (1.3.1)
     google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -138,7 +138,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.3.0)
+    googleauth (1.5.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -161,7 +161,7 @@ GEM
     naturally (2.2.1)
     optparse (0.1.1)
     os (1.1.4)
-    plist (3.6.0)
+    plist (3.7.0)
     public_suffix (5.0.1)
     rake (13.0.6)
     representable (3.2.0)
@@ -215,6 +215,7 @@ GEM
 PLATFORMS
   x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-22
 
 DEPENDENCIES
   fastlane

diff --git a/LogicTests/LogicTests.swift b/LogicTests/LogicTests.swift
@@ -172,13 +172,20 @@ class LogicTests: XCTestCase {
         XCTAssertEqual(0.65, URL(string: "https://example.com")!.score(searchUrl: URL(string: "https://cloud.example.com")!), accuracy: 0.05)
 
         XCTAssertEqual(1.0, URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!.score(searchUrl: URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!), accuracy: 0.05)
-        XCTAssertEqual(0.8, URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!.score(searchUrl: URL(string: "https://cloud.example.com")!), accuracy: 0.05)
-        XCTAssertEqual(0.7, URL(string: "https://cloud.example.com")!.score(searchUrl: URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!), accuracy: 0.05)
+        XCTAssertEqual(0.95, URL(string: "https://cloud.example.com")!.score(searchUrl: URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!), accuracy: 0.05)
+        XCTAssertEqual(0.7, URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!.score(searchUrl: URL(string: "https://cloud.example.com")!), accuracy: 0.05)
 
-        XCTAssertEqual(0.7, URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!.score(searchUrl: URL(string: "https://example.com")!), accuracy: 0.05)
-        XCTAssertEqual(0.6, URL(string: "https://cloud.example.com")!.score(searchUrl: URL(string: "https://example.com/index.php/login?redirect_url=/index.php/apps/files")!), accuracy: 0.05)
-        XCTAssertEqual(0.6, URL(string: "https://example.com/index.php/login?redirect_url=/index.php/apps/files")!.score(searchUrl: URL(string: "https://cloud.example.com")!), accuracy: 0.05)
-        XCTAssertEqual(0.5, URL(string: "https://example.com")!.score(searchUrl: URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!), accuracy: 0.05)
+        XCTAssertEqual(0.7, URL(string: "https://cloud.example.com")!.score(searchUrl: URL(string: "https://example.com/index.php/login?redirect_url=/index.php/apps/files")!), accuracy: 0.05)
+        XCTAssertEqual(0.65, URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!.score(searchUrl: URL(string: "https://example.com")!), accuracy: 0.05)
+        XCTAssertEqual(0.6, URL(string: "https://example.com")!.score(searchUrl: URL(string: "https://cloud.example.com/index.php/login?redirect_url=/index.php/apps/files")!), accuracy: 0.05)
+        XCTAssertEqual(0.55, URL(string: "https://example.com/index.php/login?redirect_url=/index.php/apps/files")!.score(searchUrl: URL(string: "https://cloud.example.com")!), accuracy: 0.05)
+
+        XCTAssertEqual(1.0, URL(string: "https://cloud.example.com:1234")!.score(searchUrl: URL(string: "https://cloud.example.com:1234")!), accuracy: 0.05)
+        XCTAssertEqual(0.8, URL(string: "https://cloud.example.com:1234")!.score(searchUrl: URL(string: "https://cloud.example.com:4321")!), accuracy: 0.05)
+        XCTAssertEqual(0.8, URL(string: "https://cloud.example.com:1234")!.score(searchUrl: URL(string: "https://cloud.example.com")!), accuracy: 0.05)
+        XCTAssertEqual(0.8, URL(string: "https://cloud.example.com")!.score(searchUrl: URL(string: "https://cloud.example.com:1234")!), accuracy: 0.05)
+        XCTAssertEqual(0.6, URL(string: "https://cloud.example.com")!.score(searchUrl: URL(string: "https://example.com:1234")!), accuracy: 0.05)
+        XCTAssertEqual(0.5, URL(string: "https://example.com")!.score(searchUrl: URL(string: "https://cloud.example.com:1234")!), accuracy: 0.05)
     }
 
 }

diff --git a/Passwords.xcodeproj/project.pbxproj b/Passwords.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -1260,8 +1260,9 @@
 		8F118747253C9EE10019FECA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1300;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					8F11874E253C9EE10019FECA = {
 						CreatedOnToolsVersion = 12.0.1;
@@ -2113,7 +2114,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				CODE_SIGN_ENTITLEMENTS = App/Passwords.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				ENABLE_PREVIEWS = YES;
@@ -2123,7 +2124,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.6;
+				MARKETING_VERSION = 2.6.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
@@ -2140,7 +2141,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				CODE_SIGN_ENTITLEMENTS = App/Passwords.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				ENABLE_PREVIEWS = YES;
@@ -2150,7 +2151,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.6.6;
+				MARKETING_VERSION = 2.6.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
@@ -2206,7 +2207,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = Provider/Provider.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				INFOPLIST_FILE = Provider/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2215,7 +2216,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.6;
+				MARKETING_VERSION = 2.6.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER).Provider";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2229,7 +2230,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = Provider/Provider.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				INFOPLIST_FILE = Provider/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2238,7 +2239,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.6;
+				MARKETING_VERSION = 2.6.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER).Provider";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2293,7 +2294,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = ExtensionIcon;
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				INFOPLIST_FILE = Extension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2302,7 +2303,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.6;
+				MARKETING_VERSION = 2.6.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER).Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2317,7 +2318,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = ExtensionIcon;
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 33;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_TEAM = 3L4U93393E;
 				INFOPLIST_FILE = Extension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2326,7 +2327,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.6.6;
+				MARKETING_VERSION = 2.6.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PARENT_PRODUCT_BUNDLE_IDENTIFIER).Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2399,8 +2400,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/jedisct1/swift-sodium.git";
 			requirement = {
-				kind = revision;
-				revision = f67e6e0814ca9ab67f9ab20a1c0e63870bd52322;
+				branch = master;
+				kind = branch;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/Passwords.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Passwords.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,6 +5,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/jedisct1/swift-sodium.git",
       "state" : {
+        "branch" : "master",
         "revision" : "f67e6e0814ca9ab67f9ab20a1c0e63870bd52322"
       }
     }

diff --git a/Passwords.xcodeproj/xcshareddata/xcschemes/Extension.xcscheme b/Passwords.xcodeproj/xcshareddata/xcschemes/Extension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/Passwords.xcodeproj/xcshareddata/xcschemes/LogicTests.xcscheme b/Passwords.xcodeproj/xcshareddata/xcschemes/LogicTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Passwords.xcodeproj/xcshareddata/xcschemes/Passwords.xcscheme b/Passwords.xcodeproj/xcshareddata/xcschemes/Passwords.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Passwords.xcodeproj/xcshareddata/xcschemes/Provider.xcscheme b/Passwords.xcodeproj/xcshareddata/xcschemes/Provider.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction