refactor: rename Ocis prefix to Graph in new share classes

Signed-off-by: Jorge Aguado Recio <jaguado@izertis.com>

Author: joragua

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

@@ -95,7 +95,7 @@ import com.owncloud.android.domain.sharing.shares.usecases.CreatePublicShareAsyn
 import com.owncloud.android.domain.sharing.shares.usecases.DeleteShareAsyncUseCase
 import com.owncloud.android.domain.sharing.shares.usecases.EditPrivateShareAsyncUseCase
 import com.owncloud.android.domain.sharing.shares.usecases.EditPublicShareAsyncUseCase
-import com.owncloud.android.domain.sharing.shares.usecases.GetOcisSharesAsyncUseCase
+import com.owncloud.android.domain.sharing.shares.usecases.GetGraphSharesAsyncUseCase
 import com.owncloud.android.domain.sharing.shares.usecases.GetShareAsLiveDataUseCase
 import com.owncloud.android.domain.sharing.shares.usecases.GetSharesAsLiveDataUseCase
 import com.owncloud.android.domain.sharing.shares.usecases.RefreshSharesFromServerAsyncUseCase
@@ -234,7 +234,7 @@ val useCaseModule = module {
     factoryOf(::DeleteShareAsyncUseCase)
     factoryOf(::EditPrivateShareAsyncUseCase)
     factoryOf(::EditPublicShareAsyncUseCase)
-    factoryOf(::GetOcisSharesAsyncUseCase)
+    factoryOf(::GetGraphSharesAsyncUseCase)
     factoryOf(::GetShareAsLiveDataUseCase)
     factoryOf(::GetShareesAsyncUseCase)
     factoryOf(::GetSharesAsLiveDataUseCase)

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

@@ -53,7 +53,7 @@ import com.owncloud.android.presentation.settings.automaticuploads.SettingsVideo
 import com.owncloud.android.presentation.settings.logging.SettingsLogsViewModel
 import com.owncloud.android.presentation.settings.more.SettingsMoreViewModel
 import com.owncloud.android.presentation.settings.security.SettingsSecurityViewModel
-import com.owncloud.android.presentation.sharing.OcisShareViewModel
+import com.owncloud.android.presentation.sharing.GraphShareViewModel
 import com.owncloud.android.presentation.sharing.ShareViewModel
 import com.owncloud.android.presentation.spaces.SpacesListViewModel
 import com.owncloud.android.presentation.spaces.links.SpaceLinksViewModel
@@ -71,9 +71,9 @@ val viewModelModule = module {
     viewModelOf(::DrawerViewModel)
     viewModelOf(::FileDetailsViewModel)
     viewModelOf(::FileOperationsViewModel)
+    viewModelOf(::GraphShareViewModel)
     viewModelOf(::LogListViewModel)
     viewModelOf(::OAuthViewModel)
-    viewModelOf(::OcisShareViewModel)
     viewModelOf(::PatternViewModel)
     viewModelOf(::PreviewAudioViewModel)
     viewModelOf(::PreviewImageViewModel)

…resentation/sharing/OcisShareFragment.kt …esentation/sharing/GraphShareFragment.ktowncloudApp/src/main/java/com/owncloud/android/presentation/sharing/OcisShareFragment.kt renamed to owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareFragment.kt owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/OcisShareFragment.kt renamed to owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareFragment.kt

@@ -39,18 +39,18 @@ import org.koin.core.parameter.parametersOf
 import timber.log.Timber
 import kotlin.apply
 
-class OcisShareFragment : Fragment() {
+class GraphShareFragment : Fragment() {
     private var _binding: MembersFragmentBinding? = null
     private val binding get() = _binding!!
 
-    private val ocisShareViewModel by viewModel<OcisShareViewModel> {
+    private val graphShareViewModel by viewModel<GraphShareViewModel> {
         parametersOf(
             requireArguments().getString(ARG_ACCOUNT_NAME),
             requireArguments().getParcelable<OCFile>(ARG_FILE)
         )
     }
 
-    private lateinit var ocisSharesAdapter: OcisSharesAdapter
+    private lateinit var graphSharesAdapter: GraphSharesAdapter
 
     private var roles: List<OCRole> = emptyList()
 
@@ -63,14 +63,14 @@ class OcisShareFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         binding.membersTitle.text = getString(R.string.share_with_people_title)
 
-        ocisSharesAdapter = OcisSharesAdapter()
+        graphSharesAdapter = GraphSharesAdapter()
         binding.membersRecyclerView.apply {
             layoutManager = LinearLayoutManager(requireContext())
-            adapter = ocisSharesAdapter
+            adapter = graphSharesAdapter
         }
 
         binding.swipeRefreshMembers.setOnRefreshListener {
-            ocisShareViewModel.getOcisShares()
+            graphShareViewModel.getGraphShares()
         }
 
         subscribeToViewModels()
@@ -87,13 +87,13 @@ class OcisShareFragment : Fragment() {
     }
 
     private fun observeRoles() {
-        collectLatestLifecycleFlow(ocisShareViewModel.roles) { event ->
+        collectLatestLifecycleFlow(graphShareViewModel.roles) { event ->
             event?.let {
                 when (val uiResult = event.peekContent()) {
                     is UIResult.Success -> {
                         uiResult.data?.let {
                             roles = it
-                            ocisShareViewModel.getOcisShares()
+                            graphShareViewModel.getGraphShares()
                         }
                     }
                     is UIResult.Loading -> { }
@@ -107,15 +107,15 @@ class OcisShareFragment : Fragment() {
     }
 
     private fun observeShares() {
-        collectLatestLifecycleFlow(ocisShareViewModel.shares) { event ->
+        collectLatestLifecycleFlow(graphShareViewModel.shares) { event ->
             event?.let {
                 when (val uiResult = event.peekContent()) {
                     is UIResult.Success -> {
                         uiResult.data?.let {
                             val hasMembers = it.members.isNotEmpty()
                             binding.membersRecyclerView.isVisible = hasMembers
                             binding.noSharesMessage.isVisible = !hasMembers
-                            if (hasMembers) ocisSharesAdapter.setShares(it.members, it.roles)
+                            if (hasMembers) graphSharesAdapter.setShares(it.members, it.roles)
                             binding.swipeRefreshMembers.isRefreshing = false
                         }
                     }
@@ -134,12 +134,12 @@ class OcisShareFragment : Fragment() {
         private const val ARG_FILE = "FILE"
         private const val ARG_ACCOUNT_NAME = "ACCOUNT_NAME"
 
-        fun newInstance(file: OCFile, accountName: String): OcisShareFragment {
+        fun newInstance(file: OCFile, accountName: String): GraphShareFragment {
             val args = Bundle().apply {
                 putParcelable(ARG_FILE, file)
                 putString(ARG_ACCOUNT_NAME, accountName)
             }
-            return OcisShareFragment().apply {
+            return GraphShareFragment().apply {
                 arguments = args
             }
         }

…esentation/sharing/OcisShareViewModel.kt …sentation/sharing/GraphShareViewModel.ktowncloudApp/src/main/java/com/owncloud/android/presentation/sharing/OcisShareViewModel.kt renamed to owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareViewModel.kt owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/OcisShareViewModel.kt renamed to owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphShareViewModel.kt

@@ -24,7 +24,7 @@ import androidx.lifecycle.ViewModel
 import com.owncloud.android.domain.files.model.OCFile
 import com.owncloud.android.domain.roles.model.OCRole
 import com.owncloud.android.domain.roles.usecases.GetRolesAsyncUseCase
-import com.owncloud.android.domain.sharing.shares.usecases.GetOcisSharesAsyncUseCase
+import com.owncloud.android.domain.sharing.shares.usecases.GetGraphSharesAsyncUseCase
 import com.owncloud.android.domain.sharing.shares.model.OCPermissions
 import com.owncloud.android.domain.utils.Event
 import com.owncloud.android.extensions.ViewModelExt.runUseCaseWithResult
@@ -33,9 +33,9 @@ import com.owncloud.android.providers.CoroutinesDispatcherProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
-class OcisShareViewModel(
+class GraphShareViewModel(
     private val getRolesAsyncUseCase: GetRolesAsyncUseCase,
-    private val getOcisSharesAsyncUseCase: GetOcisSharesAsyncUseCase,
+    private val getGraphSharesAsyncUseCase: GetGraphSharesAsyncUseCase,
     private val accountName: String,
     private val file: OCFile,
     private val coroutineDispatcherProvider: CoroutinesDispatcherProvider,
@@ -56,12 +56,12 @@ class OcisShareViewModel(
         )
     }
 
-    fun getOcisShares() = runUseCaseWithResult(
+    fun getGraphShares() = runUseCaseWithResult(
         coroutineDispatcher = coroutineDispatcherProvider.io,
         showLoading = true,
         flow = _shares,
-        useCase = getOcisSharesAsyncUseCase,
-        useCaseParams = GetOcisSharesAsyncUseCase.Params(
+        useCase = getGraphSharesAsyncUseCase,
+        useCaseParams = GetGraphSharesAsyncUseCase.Params(
             accountName = accountName,
             spaceId = file.spaceId.orEmpty(),
             itemId = file.remoteId.orEmpty()

…resentation/sharing/OcisSharesAdapter.kt …esentation/sharing/GraphSharesAdapter.ktowncloudApp/src/main/java/com/owncloud/android/presentation/sharing/OcisSharesAdapter.kt renamed to owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphSharesAdapter.kt owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/OcisSharesAdapter.kt renamed to owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphSharesAdapter.kt

@@ -33,19 +33,19 @@ import com.owncloud.android.domain.sharing.shares.model.MemberPermission
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.PreferenceUtils
 
-class OcisSharesAdapter : RecyclerView.Adapter<OcisSharesAdapter.OcisShareViewHolder>() {
+class GraphSharesAdapter : RecyclerView.Adapter<GraphSharesAdapter.GraphShareViewHolder>() {
 
     private var shares: List<MemberPermission> = emptyList()
     private var rolesMap: Map<String, String> = emptyMap()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OcisShareViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GraphShareViewHolder {
         val inflater = LayoutInflater.from(parent.context)
         val view = inflater.inflate(R.layout.member_item, parent, false)
         view.filterTouchesWhenObscured = PreferenceUtils.shouldDisallowTouchesWithOtherVisibleWindows(parent.context)
-        return OcisShareViewHolder(view)
+        return GraphShareViewHolder(view)
     }
 
-    override fun onBindViewHolder(holder: OcisShareViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: GraphShareViewHolder, position: Int) {
         val share = shares[position]
         val roleNames = share.roles.mapNotNull { rolesMap[it] }
 
@@ -77,12 +77,12 @@ class OcisSharesAdapter : RecyclerView.Adapter<OcisSharesAdapter.OcisShareViewHo
             compareByDescending<MemberPermission> { share -> roles.indexOfFirst { it.id in share.roles } }
                 .thenBy { it.displayName }
         )
-        val diffResult = DiffUtil.calculateDiff(OcisSharesDiffUtil(this.shares, sortedShares))
+        val diffResult = DiffUtil.calculateDiff(GraphSharesDiffUtil(this.shares, sortedShares))
         this.shares = sortedShares
         diffResult.dispatchUpdatesTo(this)
     }
 
-    class OcisShareViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    class GraphShareViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val binding = MemberItemBinding.bind(itemView)
     }
 }

…esentation/sharing/OcisSharesDiffUtil.kt …sentation/sharing/GraphSharesDiffUtil.ktowncloudApp/src/main/java/com/owncloud/android/presentation/sharing/OcisSharesDiffUtil.kt renamed to owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphSharesDiffUtil.kt owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/OcisSharesDiffUtil.kt renamed to owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/GraphSharesDiffUtil.kt

@@ -23,7 +23,7 @@ package com.owncloud.android.presentation.sharing
 import androidx.recyclerview.widget.DiffUtil
 import com.owncloud.android.domain.sharing.shares.model.MemberPermission
 
-class OcisSharesDiffUtil(
+class GraphSharesDiffUtil(
     private val oldList: List<MemberPermission>,
     private val newList: List<MemberPermission>,
 ) : DiffUtil.Callback() {

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

@@ -95,7 +95,7 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
         setupFileHeader(binding)
         if (file != null && account != null) {
             supportFragmentManager.transaction {
-                replace(R.id.members_fragment_container, OcisShareFragment.newInstance(file, account!!.name), TAG_SHARE_OCIS_FRAGMENT)
+                replace(R.id.members_fragment_container, GraphShareFragment.newInstance(file, account!!.name), TAG_GRAPH_SHARE_FRAGMENT)
             }
         }
     }
@@ -371,7 +371,7 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
 
     companion object {
         const val TAG_SHARE_FRAGMENT = "SHARE_FRAGMENT"
-        const val TAG_SHARE_OCIS_FRAGMENT = "SHARE_OCIS_FRAGMENT"
+        const val TAG_GRAPH_SHARE_FRAGMENT = "GRAPH_SHARE_FRAGMENT"
         const val TAG_SEARCH_FRAGMENT = "SEARCH_USER_AND_GROUPS_FRAGMENT"
         const val TAG_EDIT_SHARE_FRAGMENT = "EDIT_SHARE_FRAGMENT"
         const val TAG_PUBLIC_SHARE_DIALOG_FRAGMENT = "PUBLIC_SHARE_DIALOG_FRAGMENT"

…s/shares/GetRemoteOcisSharesOperation.kt …/GetRemoteGraphSharesForFileOperation.ktowncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteOcisSharesOperation.kt renamed to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteGraphSharesForFileOperation.kt owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteOcisSharesOperation.kt renamed to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteGraphSharesForFileOperation.kt

@@ -32,7 +32,7 @@ import com.squareup.moshi.Moshi
 import timber.log.Timber
 import java.net.URL
 
-class GetRemoteOcisSharesOperation(
+class GetRemoteGraphSharesForFileOperation(
     private val spaceId: String,
     private val itemId: String,
 ) : RemoteOperation<PermissionsResponse>() {
@@ -62,14 +62,14 @@ class GetRemoteOcisSharesOperation(
                 result = RemoteOperationResult(ResultCode.OK)
                 result.data = getMethod.getResponseBodyAsString().let { adapter.fromJson(it) }
 
-                Timber.d("Get oCIS shares completed and parsed to ${result.data}")
+                Timber.d("Get graph shares completed and parsed to ${result.data}")
             } else {
                 result = RemoteOperationResult(getMethod)
-                Timber.e("Failed response while getting oCIS shares; status code: $status, response: $response")
+                Timber.e("Failed response while getting graph shares; status code: $status, response: $response")
             }
         } catch (e: Exception) {
             result = RemoteOperationResult(e)
-            Timber.e(e, "Exception while getting oCIS shares")
+            Timber.e(e, "Exception while getting graph shares")
         }
         return result
     }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareService.kt

@@ -39,7 +39,7 @@ interface ShareService : Service {
         subfiles: Boolean
     ): RemoteOperationResult<ShareResponse>
 
-    fun getOcisShares(spaceId: String, itemId: String): RemoteOperationResult<PermissionsResponse>
+    fun getGraphShares(spaceId: String, itemId: String): RemoteOperationResult<PermissionsResponse>
 
     fun insertShare(
         remoteFilePath: String,

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareService.kt

@@ -29,7 +29,7 @@ package com.owncloud.android.lib.resources.shares.services.implementation
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.resources.shares.CreateRemoteShareOperation
-import com.owncloud.android.lib.resources.shares.GetRemoteOcisSharesOperation
+import com.owncloud.android.lib.resources.shares.GetRemoteGraphSharesForFileOperation
 import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation
 import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation
 import com.owncloud.android.lib.resources.shares.ShareResponse
@@ -49,8 +49,8 @@ class OCShareService(override val client: OwnCloudClient) : ShareService {
         subfiles
     ).execute(client)
 
-    override fun getOcisShares(spaceId: String, itemId: String): RemoteOperationResult<PermissionsResponse> =
-        GetRemoteOcisSharesOperation(spaceId, itemId).execute(client)
+    override fun getGraphShares(spaceId: String, itemId: String): RemoteOperationResult<PermissionsResponse> =
+        GetRemoteGraphSharesForFileOperation(spaceId, itemId).execute(client)
 
     override fun insertShare(
         remoteFilePath: String,