Merge branch 'master' into feature/confidential-protection

.github/workflows/pull-transifex.yml

@@ -25,7 +25,7 @@ jobs:
         shell: bash
         run: |
           beautifyJSON() {
-            jq --sort-keys . "$1" >"$1.tmp"
+            jq --sort-keys 'walk(if type == "object" then del(."th_TH", ."pt_PT", ."pt_BR", ."nn_NO", ."nb_NO", ."en_GB") else . end)' "$1" >"$1.tmp"
             mv "$1.tmp" "$1"
           }
           beautifyJSON "ownCloud Action Extension/InfoPlist.xcstrings"
@@ -35,6 +35,17 @@ jobs:
           beautifyJSON "ownCloud/Resources/Localizable.xcstrings"
           beautifyJSON "ownCloudAppFramework/Resources/Localizable.xcstrings"
 
+      - name: Setup Swift
+        uses: swift-actions/setup-swift@v2.1.0
+
+      - name: Build ocstringstool
+        run: |
+          swift -v
+          swiftc tools/normalizestrings/main.swift -o /tmp/ocstringstool
+
+      - name: Run ocstringstool
+        run: /tmp/ocstringstool normalize "ownCloud/Resources" "ownCloud Action Extension" "ownCloud File Provider" "ownCloud Share Extension" "ownCloudAppFramework/Resources"
+
       - uses: GuillaumeFalourd/git-commit-push@v1.3
         with:
           email: devops@owncloud.com

doc/CONFIGURATION.json

@@ -662,20 +662,6 @@
     "status" : "advanced",
     "type" : "stringArray"
   },
-  {
-    "autoExpansion" : "none",
-    "category" : "OAuth2",
-    "categoryTag" : "oauth2",
-    "classIdentifier" : "authentication-oauth2",
-    "className" : "OCAuthenticationMethodOAuth2",
-    "defaultValue" : false,
-    "description" : "Send Client ID and Client Secret in the body of POST requests to the token endpoint. As per RFC 6749 section 2.3.1, this should only be used if the token endpoint does not support receiving these via Basic authentication.",
-    "flatIdentifier" : "authentication-oauth2.post-client-id-and-secret",
-    "key" : "post-client-id-and-secret",
-    "label" : "authentication-oauth2.post-client-id-and-secret",
-    "status" : "advanced",
-    "type" : "bool"
-  },
   {
     "autoExpansion" : "none",
     "category" : "Authentication",
@@ -726,19 +712,6 @@
     "status" : "supported",
     "type" : "bool"
   },
-  {
-    "autoExpansion" : "none",
-    "category" : "Authentication",
-    "categoryTag" : "authentication",
-    "classIdentifier" : "authentication",
-    "className" : "OCAuthenticationMethod",
-    "description" : "Overrides whether the default WebDAV endpoint should be probed to detect available authentication methods. By default, the necessity for this is determined dynamically.",
-    "flatIdentifier" : "authentication.skip-www-authenticate-checks",
-    "key" : "skip-www-authenticate-checks",
-    "label" : "authentication.skip-www-authenticate-checks",
-    "status" : "supported",
-    "type" : "bool"
-  },
   {
     "autoExpansion" : "none",
     "category" : "Bookmarks",

doc/configuration.adoc

@@ -409,12 +409,6 @@ tag::authentication[]
 |Indicates whether the app should ask iOS for a private authentication (web) session for OAuth2 or OpenID Connect. Private authentication sessions do not share cookies and other browsing data with the user's normal browser. Apple only promises that [this setting](https://developer.apple.com/documentation/authenticationservices/aswebauthenticationsession/3237231-prefersephemeralwebbrowsersessio) will be honored if the user has set Safari as default browser.
 |supported `candidate`
 
-|authentication.skip-www-authenticate-checks
-|bool
-|
-|Overrides whether the default WebDAV endpoint should be probed to detect available authentication methods. By default, the necessity for this is determined dynamically.
-|supported `candidate`
-
 |===
 end::authentication[]
 
@@ -1560,12 +1554,6 @@ tag::oauth2[]
 |Omit Authorization Request Parameters - parameter names provided here are omitted from OAuth2 authorization requests.
 |advanced `candidate`
 
-|authentication-oauth2.post-client-id-and-secret
-|bool
-|`false`
-|Send Client ID and Client Secret in the body of POST requests to the token endpoint. As per RFC 6749 section 2.3.1, this should only be used if the token endpoint does not support receiving these via Basic authentication.
-|advanced `candidate`
-
 |authentication-oauth2.oa2-expiration-override-seconds
 |int
 |