Skip to content

Commit a6b8264

Browse files
abelgardepabelgardep
authored
Merge pull request #3903 from owncloud/release/3.0.3
[Release] 3.0.3
2 parents b877807 + 062dc6d commit a6b8264

34 files changed

Lines changed: 198 additions & 117 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
Changelog for ownCloud Android Client [unreleased] (UNRELEASED)
1+
Changelog for ownCloud Android Client [3.0.3] (2023-02-13)
22
=======================================
3-
The following sections list the changes in ownCloud Android Client unreleased relevant to
3+
The following sections list the changes in ownCloud Android Client 3.0.3 relevant to
44
ownCloud admins and users.
55

6-
[unreleased]: https://github.com/owncloud/android/compare/v3.0.2...master
6+
[3.0.3]: https://github.com/owncloud/android/compare/v3.0.2...v3.0.3
77

88
Summary
99
-------
1010

1111
* Bugfix - Error messages too long in folders operation: [#3852](https://github.com/owncloud/android/pull/3852)
12+
* Bugfix - Fix problems after authentication: [#3889](https://github.com/owncloud/android/pull/3889)
13+
* Bugfix - Toolbar in file details view: [#3899](https://github.com/owncloud/android/pull/3899)
1214

1315
Details
1416
-------
@@ -21,6 +23,21 @@ Details
2123
https://github.com/owncloud/android/issues/3820
2224
https://github.com/owncloud/android/pull/3852
2325

26+
* Bugfix - Fix problems after authentication: [#3889](https://github.com/owncloud/android/pull/3889)
27+
28+
Client for session are now fetched on demand to avoid reinitialize DI, making the process
29+
smoother
30+
31+
https://github.com/owncloud/android/pull/3889
32+
33+
* Bugfix - Toolbar in file details view: [#3899](https://github.com/owncloud/android/pull/3899)
34+
35+
When returning from the share screen to details screen, the toolbar didn't show the correct
36+
options and title. Now it does.
37+
38+
https://github.com/owncloud/android/issues/3866
39+
https://github.com/owncloud/android/pull/3899
40+
2441
Changelog for ownCloud Android Client [3.0.2] (2023-01-26)
2542
=======================================
2643
The following sections list the changes in ownCloud Android Client 3.0.2 relevant to

changelog/unreleased/3852 renamed to changelog/3.0.3_2023-02-13/3852

File renamed without changes.

‎changelog/3.0.3_2023-02-13/3889‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Bugfix: Fix problems after authentication
2+
3+
Client for session are now fetched on demand to avoid reinitialize DI, making the process smoother
4+
5+
https://github.com/owncloud/android/pull/3889

‎changelog/3.0.3_2023-02-13/3899‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Bugfix: Toolbar in file details view
2+
3+
When returning from the share screen to details screen, the toolbar didn't show
4+
the correct options and title. Now it does.
5+
6+
https://github.com/owncloud/android/pull/3899
7+
https://github.com/owncloud/android/issues/3866

‎owncloud-android-library‎

‎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 = 30000200
97-
versionName = "3.0.2"
96+
versionCode = 30000300
97+
versionName = "3.0.3"
9898

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

‎owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RemoteDataSourceModule.kt‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ package com.owncloud.android.dependecyinjection
2121

2222
import com.owncloud.android.MainApp
2323
import com.owncloud.android.R
24-
import com.owncloud.android.presentation.authentication.AccountUtils
2524
import com.owncloud.android.data.ClientManager
2625
import com.owncloud.android.data.authentication.datasources.RemoteAuthenticationDataSource
2726
import com.owncloud.android.data.authentication.datasources.implementation.OCRemoteAuthenticationDataSource
@@ -45,55 +44,34 @@ import com.owncloud.android.data.user.datasources.implementation.OCRemoteUserDat
4544
import com.owncloud.android.data.webfinger.datasources.WebfingerRemoteDatasource
4645
import com.owncloud.android.data.webfinger.datasources.implementation.OCWebfingerRemoteDatasource
4746
import com.owncloud.android.lib.common.ConnectionValidator
48-
import com.owncloud.android.lib.common.OwnCloudAccount
49-
import com.owncloud.android.lib.common.SingleSessionManager
50-
import com.owncloud.android.lib.resources.files.services.ChunkService
51-
import com.owncloud.android.lib.resources.files.services.FileService
52-
import com.owncloud.android.lib.resources.files.services.implementation.OCChunkService
53-
import com.owncloud.android.lib.resources.files.services.implementation.OCFileService
5447
import com.owncloud.android.lib.resources.oauth.services.OIDCService
5548
import com.owncloud.android.lib.resources.oauth.services.implementation.OCOIDCService
56-
import com.owncloud.android.lib.resources.shares.services.ShareService
57-
import com.owncloud.android.lib.resources.shares.services.ShareeService
58-
import com.owncloud.android.lib.resources.shares.services.implementation.OCShareService
59-
import com.owncloud.android.lib.resources.shares.services.implementation.OCShareeService
60-
import com.owncloud.android.lib.resources.status.services.CapabilityService
6149
import com.owncloud.android.lib.resources.status.services.ServerInfoService
62-
import com.owncloud.android.lib.resources.status.services.implementation.OCCapabilityService
6350
import com.owncloud.android.lib.resources.status.services.implementation.OCServerInfoService
6451
import com.owncloud.android.lib.resources.webfinger.services.WebfingerService
6552
import com.owncloud.android.lib.resources.webfinger.services.implementation.OCWebfingerService
6653
import org.koin.android.ext.koin.androidContext
6754
import org.koin.dsl.module
6855

6956
val remoteDataSourceModule = module {
70-
single { AccountUtils.getCurrentOwnCloudAccount(androidContext()) }
71-
single { OwnCloudAccount(get(), androidContext()) }
72-
single { SingleSessionManager.getDefaultSingleton().getClientFor(get(), androidContext(), get()) }
73-
7457
single { ConnectionValidator(androidContext(), androidContext().resources.getBoolean(R.bool.clear_cookies_on_validation)) }
7558
single { ClientManager(get(), get(), androidContext(), MainApp.accountType, get()) }
7659

77-
single<CapabilityService> { OCCapabilityService(get()) }
78-
single<FileService> { OCFileService(get()) }
79-
single<ChunkService> { OCChunkService(get()) }
8060
single<ServerInfoService> { OCServerInfoService() }
8161
single<OIDCService> { OCOIDCService() }
82-
single<ShareService> { OCShareService(get()) }
83-
single<ShareeService> { OCShareeService(get()) }
8462
single<WebfingerService> { OCWebfingerService() }
8563

86-
factory<RemoteAuthenticationDataSource> { OCRemoteAuthenticationDataSource(get()) }
87-
factory<RemoteCapabilitiesDataSource> { OCRemoteCapabilitiesDataSource(get(), get()) }
88-
factory<RemoteFileDataSource> { OCRemoteFileDataSource(get()) }
89-
factory<RemoteOAuthDataSource> { OCRemoteOAuthDataSource(get(), get()) }
90-
factory<RemoteServerInfoDataSource> { OCRemoteServerInfoDataSource(get(), get()) }
91-
factory<RemoteShareDataSource> { OCRemoteShareDataSource(get(), get()) }
92-
factory<RemoteShareeDataSource> { OCRemoteShareeDataSource(get(), get()) }
93-
factory<RemoteUserDataSource> {
64+
single<RemoteAuthenticationDataSource> { OCRemoteAuthenticationDataSource(get()) }
65+
single<RemoteCapabilitiesDataSource> { OCRemoteCapabilitiesDataSource(get(), get()) }
66+
single<RemoteFileDataSource> { OCRemoteFileDataSource(get()) }
67+
single<RemoteOAuthDataSource> { OCRemoteOAuthDataSource(get(), get()) }
68+
single<RemoteServerInfoDataSource> { OCRemoteServerInfoDataSource(get(), get()) }
69+
single<RemoteShareDataSource> { OCRemoteShareDataSource(get(), get()) }
70+
single<RemoteShareeDataSource> { OCRemoteShareeDataSource(get(), get()) }
71+
single<RemoteUserDataSource> {
9472
OCRemoteUserDataSource(get(), androidContext().resources.getDimension(R.dimen.file_avatar_size).toInt())
9573
}
96-
factory<WebfingerRemoteDatasource> { OCWebfingerRemoteDatasource(get(), get()) }
74+
single<WebfingerRemoteDatasource> { OCWebfingerRemoteDatasource(get(), get()) }
9775

9876
factory { RemoteCapabilityMapper() }
9977
factory { RemoteShareMapper() }

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ class ReleaseNotesViewModel(
4545

4646
companion object {
4747
val releaseNotesList = listOf(
48-
ReleaseNote(R.string.release_notes_3_0_2_title1, R.string.release_notes_3_0_2_subtitle1, ReleaseNoteType.BUGFIX)
48+
ReleaseNote(R.string.release_notes_3_0_3_title1, R.string.release_notes_3_0_3_subtitle1, ReleaseNoteType.BUGFIX),
49+
ReleaseNote(R.string.release_notes_3_0_3_title2, R.string.release_notes_3_0_3_subtitle2, ReleaseNoteType.BUGFIX),
50+
ReleaseNote(R.string.release_notes_3_0_3_title3, R.string.release_notes_3_0_3_subtitle3, ReleaseNoteType.BUGFIX)
4951
)
5052
}
5153
}

‎owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/ShareViewModel.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ class ShareViewModel(
9292
liveData = _shareDeletionStatus,
9393
useCase = deletePublicShareUseCase,
9494
useCaseParams = DeleteShareAsyncUseCase.Params(
95-
remoteId
95+
remoteId = remoteId,
96+
accountName = accountName,
9697
),
9798
postSuccess = false
9899
)

‎owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/sharees/UsersAndGroupsSearchProvider.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,10 @@ class UsersAndGroupsSearchProvider : ContentProvider() {
139139

140140
val getShareesResult = getShareesAsyncUseCase.execute(
141141
GetShareesAsyncUseCase.Params(
142-
userQuery,
143-
REQUESTED_PAGE,
144-
RESULTS_PER_PAGE
142+
searchString = userQuery,
143+
page = REQUESTED_PAGE,
144+
perPage = RESULTS_PER_PAGE,
145+
accountName = account.name
145146
)
146147
)
147148

0 commit comments

Comments
 (0)