owncloud · hosy · Mar 29, 2022 · Mar 17, 2022 · Mar 17, 2022 · Mar 23, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,34 @@
+Changelog for ownCloud iOS Client [11.9.1] (2022-03-24)
+=======================================
+The following sections list the changes in ownCloud iOS Client 11.9.1 relevant to
+ownCloud admins and users.
+
+[11.9.1]: https://github.com/owncloud/ios-app/compare/milestone/11.9.0...milestone/11.9.1
+
+Summary
+-------
+
+* Bugfix - Setup Passcode with Biometrical Unlock: [#1112](https://github.com/owncloud/ios-app/pull/1112)
+* Change - Set App Group Identifier: [#1099](https://github.com/owncloud/ios-app/pull/1099)
+
+Details
+-------
+
+* Bugfix - Setup Passcode with Biometrical Unlock: [#1112](https://github.com/owncloud/ios-app/pull/1112)
+
+   Biometrical unlock button no longer appear in setup view and after passcode was successfully
+   setup, show biometrical unlock for permissions dialog.
+
+   https://github.com/owncloud/ios-app/pull/1112
+
+* Change - Set App Group Identifier: [#1099](https://github.com/owncloud/ios-app/pull/1099)
+
+   Set a custom app group identifier via Branding.plist this parameter. This value will be set by
+   fastlane to all needed Info.plist keys. This is needed, if a customer is using an own resigning
+   script which does not handle setting the app group identifier.
+
+   https://github.com/owncloud/ios-app/pull/1099
+
 Changelog for ownCloud iOS Client [11.9.0] (2022-03-16)
 =======================================
 The following sections list the changes in ownCloud iOS Client 11.9.0 relevant to

diff --git a/changelog/11.9.1_2022-03-24/1099 b/changelog/11.9.1_2022-03-24/1099
@@ -0,0 +1,5 @@
+Change: Set App Group Identifier
+
+Set a custom app group identifier via Branding.plist this parameter. This value will be set by fastlane to all needed Info.plist keys. This is needed, if a customer is using an own resigning script which does not handle setting the app group identifier.
+
+https://github.com/owncloud/ios-app/pull/1099
diff --git a/changelog/11.9.1_2022-03-24/1112 b/changelog/11.9.1_2022-03-24/1112
@@ -0,0 +1,5 @@
+Bugfix: Setup Passcode with Biometrical Unlock
+
+Biometrical unlock button no longer appear in setup view and after passcode was successfully setup, show biometrical unlock for permissions dialog.
+
+https://github.com/owncloud/ios-app/pull/1112
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -453,6 +453,7 @@ end
     ENTERPRISE_TEAM = values[:ENTERPRISE_TEAM]
     ENTERPRISE_IDENTITY = values[:ENTERPRISE_IDENTITY]
     APP_GROUP_IDENTIFIERS = values[:APP_GROUP_IDENTIFIERS]
+    OC_APP_GROUP_IDENTIFIERS = values[:APP_GROUP_IDENTIFIERS]
     EXPORT_METHOD = values[:EXPORT_METHOD]
     CONFIGURATION = values[:CONFIGURATION]
     BUILD_NUMBER = values[:BUILD_NUMBER]
@@ -561,7 +562,9 @@ end
     set_info_plist_value(path: "ownCloud/Resources/Info.plist", key: "CFBundleDisplayName", value: appName)
     set_info_plist_value(path: "ownCloud/Resources/Info.plist", key: "CFBundleName", value: appName)
 
+    # Check, if Branding.plist file exists and handle custom set values
     if File.exist?("../" + themePath)
+      # Check for custom app version number
         tmpCustomAppVersionNumber = get_info_plist_value(path: themePath, key: "app.version-number")
         if tmpCustomAppVersionNumber && !tmpCustomAppVersionNumber.empty?
           customAppVersionNumber = tmpCustomAppVersionNumber
@@ -573,6 +576,19 @@ end
           set_info_plist_value(path: "ownCloud Share Extension/Info.plist", key: "CFBundleShortVersionString", value: customAppVersionNumber)
           set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "CFBundleShortVersionString", value: customAppVersionNumber)
         end
+
+        # Check for custom app group identifier
+        tmpAPP_GROUP_IDENTIFIERS = get_info_plist_value(path: themePath, key: "build.app-group-identifier")
+        if tmpAPP_GROUP_IDENTIFIERS && !tmpAPP_GROUP_IDENTIFIERS.empty?
+          APP_GROUP_IDENTIFIERS = tmpAPP_GROUP_IDENTIFIERS
+          OC_APP_GROUP_IDENTIFIERS = tmpAPP_GROUP_IDENTIFIERS
+        end
+
+        # Check for custom OC app group identifier
+        tmpOC_APP_GROUP_IDENTIFIERS = get_info_plist_value(path: themePath, key: "build.oc-app-group-identifier")
+        if tmpOC_APP_GROUP_IDENTIFIERS && !tmpOC_APP_GROUP_IDENTIFIERS.empty?
+          OC_APP_GROUP_IDENTIFIERS = tmpOC_APP_GROUP_IDENTIFIERS
+        end
     end
 
     if !values[:BUILD_NUMBER].nil?
@@ -683,15 +699,17 @@ end
       identifiers: [ENTERPRISE_TEAM + "." + APP_GROUP_IDENTIFIERS]
 	)
 
-    set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCAppGroupIdentifier", value: APP_GROUP_IDENTIFIERS)
-    set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCAppGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
     set_info_plist_value(path: "ownCloud File Provider/Info.plist", key: "NSExtension", subkey: "NSExtensionFileProviderDocumentGroup", value: APP_GROUP_IDENTIFIERS)
-    set_info_plist_value(path: "ownCloud File Provider UI/Info.plist", key: "OCAppGroupIdentifier", value: APP_GROUP_IDENTIFIERS)
-    set_info_plist_value(path: "ownCloud File Provider UI/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: APP_GROUP_IDENTIFIERS)
-    set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCAppGroupIdentifier", value: APP_GROUP_IDENTIFIERS)
-    set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: APP_GROUP_IDENTIFIERS)
-    set_info_plist_value(path: "ownCloud Share Extension/Info.plist", key: "OCAppGroupIdentifier", value: APP_GROUP_IDENTIFIERS)
-    set_info_plist_value(path: "ownCloud Share Extension/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud File Provider UI/Info.plist", key: "OCAppGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud File Provider UI/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCAppGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud Intents/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud Share Extension/Info.plist", key: "OCAppGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud Share Extension/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud/Resources/Info.plist", key: "OCAppGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
+    set_info_plist_value(path: "ownCloud/Resources/Info.plist", key: "OCKeychainAccessGroupIdentifier", value: OC_APP_GROUP_IDENTIFIERS)
 
     automatic_code_signing(
       path: "ownCloud.xcodeproj",

diff --git a/fastlane/metadata-emm/en-US/release_notes.txt b/fastlane/metadata-emm/en-US/release_notes.txt
@@ -1,12 +1,6 @@
-• Biometrical Authentication Button
-Added a biometrical authentication button to the passcode unlock view. The biomatrical cancel button enables passcode unlock as fallback.
-
-• Rename Account
-Renaming an account does no longer need a re-authentication
-
-• Media Playback
-Fixes a bug where media playback failed
-
 • Faster Account Scan
 We improved the time for the initial scan after setting up a new account
 
+• Biometrical Authentication Button
+Improvements when setting up a passcode with biometrical unlock
+
diff --git a/fastlane/metadata-owncloud-online/en-US/release_notes.txt b/fastlane/metadata-owncloud-online/en-US/release_notes.txt
@@ -1,12 +1,6 @@
-• Biometrical Authentication Button
-Added a biometrical authentication button to the passcode unlock view. The biomatrical cancel button enables passcode unlock as fallback.
-
-• Rename Account
-Renaming an account does no longer need a re-authentication
-
-• Media Playback
-Fixes a bug where media playback failed
-
 • Faster Account Scan
 We improved the time for the initial scan after setting up a new account
 
+• Biometrical Authentication Button
+Improvements when setting up a passcode with biometrical unlock
+
diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt
@@ -1,12 +1,6 @@
-• Biometrical Authentication Button
-Added a biometrical authentication button to the passcode unlock view. The biomatrical cancel button enables passcode unlock as fallback.
-
-• Rename Account
-Renaming an account does no longer need a re-authentication
-
-• Media Playback
-Fixes a bug where media playback failed
-
 • Faster Account Scan
 We improved the time for the initial scan after setting up a new account
 
+• Biometrical Authentication Button
+Improvements when setting up a passcode with biometrical unlock
+
diff --git a/ios-sdk b/ios-sdk
diff --git a/ownCloud.xcodeproj/project.pbxproj b/ownCloud.xcodeproj/project.pbxproj
@@ -4730,8 +4730,8 @@
 				APP_BUILD_FLAGS = "$(inherited)";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = ownCloud;
-				APP_SHORT_VERSION = 11.9.0;
-				APP_VERSION = 211;
+				APP_SHORT_VERSION = 11.9.1;
+				APP_VERSION = 212;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4799,8 +4799,8 @@
 				APP_BUILD_FLAGS = "$(inherited)";
 				APP_BUILD_FLAGS_SWIFT = "$(APP_BUILD_FLAGS)";
 				APP_PRODUCT_NAME = ownCloud;
-				APP_SHORT_VERSION = 11.9.0;
-				APP_VERSION = 211;
+				APP_SHORT_VERSION = 11.9.1;
+				APP_VERSION = 212;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4863,8 +4863,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				APP_SHORT_VERSION = 11.9.0;
-				APP_VERSION = 211;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = ownCloud/ownCloud.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -4897,8 +4895,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				APP_SHORT_VERSION = 11.9.0;
-				APP_VERSION = 211;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = ownCloud/ownCloud.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -5255,8 +5251,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
-				APP_SHORT_VERSION = 11.9.0;
-				APP_VERSION = 211;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -5299,8 +5293,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
-				APP_SHORT_VERSION = 11.9.0;
-				APP_VERSION = 211;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;

diff --git a/ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud.xcscheme b/ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud.xcscheme
@@ -305,6 +305,11 @@
             value = "[web-finger]"
             isEnabled = "NO">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "oc:host-simulator.active-simulations"
+            value = "[auth-race-condition]"
+            isEnabled = "NO">
+         </EnvironmentVariable>
          <EnvironmentVariable
             key = "oc:server-locator.use"
             value = "string:web-finger"

diff --git a/ownCloud.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ownCloud.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,25 +1,23 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "PLCrashReporter",
-        "repositoryURL": "https://github.com/microsoft/plcrashreporter.git",
-        "state": {
-          "branch": null,
-          "revision": "4637a7854de2cc5c354d46fb931d74bdbc2c043e",
-          "version": "1.7.0"
-        }
-      },
-      {
-        "package": "PocketSVG",
-        "repositoryURL": "https://github.com/pocketsvg/PocketSVG.git",
-        "state": {
-          "branch": null,
-          "revision": "51d4fd9ae48e79207034afdd53f365fc2b9d6068",
-          "version": "2.7.0"
-        }
+  "pins" : [
+    {
+      "identity" : "plcrashreporter",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/microsoft/plcrashreporter.git",
+      "state" : {
+        "revision" : "4637a7854de2cc5c354d46fb931d74bdbc2c043e",
+        "version" : "1.7.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "pocketsvg",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pocketsvg/PocketSVG.git",
+      "state" : {
+        "revision" : "51d4fd9ae48e79207034afdd53f365fc2b9d6068",
+        "version" : "2.7.0"
+      }
+    }
+  ],
+  "version" : 2
 }
+23 −0		CHANGELOG.md
+0 −1		README.md
+8 −3		ownCloudSDK/Authentication/OCAuthenticationMethodOAuth2.m
+2 −0		ownCloudSDK/Cellular/OCNetworkMonitor.m
+5 −0		ownCloudSDK/Connection/OCConnection.m
+2 −0		ownCloudSDK/Core/Connection Status/Network Monitor/OCCoreNetworkMonitorSignalProvider.m
+2 −0		ownCloudSDK/HTTP/Request/OCHTTPRequest.h
+12 −2		ownCloudSDK/HTTP/Request/OCHTTPRequest.m
+48 −0		ownCloudSDK/Host Simulator/OCHostSimulator+BuiltIn.m
+8 −1		ownCloudSDK/Resource Management/OCBookmarkManager.m