diff --git a/.github/workflows/generate-sbom.yml b/.github/workflows/generate-sbom.yml index ada2a8d2f..a579a5f73 100644 --- a/.github/workflows/generate-sbom.yml +++ b/.github/workflows/generate-sbom.yml @@ -33,10 +33,24 @@ jobs: shell: bash run: | trimAndFormatJSON() { - jq 'del(.serialNumber, .metadata.timestamp, .annotations[].timestamp, .annotations[].text)' "$1" >"$1.tmp" + jq 'del(.serialNumber, .metadata.timestamp, .annotations[].timestamp, .annotations[].text, .components[].tags)' "$1" >"$1.tmp" + mv "$1.tmp" "$1" + } + addSHA3IUFLicense() { + jq '.components[] |= + (if .name == "SHA3IUF" + then . + { + licenses: [{license: {id: "MIT", "url": "https://github.com/brainhub/SHA3IUF/blob/master/LICENSE"}}], + externalReferences: ([.externalReferences[]?] + + [{type: "vcs", url: "https://github.com/brainhub/SHA3IUF.git"}]), + type: "library", + version: "fc8504750a5c2174a1874094dd05e6a0d8797753", + } + else . end)' "$1" >"$1.tmp" mv "$1.tmp" "$1" } trimAndFormatJSON "sbom.json" + addSHA3IUFLicense "sbom.json" - name: Commit files uses: GuillaumeFalourd/git-commit-push@v1.3 with: diff --git a/ios-sdk b/ios-sdk index 9aeaf1aa4..ceda5fae8 160000 --- a/ios-sdk +++ b/ios-sdk @@ -1 +1 @@ -Subproject commit 9aeaf1aa4a6237ed0db62d48d83e91cd0b9f190c +Subproject commit ceda5fae8e20b2324544560dd791ea16fe94cb57 diff --git a/ownCloudAppShared/Client/Collection Views/Cells/UniversalItemListCell Content Providers/OCItem+UniversalItemListCellContentProvider.swift b/ownCloudAppShared/Client/Collection Views/Cells/UniversalItemListCell Content Providers/OCItem+UniversalItemListCellContentProvider.swift index 4e2b6cc68..1527f726f 100644 --- a/ownCloudAppShared/Client/Collection Views/Cells/UniversalItemListCell Content Providers/OCItem+UniversalItemListCellContentProvider.swift +++ b/ownCloudAppShared/Client/Collection Views/Cells/UniversalItemListCell Content Providers/OCItem+UniversalItemListCellContentProvider.swift @@ -216,6 +216,12 @@ extension OCItem: UniversalItemListCellContentProvider { // - Description var detailString: String = sizeLocalized + + if type == .collection { + if let core = context?.core, core.connection.isKiteworksServer { + detailString = "" + } + } if location?.type == .drive, let core = context?.core { detailString = driveQuotaLocalized(core: core) @@ -238,7 +244,7 @@ extension OCItem: UniversalItemListCellContentProvider { var detailStringAccessible = detailString - detailString += " - " + lastModifiedLocalized + detailString += (detailString.count > 0 ? " - " : "") + lastModifiedLocalized detailStringAccessible += " " + lastModifiedLocalizedAccessible let detailSegment = SegmentViewItem(with: nil, title: detailString, style: .plain, titleTextStyle: .footnote, lines: [.singleLine], accessibilityLabel: detailStringAccessible)