Skip to content

Commit d8a10ac

Browse files
authored
Merge branch 'owncloud:master' into feat/copy_snack_bar
2 parents d6af3a8 + c034631 commit d8a10ac

File tree

70 files changed

+2228
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2228
-172
lines changed

.github/workflows/android-instrumented-data-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
2222

2323
- name: Set up JDK 17
24-
uses: actions/setup-java@v5
24+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
2525
with:
2626
java-version: '17'
2727
distribution: 'temurin'
@@ -33,7 +33,7 @@ jobs:
3333
sudo udevadm trigger --name-match=kvm
3434
3535
- name: Run Instrumented Data Tests with emulator
36-
uses: reactivecircus/android-emulator-runner@v2
36+
uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a #v2.37.0
3737
with:
3838
api-level: 33
3939
target: google_apis

.github/workflows/android-unit-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
2222

2323
- name: Set up JDK 17
24-
uses: actions/setup-java@v5
24+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
2525
with:
2626
java-version: '17'
2727
distribution: 'temurin'
2828

2929
- name: Set up Gradle
30-
uses: gradle/actions/setup-gradle@v5
30+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
3131

3232
- name: Build with Gradle
3333
run: ./gradlew assembleDebug

.github/workflows/build-apk.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
6969
# Checkout the repo
7070
- name: Checkout current repo
71-
uses: actions/checkout@v5
71+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
7272
with:
7373
repository: owncloud/android
7474
ref: ${{ inputs.version }}
@@ -83,14 +83,14 @@ jobs:
8383
8484
# Set Java-JDK version
8585
- name: Setup JDK
86-
uses: actions/setup-java@v5
86+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
8787
with:
8888
distribution: 'temurin'
8989
java-version: '17'
9090

9191
# Cache gradle
9292
- name: Cache Gradle
93-
uses: actions/cache@v5
93+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 #v5.0.4
9494
with:
9595
path: |
9696
~/.gradle/caches
@@ -134,7 +134,7 @@ jobs:
134134
135135
# Publish the artifact
136136
- name: Upload artifact
137-
uses: actions/upload-artifact@v6
137+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f #v7.0.0
138138
with:
139139
name: ${{ steps.set_artifact.outputs.artifact_name }}
140140
path: ./${{ steps.set_artifact.outputs.artifact_name }}

.github/workflows/calens.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
name: Generate Calens Changelog
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
2424
with:
2525
persist-credentials: false
2626
- name: Run Calens
27-
uses: actionhippie/calens@v1.12.4
27+
uses: actionhippie/calens@244f3e5c328b842a740113859b87bbebf697f63b #v1.13.0
2828
with:
2929
target: CHANGELOG.md
3030
- name: Commit files
31-
uses: GuillaumeFalourd/git-commit-push@v1.3
31+
uses: GuillaumeFalourd/git-commit-push@205c043bca2f932f7a48a28a8d619ba30eb84baf #v1.3
3232
with:
3333
email: devops@owncloud.com
3434
name: ownClouders

.github/workflows/conventional-commits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
# Checkout the repository
1919
- name: Checkout repository
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
2121
with:
2222
# Limit of validation to skip fetching all existing commits
2323
fetch-depth: 100

.github/workflows/detekt.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
2626
- name: Set up JDK 17
27-
uses: actions/setup-java@v5
27+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
2828
with:
2929
java-version: '17'
3030
distribution: 'temurin'
3131

3232
# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
3333
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
3434
- name: Setup Gradle
35-
uses: gradle/actions/setup-gradle@v5
35+
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
3636
- name: detekt execution
3737
run: ./gradlew detekt

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: "Validation"
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v5
13-
- uses: gradle/actions/setup-gradle@v5
12+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
13+
- uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
1414
with:
1515
validate-wrappers: true

.github/workflows/sbom.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
# Checkout the repository
3030
- name: Checkout repository
31-
uses: actions/checkout@v5
31+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
3232
with:
3333
# Parent commit to compare
3434
fetch-depth: 2
@@ -37,7 +37,7 @@ jobs:
3737

3838
# Cache Gradle dependencies to speed up future builds
3939
- name: Cache Gradle dependencies
40-
uses: actions/cache@v5
40+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 #v5.0.4
4141
with:
4242
path: |
4343
~/.gradle/caches
@@ -49,7 +49,7 @@ jobs:
4949
5050
# Set up Java 17 (required by Gradle and CycloneDX plugin)
5151
- name: Set up JDK 17
52-
uses: actions/setup-java@v5
52+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
5353
with:
5454
java-version: '17'
5555
distribution: 'temurin'
@@ -101,7 +101,7 @@ jobs:
101101
# Commit the SBOM file only if it differs from master to avoid unnecessary commits
102102
- name: Commit and push updated SBOM
103103
if: steps.compare.outputs.no_changes == 'false'
104-
uses: GuillaumeFalourd/git-commit-push@v1.3
104+
uses: GuillaumeFalourd/git-commit-push@205c043bca2f932f7a48a28a8d619ba30eb84baf #v1.3
105105
with:
106106
commit_message: "docs: SBOM updated"
107107
files: sbom.json

.github/workflows/validate-source-strings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
1717

1818
- name: Install xmlstarlet
1919
run: sudo apt-get update && sudo apt-get install -y xmlstarlet

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,18 @@ ownCloud admins and users.
4747
* Bugfix - Conventional commits' action ignores SBOM automatic commits: [#4808](https://github.com/owncloud/android/pull/4808)
4848
* Change - Migrate tests to the new kotlinx-coroutines-test API: [#4710](https://github.com/owncloud/android/issues/4710)
4949
* Change - Increase rating dialog delay: [#4744](https://github.com/owncloud/android/pull/4744)
50+
* Change - Resource leak in CopyAndUploadContentUrisTask: [#4797](https://github.com/owncloud/android/issues/4797)
5051
* Change - Stream handling and double-close in UploadFileFromContentUriWorker: [#4798](https://github.com/owncloud/android/issues/4798)
5152
* Change - Update actions dependencies to be compliant with Node24 requirements: [#4804](https://github.com/owncloud/android/pull/4804)
53+
* Change - Actions with SHA commits instead of versions: [#4815](https://github.com/owncloud/android/pull/4815)
5254
* Enhancement - Show members of a space: [#4612](https://github.com/owncloud/android/issues/4612)
5355
* Enhancement - Add a member to a space: [#4613](https://github.com/owncloud/android/issues/4613)
5456
* Enhancement - Set emoji as space image: [#4707](https://github.com/owncloud/android/issues/4707)
5557
* Enhancement - Edit a space member: [#4724](https://github.com/owncloud/android/issues/4724)
5658
* Enhancement - Remove a space member: [#4725](https://github.com/owncloud/android/issues/4725)
5759
* Enhancement - Workflow to build APK: [#4751](https://github.com/owncloud/android/pull/4751)
5860
* Enhancement - List links over a space: [#4752](https://github.com/owncloud/android/issues/4752)
61+
* Enhancement - Add a public link over a space: [#4753](https://github.com/owncloud/android/issues/4753)
5962
* Enhancement - Copy permanent link of a space: [#4758](https://github.com/owncloud/android/issues/4758)
6063
* Enhancement - Workflow to check Conventional Commits: [#4759](https://github.com/owncloud/android/pull/4759)
6164
* Enhancement - QA Content Provider: [#4776](https://github.com/owncloud/android/pull/4776)
@@ -116,6 +119,15 @@ ownCloud admins and users.
116119

117120
https://github.com/owncloud/android/pull/4744
118121

122+
* Change - Resource leak in CopyAndUploadContentUrisTask: [#4797](https://github.com/owncloud/android/issues/4797)
123+
124+
Input and output streams have been closed per URI iteration using
125+
try-with-resources to prevent file descriptor and memory leaks when copying
126+
multiple content URIs.
127+
128+
https://github.com/owncloud/android/issues/4797
129+
https://github.com/owncloud/android/pull/4806
130+
119131
* Change - Stream handling and double-close in UploadFileFromContentUriWorker: [#4798](https://github.com/owncloud/android/issues/4798)
120132

121133
Both the content resolver input stream and the file output stream from
@@ -132,6 +144,13 @@ ownCloud admins and users.
132144

133145
https://github.com/owncloud/android/pull/4804
134146

147+
* Change - Actions with SHA commits instead of versions: [#4815](https://github.com/owncloud/android/pull/4815)
148+
149+
Commit SHA references have been added to GitHub Actions workflows to be
150+
compliant with new security policies
151+
152+
https://github.com/owncloud/android/pull/4815
153+
135154
* Enhancement - Show members of a space: [#4612](https://github.com/owncloud/android/issues/4612)
136155

137156
A new option to view all members of a space has been added to the bottom sheet,
@@ -200,6 +219,14 @@ ownCloud admins and users.
200219
https://github.com/owncloud/android/issues/4752
201220
https://github.com/owncloud/android/pull/4783
202221

222+
* Enhancement - Add a public link over a space: [#4753](https://github.com/owncloud/android/issues/4753)
223+
224+
A new option to add public links over a space has been added. It will be only
225+
visible for users with proper permissions.
226+
227+
https://github.com/owncloud/android/issues/4753
228+
https://github.com/owncloud/android/pull/4794
229+
203230
* Enhancement - Copy permanent link of a space: [#4758](https://github.com/owncloud/android/issues/4758)
204231

205232
A new option to copy and share the permanent link of a space has been added next

0 commit comments

Comments
 (0)