Skip to content

Commit dccbd02

Browse files
authored
Merge pull request #3960 from owncloud/release/4.0-beta.1
[Release] 4.0 beta.1
2 parents 9077f35 + a85ff84 commit dccbd02

23 files changed

Lines changed: 75 additions & 222 deletions

File tree

CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,49 @@ ownCloud admins and users.
88
Summary
99
-------
1010

11+
* Enhancement - Support for spaces: [#3851](https://github.com/owncloud/android/pull/3851)
1112
* Enhancement - Update label on Camera Uploads: [#3930](https://github.com/owncloud/android/pull/3930)
13+
* Enhancement - Authenticated WebFinger: [#3943](https://github.com/owncloud/android/issues/3943)
14+
* Enhancement - Link in drawer menu: [#3949](https://github.com/owncloud/android/pull/3949)
1215

1316
Details
1417
-------
1518

19+
* Enhancement - Support for spaces: [#3851](https://github.com/owncloud/android/pull/3851)
20+
21+
Spaces are now supported in oCIS accounts. A new tab has been added, which allows to list and
22+
browse through all the available spaces for the current account. The supported operations for
23+
files in spaces are: download, upload, remove, rename, create folder, copy and move. The
24+
documents provider has been adapted as well to be able to browse through spaces and perform the
25+
operations already mentioned.
26+
27+
https://github.com/owncloud/android/pull/3851
28+
1629
* Enhancement - Update label on Camera Uploads: [#3930](https://github.com/owncloud/android/pull/3930)
1730

1831
Update label on camera uploads to avoid confusions with the behavior of original files. Now, it
1932
is clear that original files will be removed.
2033

2134
https://github.com/owncloud/android/pull/3930
2235

36+
* Enhancement - Authenticated WebFinger: [#3943](https://github.com/owncloud/android/issues/3943)
37+
38+
Authenticated WebFinger was introduced into the authentication flow. Now, WebFinger is used
39+
to retrieve the OpenID Connect issuer and the available ownCloud instances. For the moment,
40+
multiple oC instances are not supported, only the first available instance is used.
41+
42+
https://github.com/owncloud/android/issues/3943
43+
https://github.com/owncloud/android/pull/3945
44+
https://doc.owncloud.com/ocis/next/deployment/services/s-list/webfinger.html
45+
46+
* Enhancement - Link in drawer menu: [#3949](https://github.com/owncloud/android/pull/3949)
47+
48+
Customers will be able now to set a personalized label and link that will appear in the drawer
49+
menu, together with the drawer logo as an icon.
50+
51+
https://github.com/owncloud/android/issues/3907
52+
https://github.com/owncloud/android/pull/3949
53+
2354
Changelog for ownCloud Android Client [3.0.4] (2023-03-07)
2455
=======================================
2556
The following sections list the changes in ownCloud Android Client 3.0.4 relevant to

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<a href="https://play.google.com/store/apps/details?id=com.owncloud.android"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="75"></a><a href="https://f-droid.org/packages/com.owncloud.android/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="75"></a>
44

5-
| <img src="docs_resources/filelist_device.png"> | <img src="docs_resources/photos_device.png"> | <img src="docs_resources/share_device.png"> |
6-
| ---------------------------------------------- | -------------------------------------------- | ------------------------------------------- |
5+
| <img src="docs_resources/filelist_device.png"> | <img src="docs_resources/photos_device.png"> | <img src="docs_resources/share_device.png"> | <img src="docs_resources/spaces_device.png"> |
6+
| ---------------------------------------------- | -------------------------------------------- | ------------------------------------------- | ------------------------------------------- |
77

88
## Join development!
99

docs_resources/filelist_device.png

248 KB
Loading

docs_resources/photos_device.png

282 KB
Loading

docs_resources/share_device.png

354 KB
Loading

docs_resources/spaces_device.png

2.69 MB
Loading

owncloudApp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ android {
9393

9494
testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner"
9595

96-
versionCode = 30000400
97-
versionName = "3.0.4"
96+
versionCode = 30000401
97+
versionName = "4.0-beta.1"
9898

9999
buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
100100
buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""

owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,21 @@ class ReleaseNotesViewModel(
4545

4646
companion object {
4747
val releaseNotesList = listOf(
48-
ReleaseNote(R.string.release_notes_3_0_title1, R.string.release_notes_3_0_subtitle1, ReleaseNoteType.ENHANCEMENT),
49-
ReleaseNote(R.string.release_notes_3_0_title2, R.string.release_notes_3_0_subtitle2, ReleaseNoteType.ENHANCEMENT),
50-
ReleaseNote(R.string.release_notes_3_0_title5, R.string.release_notes_3_0_subtitle5, ReleaseNoteType.ENHANCEMENT),
51-
ReleaseNote(R.string.release_notes_3_0_3_title1, R.string.release_notes_3_0_3_subtitle1, ReleaseNoteType.ENHANCEMENT),
52-
ReleaseNote(R.string.release_notes_3_0_title4, R.string.release_notes_3_0_subtitle4, ReleaseNoteType.CHANGE),
53-
ReleaseNote(R.string.release_notes_3_0_title3, R.string.release_notes_3_0_subtitle3, ReleaseNoteType.BUGFIX),
54-
ReleaseNote(R.string.release_notes_3_0_2_title1, R.string.release_notes_3_0_2_subtitle1, ReleaseNoteType.BUGFIX),
55-
ReleaseNote(R.string.release_notes_3_0_4_title1, R.string.release_notes_3_0_4_subtitle1, ReleaseNoteType.SECURITY),
48+
ReleaseNote(
49+
title = R.string.release_notes_4_0_title_1,
50+
subtitle = R.string.release_notes_4_0_subtitle_1,
51+
type = ReleaseNoteType.ENHANCEMENT
52+
),
53+
ReleaseNote(
54+
title = R.string.release_notes_4_0_title_2,
55+
subtitle = R.string.release_notes_4_0_subtitle_2,
56+
type = ReleaseNoteType.ENHANCEMENT
57+
),
58+
ReleaseNote(
59+
title = R.string.release_notes_4_0_title_3,
60+
subtitle = R.string.release_notes_4_0_subtitle_3,
61+
type = ReleaseNoteType.CHANGE
62+
),
5663
)
5764
}
5865
}

owncloudApp/src/main/java/com/owncloud/android/workers/CameraUploadsWorker.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class CameraUploadsWorker(
7575
private val transferRepository: TransferRepository by inject()
7676

7777
override suspend fun doWork(): Result {
78-
78+
Timber.i("Starting CameraUploadsWorker with UUID ${this.id}")
7979
when (val useCaseResult = getCameraUploadsConfigurationUseCase.execute(Unit)) {
8080
is UseCaseResult.Success -> {
8181
val cameraUploadsConfiguration = useCaseResult.data
@@ -106,6 +106,7 @@ class CameraUploadsWorker(
106106
Timber.e(useCaseResult.throwable, "Worker ${useCaseResult.throwable}")
107107
}
108108
}
109+
Timber.i("Finishing CameraUploadsWorker with UUID ${this.id}")
109110
return Result.success()
110111
}
111112

0 commit comments

Comments
 (0)