Skip to content

Commit 90249b4

Browse files
joraguajoragua
committed
refactor: add Ocs prefix to legacy sharing classes across all layers
Signed-off-by: Jorge Aguado Recio <jaguado@izertis.com>
1 parent 80fc724 commit 90249b4

47 files changed

Lines changed: 335 additions & 276 deletions

File tree

Some content is hidden

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

owncloudApp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchShareesFragmentTest.kt renamed to owncloudApp/src/androidTest/java/com/owncloud/android/sharing/sharees/ui/SearchOcsShareesFragmentTest.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
* ownCloud Android client application
33
*
44
* @author David González Verdugo
5-
* Copyright (C) 2020 ownCloud GmbH.
5+
* @author Jorge Aguado Recio
6+
*
7+
* Copyright (C) 2026 ownCloud GmbH.
68
*
79
* This program is free software: you can redistribute it and/or modify
810
* it under the terms of the GNU General Public License version 2,
@@ -34,8 +36,8 @@ import com.owncloud.android.domain.sharing.shares.model.OCShare
3436
import com.owncloud.android.domain.sharing.shares.model.ShareType
3537
import com.owncloud.android.domain.utils.Event
3638
import com.owncloud.android.presentation.common.UIResult
37-
import com.owncloud.android.presentation.sharing.sharees.SearchShareesFragment
38-
import com.owncloud.android.presentation.sharing.ShareViewModel
39+
import com.owncloud.android.presentation.sharing.sharees.SearchOcsShareesFragment
40+
import com.owncloud.android.presentation.sharing.OcsShareViewModel
3941
import com.owncloud.android.sharing.shares.ui.TestShareFileActivity
4042
import com.owncloud.android.testutil.OC_SHARE
4143
import io.mockk.every
@@ -49,8 +51,8 @@ import org.koin.core.context.startKoin
4951
import org.koin.core.context.stopKoin
5052
import org.koin.dsl.module
5153

52-
class SearchShareesFragmentTest {
53-
private val shareViewModel = mockkClass(ShareViewModel::class, relaxed = true)
54+
class SearchOcsShareesFragmentTest {
55+
private val shareViewModel = mockkClass(OcsShareViewModel::class, relaxed = true)
5456
private val sharesLiveData = MutableLiveData<Event<UIResult<List<OCShare>>>>()
5557

5658
@Before
@@ -72,7 +74,7 @@ class SearchShareesFragmentTest {
7274
}
7375

7476
ActivityScenario.launch(TestShareFileActivity::class.java).onActivity {
75-
val searchShareesFragment = SearchShareesFragment()
77+
val searchShareesFragment = SearchOcsShareesFragment()
7678
it.startFragment(searchShareesFragment)
7779
}
7880
}

owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/EditPrivateShareFragmentTest.kt renamed to owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/EditPrivateOcsShareFragmentTest.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
* ownCloud Android client application
33
*
44
* @author David González Verdugo
5-
* Copyright (C) 2020 ownCloud GmbH.
5+
* @author Jorge Aguado Recio
6+
*
7+
* Copyright (C) 2026 ownCloud GmbH.
68
*
79
* This program is free software: you can redistribute it and/or modify
810
* it under the terms of the GNU General Public License version 2,
@@ -35,8 +37,8 @@ import com.owncloud.android.R
3537
import com.owncloud.android.domain.sharing.shares.model.OCShare
3638
import com.owncloud.android.domain.utils.Event
3739
import com.owncloud.android.presentation.common.UIResult
38-
import com.owncloud.android.presentation.sharing.sharees.EditPrivateShareFragment
39-
import com.owncloud.android.presentation.sharing.ShareViewModel
40+
import com.owncloud.android.presentation.sharing.sharees.EditPrivateOcsShareFragment
41+
import com.owncloud.android.presentation.sharing.OcsShareViewModel
4042
import com.owncloud.android.testutil.OC_ACCOUNT
4143
import com.owncloud.android.testutil.OC_FILE
4244
import com.owncloud.android.testutil.OC_FOLDER
@@ -54,10 +56,10 @@ import org.koin.core.context.startKoin
5456
import org.koin.core.context.stopKoin
5557
import org.koin.dsl.module
5658

57-
class EditPrivateShareFragmentTest {
59+
class EditPrivateOcsShareFragmentTest {
5860
private val targetContext = InstrumentationRegistry.getInstrumentation().targetContext
5961
private val defaultSharedWithDisplayName = "user"
60-
private val shareViewModel = mockk<ShareViewModel>(relaxed = true)
62+
private val shareViewModel = mockk<OcsShareViewModel>(relaxed = true)
6163
private val privateShareAsLiveData = MutableLiveData<Event<UIResult<OCShare>>>()
6264

6365
private lateinit var activityScenario: ActivityScenario<TestShareFileActivity>
@@ -251,7 +253,7 @@ class EditPrivateShareFragmentTest {
251253

252254
val sharedFile = if (isFolder) OC_FOLDER else OC_FILE
253255

254-
val editPrivateShareFragment = EditPrivateShareFragment.newInstance(
256+
val editPrivateShareFragment = EditPrivateOcsShareFragment.newInstance(
255257
shareToEdit,
256258
sharedFile,
257259
OC_ACCOUNT

owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFileFragmentTest.kt renamed to owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/OcsShareFileFragmentTest.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
* ownCloud Android client application
33
*
44
* @author David González Verdugo
5-
* Copyright (C) 2020 ownCloud GmbH.
5+
* @author Jorge Aguado Recio
6+
*
7+
* Copyright (C) 2026 ownCloud GmbH.
68
*
79
* This program is free software: you can redistribute it and/or modify
810
* it under the terms of the GNU General Public License version 2,
@@ -37,9 +39,9 @@ import com.owncloud.android.domain.sharing.shares.model.OCShare
3739
import com.owncloud.android.domain.sharing.shares.model.ShareType
3840
import com.owncloud.android.domain.utils.Event
3941
import com.owncloud.android.presentation.common.UIResult
40-
import com.owncloud.android.presentation.sharing.ShareFileFragment
42+
import com.owncloud.android.presentation.sharing.OcsShareFileFragment
4143
import com.owncloud.android.presentation.capabilities.CapabilityViewModel
42-
import com.owncloud.android.presentation.sharing.ShareViewModel
44+
import com.owncloud.android.presentation.sharing.OcsShareViewModel
4345
import com.owncloud.android.testutil.OC_ACCOUNT
4446
import com.owncloud.android.testutil.OC_CAPABILITY
4547
import com.owncloud.android.testutil.OC_FILE
@@ -61,7 +63,7 @@ import org.koin.dsl.module
6163
class ShareFileFragmentTest {
6264
private val capabilityViewModel = mockk<CapabilityViewModel>(relaxed = true)
6365
private val capabilitiesLiveData = MutableLiveData<Event<UIResult<OCCapability>>>()
64-
private val shareViewModel = mockk<ShareViewModel>(relaxed = true)
66+
private val shareViewModel = mockk<OcsShareViewModel>(relaxed = true)
6567
private val sharesLiveData = MutableLiveData<Event<UIResult<List<OCShare>>>>()
6668

6769
@Before
@@ -303,7 +305,7 @@ class ShareFileFragmentTest {
303305
shares: List<OCShare> = listOf(OC_SHARE),
304306
sharesUIResult: UIResult<List<OCShare>> = UIResult.Success(shares)
305307
) {
306-
val shareFileFragment = ShareFileFragment.newInstance(
308+
val shareFileFragment = OcsShareFileFragment.newInstance(
307309
OC_FILE,
308310
OC_ACCOUNT
309311
)

owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/ShareFolderFragmentTest.kt renamed to owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/OcsShareFolderFragmentTest.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
*
44
* @author David González Verdugo
55
* @author Jesus Recio Rincon
6-
* Copyright (C) 2020 ownCloud GmbH.
6+
* @author Jorge Aguado Recio
7+
*
8+
* Copyright (C) 2026 ownCloud GmbH.
79
*
810
* This program is free software: you can redistribute it and/or modify
911
* it under the terms of the GNU General Public License version 2,
@@ -32,9 +34,9 @@ import com.owncloud.android.domain.capabilities.model.OCCapability
3234
import com.owncloud.android.domain.sharing.shares.model.OCShare
3335
import com.owncloud.android.domain.utils.Event
3436
import com.owncloud.android.presentation.common.UIResult
35-
import com.owncloud.android.presentation.sharing.ShareFileFragment
37+
import com.owncloud.android.presentation.sharing.OcsShareFileFragment
3638
import com.owncloud.android.presentation.capabilities.CapabilityViewModel
37-
import com.owncloud.android.presentation.sharing.ShareViewModel
39+
import com.owncloud.android.presentation.sharing.OcsShareViewModel
3840
import com.owncloud.android.testutil.OC_ACCOUNT
3941
import com.owncloud.android.testutil.OC_CAPABILITY
4042
import com.owncloud.android.testutil.OC_FOLDER
@@ -50,10 +52,10 @@ import org.koin.core.context.startKoin
5052
import org.koin.core.context.stopKoin
5153
import org.koin.dsl.module
5254

53-
class ShareFolderFragmentTest {
55+
class OcsShareFolderFragmentTest {
5456
private val capabilityViewModel = mockk<CapabilityViewModel>(relaxed = true)
5557
private val capabilitiesLiveData = MutableLiveData<Event<UIResult<OCCapability>>>()
56-
private val shareViewModel = mockk<ShareViewModel>(relaxed = true)
58+
private val shareViewModel = mockk<OcsShareViewModel>(relaxed = true)
5759
private val sharesLiveData = MutableLiveData<Event<UIResult<List<OCShare>>>>()
5860

5961
@Before
@@ -78,7 +80,7 @@ class ShareFolderFragmentTest {
7880
)
7981
}
8082

81-
val shareFileFragment = ShareFileFragment.newInstance(
83+
val shareFileFragment = OcsShareFileFragment.newInstance(
8284
OC_FOLDER.copy(privateLink = null),
8385
OC_ACCOUNT
8486
)

owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareCreationDialogFragmentTest.kt renamed to owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicOcsShareCreationDialogFragmentTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ import com.owncloud.android.domain.capabilities.model.CapabilityBooleanType
4141
import com.owncloud.android.domain.capabilities.model.OCCapability
4242
import com.owncloud.android.domain.utils.Event
4343
import com.owncloud.android.presentation.common.UIResult
44-
import com.owncloud.android.presentation.sharing.shares.PublicShareDialogFragment
44+
import com.owncloud.android.presentation.sharing.shares.PublicOcsShareDialogFragment
4545
import com.owncloud.android.presentation.capabilities.CapabilityViewModel
46-
import com.owncloud.android.presentation.sharing.ShareViewModel
46+
import com.owncloud.android.presentation.sharing.OcsShareViewModel
4747
import com.owncloud.android.testutil.OC_ACCOUNT
4848
import com.owncloud.android.testutil.OC_CAPABILITY
4949
import com.owncloud.android.testutil.OC_FILE
@@ -62,10 +62,10 @@ import org.koin.dsl.module
6262
import java.text.SimpleDateFormat
6363
import java.util.Date
6464

65-
class PublicShareCreationDialogFragmentTest {
65+
class PublicOcsShareCreationDialogFragmentTest {
6666
private val capabilityViewModel = mockk<CapabilityViewModel>(relaxed = true)
6767
private val capabilitiesLiveData = MutableLiveData<Event<UIResult<OCCapability>>>()
68-
private val shareViewModel = mockk<ShareViewModel>(relaxed = true)
68+
private val shareViewModel = mockk<OcsShareViewModel>(relaxed = true)
6969
private val publicShareCreationStatus = MutableLiveData<Event<UIResult<Unit>>>()
7070

7171
@Before
@@ -476,7 +476,7 @@ class PublicShareCreationDialogFragmentTest {
476476
) {
477477
val file = if (isFolder) OC_FOLDER else OC_FILE
478478

479-
val publicShareDialogFragment = PublicShareDialogFragment.newInstanceToCreate(
479+
val publicShareDialogFragment = PublicOcsShareDialogFragment.newInstanceToCreate(
480480
file,
481481
OC_ACCOUNT,
482482
"DOC_12112018.jpg link"

owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicShareEditionDialogFragmentTest.kt renamed to owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/PublicOcsShareEditionDialogFragmentTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import com.owncloud.android.domain.sharing.shares.model.ShareType
3737
import com.owncloud.android.domain.utils.Event
3838
import com.owncloud.android.lib.resources.shares.RemoteShare
3939
import com.owncloud.android.presentation.common.UIResult
40-
import com.owncloud.android.presentation.sharing.shares.PublicShareDialogFragment
40+
import com.owncloud.android.presentation.sharing.shares.PublicOcsShareDialogFragment
4141
import com.owncloud.android.presentation.capabilities.CapabilityViewModel
42-
import com.owncloud.android.presentation.sharing.ShareViewModel
42+
import com.owncloud.android.presentation.sharing.OcsShareViewModel
4343
import com.owncloud.android.testutil.OC_ACCOUNT
4444
import com.owncloud.android.testutil.OC_FILE
4545
import com.owncloud.android.testutil.OC_SHARE
@@ -57,10 +57,10 @@ import java.text.SimpleDateFormat
5757
import java.util.GregorianCalendar
5858
import java.util.TimeZone
5959

60-
class PublicShareEditionDialogFragmentTest {
60+
class PublicOcsShareEditionDialogFragmentTest {
6161
private val capabilityViewModel = mockk<CapabilityViewModel>(relaxed = true)
6262
private val capabilitiesLiveData = MutableLiveData<Event<UIResult<OCCapability>>>()
63-
private val shareViewModel = mockk<ShareViewModel>(relaxed = true)
63+
private val shareViewModel = mockk<OcsShareViewModel>(relaxed = true)
6464

6565
private val expirationDate = 1556575200000 // GMT: Monday, April 29, 2019 10:00:00 PM
6666

@@ -85,7 +85,7 @@ class PublicShareEditionDialogFragmentTest {
8585
)
8686
}
8787

88-
val publicShareDialogFragment = PublicShareDialogFragment.newInstanceToUpdate(
88+
val publicShareDialogFragment = PublicOcsShareDialogFragment.newInstanceToUpdate(
8989
OC_FILE,
9090
OC_ACCOUNT,
9191
OC_SHARE.copy(

‎owncloudApp/src/androidTest/java/com/owncloud/android/sharing/shares/ui/TestShareFileActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ import androidx.fragment.app.commit
2525
import com.owncloud.android.R
2626
import com.owncloud.android.domain.files.model.OCFile
2727
import com.owncloud.android.domain.sharing.shares.model.OCShare
28-
import com.owncloud.android.presentation.sharing.ShareFragmentListener
28+
import com.owncloud.android.presentation.sharing.OcsShareFragmentListener
2929
import com.owncloud.android.services.OperationsService
3030
import com.owncloud.android.testing.SingleFragmentActivity
3131
import com.owncloud.android.ui.fragment.FileFragment.ContainerActivity
3232
import com.owncloud.android.ui.helpers.FileOperationsHelper
3333

34-
class TestShareFileActivity : SingleFragmentActivity(), ShareFragmentListener, ContainerActivity {
34+
class TestShareFileActivity : SingleFragmentActivity(), OcsShareFragmentListener, ContainerActivity {
3535
fun startFragment(fragment: Fragment) {
3636
supportFragmentManager.commit(allowStateLoss = true) {
3737
add(R.id.container, fragment, TEST_FRAGMENT_TAG)

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,18 @@ import com.owncloud.android.domain.members.usecases.RemoveMemberUseCase
8989
import com.owncloud.android.domain.members.usecases.SearchMembersUseCase
9090
import com.owncloud.android.domain.roles.usecases.GetRolesAsyncUseCase
9191
import com.owncloud.android.domain.server.usecases.GetServerInfoAsyncUseCase
92-
import com.owncloud.android.domain.sharing.sharees.GetShareesAsyncUseCase
92+
import com.owncloud.android.domain.sharing.sharees.GetOcsShareesAsyncUseCase
9393
import com.owncloud.android.domain.sharing.shares.usecases.AddGraphShareAsyncUseCase
94-
import com.owncloud.android.domain.sharing.shares.usecases.CreatePrivateShareAsyncUseCase
95-
import com.owncloud.android.domain.sharing.shares.usecases.CreatePublicShareAsyncUseCase
96-
import com.owncloud.android.domain.sharing.shares.usecases.DeleteShareAsyncUseCase
94+
import com.owncloud.android.domain.sharing.shares.usecases.CreatePrivateOcsShareAsyncUseCase
95+
import com.owncloud.android.domain.sharing.shares.usecases.CreatePublicOcsShareAsyncUseCase
96+
import com.owncloud.android.domain.sharing.shares.usecases.DeleteOcsShareAsyncUseCase
9797
import com.owncloud.android.domain.sharing.shares.usecases.EditGraphShareAsyncUseCase
98-
import com.owncloud.android.domain.sharing.shares.usecases.EditPrivateShareAsyncUseCase
99-
import com.owncloud.android.domain.sharing.shares.usecases.EditPublicShareAsyncUseCase
98+
import com.owncloud.android.domain.sharing.shares.usecases.EditPrivateOcsShareAsyncUseCase
99+
import com.owncloud.android.domain.sharing.shares.usecases.EditPublicOcsShareAsyncUseCase
100100
import com.owncloud.android.domain.sharing.shares.usecases.GetGraphSharesAsyncUseCase
101-
import com.owncloud.android.domain.sharing.shares.usecases.GetShareAsLiveDataUseCase
102-
import com.owncloud.android.domain.sharing.shares.usecases.GetSharesAsLiveDataUseCase
103-
import com.owncloud.android.domain.sharing.shares.usecases.RefreshSharesFromServerAsyncUseCase
101+
import com.owncloud.android.domain.sharing.shares.usecases.GetOcsShareAsLiveDataUseCase
102+
import com.owncloud.android.domain.sharing.shares.usecases.GetOcsSharesAsLiveDataUseCase
103+
import com.owncloud.android.domain.sharing.shares.usecases.RefreshOcsSharesFromServerAsyncUseCase
104104
import com.owncloud.android.domain.sharing.shares.usecases.RemoveGraphShareAsyncUseCase
105105
import com.owncloud.android.domain.spaces.usecases.CreateSpaceUseCase
106106
import com.owncloud.android.domain.spaces.usecases.DisableSpaceUseCase
@@ -233,17 +233,17 @@ val useCaseModule = module {
233233

234234
// Sharing
235235
factoryOf(::AddGraphShareAsyncUseCase)
236-
factoryOf(::CreatePrivateShareAsyncUseCase)
237-
factoryOf(::CreatePublicShareAsyncUseCase)
238-
factoryOf(::DeleteShareAsyncUseCase)
236+
factoryOf(::CreatePrivateOcsShareAsyncUseCase)
237+
factoryOf(::CreatePublicOcsShareAsyncUseCase)
238+
factoryOf(::DeleteOcsShareAsyncUseCase)
239239
factoryOf(::EditGraphShareAsyncUseCase)
240-
factoryOf(::EditPrivateShareAsyncUseCase)
241-
factoryOf(::EditPublicShareAsyncUseCase)
240+
factoryOf(::EditPrivateOcsShareAsyncUseCase)
241+
factoryOf(::EditPublicOcsShareAsyncUseCase)
242242
factoryOf(::GetGraphSharesAsyncUseCase)
243-
factoryOf(::GetShareAsLiveDataUseCase)
244-
factoryOf(::GetShareesAsyncUseCase)
245-
factoryOf(::GetSharesAsLiveDataUseCase)
246-
factoryOf(::RefreshSharesFromServerAsyncUseCase)
243+
factoryOf(::GetOcsShareAsLiveDataUseCase)
244+
factoryOf(::GetOcsShareesAsyncUseCase)
245+
factoryOf(::GetOcsSharesAsLiveDataUseCase)
246+
factoryOf(::RefreshOcsSharesFromServerAsyncUseCase)
247247
factoryOf(::RemoveGraphShareAsyncUseCase)
248248

249249
// Spaces

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import com.owncloud.android.presentation.settings.logging.SettingsLogsViewModel
5454
import com.owncloud.android.presentation.settings.more.SettingsMoreViewModel
5555
import com.owncloud.android.presentation.settings.security.SettingsSecurityViewModel
5656
import com.owncloud.android.presentation.sharing.GraphShareViewModel
57-
import com.owncloud.android.presentation.sharing.ShareViewModel
57+
import com.owncloud.android.presentation.sharing.OcsShareViewModel
5858
import com.owncloud.android.presentation.spaces.SpacesListViewModel
5959
import com.owncloud.android.presentation.spaces.links.SpaceLinksViewModel
6060
import com.owncloud.android.presentation.spaces.members.SpaceMembersViewModel
@@ -95,7 +95,7 @@ val viewModelModule = module {
9595
viewModel { (accountName: String) -> CapabilityViewModel(accountName, get(), get(), get(), get()) }
9696
viewModel { (action: PasscodeAction) -> PassCodeViewModel(get(), get(), action) }
9797
viewModel { (filePath: String, accountName: String) ->
98-
ShareViewModel(filePath, accountName, get(), get(), get(), get(), get(), get(), get(), get(), get(), get())
98+
OcsShareViewModel(filePath, accountName, get(), get(), get(), get(), get(), get(), get(), get(), get(), get())
9999
}
100100
viewModel { (initialFolderToDisplay: OCFile, fileListOption: FileListOption) ->
101101
MainFileListViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(),

0 commit comments

Comments
 (0)