From a42fbaf43ddcb43208b76d8320336dc72b3c6096 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Fri, 19 Jul 2019 10:48:55 +0200
Subject: [PATCH] Adapt private share edition

---
 .idea/codeStyles/Project.xml                  |  10 +-
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   5 +-
 .../datamodel/FileDataStorageManager.java     |   6 +-
 .../presentation/ui/sharing/ShareActivity.kt  | 119 +++++-------------
 .../fragments/EditPrivateShareFragment.kt     |  82 ++++++++++--
 .../fragments/PublicShareDialogFragment.kt    |   9 +-
 .../fragments/SearchShareesFragment.kt        |  15 ++-
 .../ui/sharing/fragments/ShareFileFragment.kt |  17 ++-
 .../fragments/ShareFragmentListener.kt        |  18 +--
 .../ui/dialog/RemoveShareDialogFragment.kt    |  20 ++-
 .../src/main/res/layout/edit_share_layout.xml |   6 +-
 12 files changed, 148 insertions(+), 161 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 66171039bb4..1682ec15cd5 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,17 +1,12 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
+    <option name="RIGHT_MARGIN" value="120" />
     <JavaCodeStyleSettings>
       <option name="FIELD_NAME_PREFIX" value="m" />
       <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99999" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="android" withSubpackages="true" static="false" />
@@ -42,8 +37,6 @@
     <XML>
       <option name="XML_ATTRIBUTE_WRAP" value="0" />
       <option name="XML_KEEP_BLANK_LINES" value="1" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
     <codeStyleSettings language="JAVA">
@@ -218,7 +211,6 @@
       </arrangement>
     </codeStyleSettings>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/build.gradle b/build.gradle
index 3bae8b5735d..f8d33704746 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bec3776bfcc..6198c29891c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Thu Apr 25 08:58:52 CEST 2019
+#Tue Aug 27 18:09:32 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
-distributionSha256Sum=53b71812f18cdb2777e9f1b2a0f2038683907c90bdc406bc64d8b400e1fb2c3b
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
index d44875916f1..8ff90612968 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -1610,7 +1610,7 @@ public void triggerMediaScan(String path) {
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 try {
-                    MainApp.getAppContext().sendBroadcast(intent);
+                    MainApp.Companion.getAppContext().sendBroadcast(intent);
                 } catch (FileUriExposedException fileUriExposedException) {
                     Intent newIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
                     newIntent.setData(FileProvider.getUriForFile(
@@ -1619,10 +1619,10 @@ public void triggerMediaScan(String path) {
                             new File(path)
                             )
                     );
-                    MainApp.getAppContext().sendBroadcast(newIntent);
+                    MainApp.Companion.getAppContext().sendBroadcast(newIntent);
                 }
             } else {
-                MainApp.getAppContext().sendBroadcast(intent);
+                MainApp.Companion.getAppContext().sendBroadcast(intent);
             }
 
             MainApp.Companion.getAppContext().sendBroadcast(intent);
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/ShareActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/ShareActivity.kt
index b15850023e0..795dd4cc106 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/ShareActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/ShareActivity.kt
@@ -34,12 +34,9 @@ import com.google.android.material.snackbar.Snackbar
 import com.owncloud.android.R
 import com.owncloud.android.data.sharing.shares.db.OCShareEntity
 import com.owncloud.android.datamodel.OCFile
-import com.owncloud.android.lib.common.operations.RemoteOperation
-import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.RemoteShare
 import com.owncloud.android.lib.resources.shares.ShareType
-import com.owncloud.android.operations.RemoveShareOperation
 import com.owncloud.android.presentation.UIResult.Status
 import com.owncloud.android.presentation.providers.sharing.UsersAndGroupsSearchProvider
 import com.owncloud.android.presentation.ui.sharing.fragments.EditPrivateShareFragment
@@ -116,17 +113,14 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
             )
             ft.commit()
         }
+
+        observePrivateShareCreation()
     }
 
     public override fun onStop() {
         super.onStop()
     }
 
-    override fun startObserving() {
-        observePrivateShareToEdit()
-        observePrivateShareEdition()
-    }
-
     override fun observeCapabilities() {
         ocCapabilityViewModel.capabilities.observe(
             this,
@@ -173,6 +167,18 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
      *********************************************** PRIVATE SHARES ***********************************************
      **************************************************************************************************************/
 
+    override fun showSearchUsersAndGroups() {
+        val searchFragment = SearchShareesFragment.newInstance(file, account)
+        val ft = supportFragmentManager.beginTransaction()
+        ft.replace(
+            R.id.share_fragment_container, searchFragment,
+            TAG_SEARCH_FRAGMENT
+        )
+        ft.addToBackStack(null)    // BACK button will recover the ShareFragment
+        ft.commit()
+    }
+
+    // Private share creation needs to be handled from here since is is carried out through intents
     override fun onNewIntent(intent: Intent) {
         when (intent.action) {
             Intent.ACTION_SEARCH -> {  // Verify the action and get the query
@@ -231,17 +237,18 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
         }
     }
 
-    override fun observePrivateShareCreation() {
+    private fun observePrivateShareCreation() {
         ocShareViewModel.privateShareCreationStatus.observe(
             this,
             Observer { uiResult ->
                 when (uiResult?.status) {
                     Status.ERROR -> {
                         Snackbar.make(
-                            findViewById(android.R.id.content),
+                            findViewById(android.R.id.content)!!,
                             uiResult.errorMessage!!,
                             Snackbar.LENGTH_SHORT
                         ).show()
+                        dismissLoadingDialog()
                     }
                     Status.LOADING -> {
                         showLoadingDialog(R.string.common_loading)
@@ -256,42 +263,6 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
         )
     }
 
-    override fun showSearchUsersAndGroups() {
-        val searchFragment = SearchShareesFragment.newInstance(file, account)
-        val ft = supportFragmentManager.beginTransaction()
-        ft.replace(
-            R.id.share_fragment_container, searchFragment,
-            TAG_SEARCH_FRAGMENT
-        )
-        ft.addToBackStack(null)    // BACK button will recover the ShareFragment
-        ft.commit()
-    }
-
-    private fun observePrivateShareEdition() {
-        ocShareViewModel.privateShareEditionStatus.observe(
-            this,
-            Observer { uiResult ->
-                when (uiResult?.status) {
-                    Status.ERROR -> {
-                        Snackbar.make(
-                            findViewById(android.R.id.content),
-                            uiResult.errorMessage!!,
-                            Snackbar.LENGTH_SHORT
-                        ).show()
-                    }
-                    Status.LOADING -> {
-                        showLoadingDialog(R.string.common_loading)
-                    }
-                    else -> {
-                        Log.d(
-                            TAG, "Unknown status when editing private share"
-                        )
-                    }
-                }
-            }
-        )
-    }
-
     override fun showEditPrivateShare(share: OCShareEntity) {
         val ft = supportFragmentManager.beginTransaction()
         val prev = supportFragmentManager.findFragmentByTag(TAG_EDIT_SHARE_FRAGMENT)
@@ -308,35 +279,6 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
         )
     }
 
-    override fun updatePrivateShare(remoteId: Long, permissions: Int) {
-        ocShareViewModel.updatePrivateShare(
-            remoteId,
-            permissions
-        )
-    }
-
-    override fun observePrivateShareToEdit() {
-        ocShareViewModel.privateShare.observe(
-            this,
-            Observer { uiResult ->
-                when (uiResult?.status) {
-                    Status.SUCCESS -> {
-                        editPrivateShareFragment?.updateShare(uiResult.data)
-                    }
-                    else -> {
-                        Log.d(
-                            TAG, "Unknown status when getting updated private share"
-                        )
-                    }
-                }
-            }
-        )
-    }
-
-    override fun refreshPrivateShare(remoteId: Long) {
-        ocShareViewModel.refreshPrivateShare(remoteId)
-    }
-
     override fun copyOrSendPrivateLink(file: OCFile) {
         fileOperationsHelper.copyOrSendPrivateLink(file)
     }
@@ -372,6 +314,10 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
         )
     }
 
+    /**************************************************************************************************************
+     ************************************************** COMMON ****************************************************
+     **************************************************************************************************************/
+
     override fun showRemoveShare(share: OCShareEntity) {
         val removePublicShareFragment = RemoveShareDialogFragment.newInstance(share, account)
         showDialogFragment(
@@ -384,21 +330,6 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
         fileOperationsHelper.copyOrSendPublicLink(share)
     }
 
-    /**
-     * Updates the view associated to the activity after the finish of some operation over files
-     * in the current account.
-     *
-     * @param operation Removal operation performed.
-     * @param result    Result of the removal.
-     */
-    override fun onRemoteOperationFinish(operation: RemoteOperation<*>, result: RemoteOperationResult<*>) {
-        super.onRemoteOperationFinish(operation, result)
-
-        if (operation is RemoveShareOperation && result.isSuccess && editPrivateShareFragment != null) {
-            supportFragmentManager.popBackStack()
-        }
-    }
-
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         var retval = true
         when (item.itemId) {
@@ -410,6 +341,14 @@ class ShareActivity : FileActivity(), ShareFragmentListener {
         return retval
     }
 
+    override fun showLoading() {
+        showLoadingDialog(R.string.common_loading)
+    }
+
+    override fun dismissLoading() {
+        dismissLoadingDialog()
+    }
+
     companion object {
         private val TAG = ShareActivity::class.java.simpleName
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/EditPrivateShareFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/EditPrivateShareFragment.kt
index 216b2626b02..994b9001058 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/EditPrivateShareFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/EditPrivateShareFragment.kt
@@ -25,6 +25,7 @@ package com.owncloud.android.presentation.ui.sharing.fragments
 import android.accounts.Account
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -32,6 +33,7 @@ import android.widget.CheckBox
 import android.widget.CompoundButton
 import androidx.appcompat.widget.SwitchCompat
 import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.Observer
 import com.owncloud.android.R
 import com.owncloud.android.authentication.AccountUtils
 import com.owncloud.android.data.sharing.shares.db.OCShareEntity
@@ -40,9 +42,13 @@ import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.RemoteShare
 import com.owncloud.android.lib.resources.shares.SharePermissionsBuilder
 import com.owncloud.android.lib.resources.shares.ShareType
+import com.owncloud.android.presentation.UIResult.Status
+import com.owncloud.android.presentation.viewmodels.sharing.OCShareViewModel
 import com.owncloud.android.utils.PreferenceUtils
 import kotlinx.android.synthetic.main.edit_share_layout.*
 import kotlinx.android.synthetic.main.edit_share_layout.view.*
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 import java.util.Locale
 
 /**
@@ -67,6 +73,13 @@ class EditPrivateShareFragment : DialogFragment() {
     /** Listener for changes on privilege checkboxes  */
     private var onPrivilegeChangeListener: CompoundButton.OnCheckedChangeListener? = null
 
+    private val ocShareViewModel: OCShareViewModel by viewModel {
+        parametersOf(
+            file?.remotePath,
+            account
+        )
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -96,7 +109,11 @@ class EditPrivateShareFragment : DialogFragment() {
         super.onActivityCreated(savedInstanceState)
         Log_OC.d(TAG, "onActivityCreated")
 
-        listener?.refreshPrivateShare(share?.remoteId!!)
+        // To observe the changes in a just updated share
+        refreshPrivateShare(share?.remoteId!!)
+        observePrivateShareToEdit()
+
+        observePrivateShareEdition()
     }
 
     /**
@@ -373,13 +390,44 @@ class EditPrivateShareFragment : DialogFragment() {
         }
     }
 
-    /**
-     * Updates the UI after the result of an update operation on the edited [RemoteShare] permissions.
-     *
-     */
-    fun updateShare(updatedShare: OCShareEntity?) {
-        share = updatedShare
-        refreshUiFromState()
+    private fun observePrivateShareToEdit() {
+        ocShareViewModel.privateShare.observe(
+            this,
+            Observer { uiResult ->
+                when (uiResult?.status) {
+                    Status.SUCCESS -> {
+                        updateShare(uiResult.data)
+                    }
+                    else -> {
+                        Log.d(
+                            TAG, "Unknown status when getting updated private share"
+                        )
+                    }
+                }
+            }
+        )
+    }
+
+    private fun observePrivateShareEdition() {
+        ocShareViewModel.privateShareEditionStatus.observe(
+            this,
+            Observer { uiResult ->
+                when (uiResult?.status) {
+                    Status.ERROR -> {
+                        showError(uiResult.errorMessage!!)
+                        listener?.dismissLoading()
+                    }
+                    Status.LOADING -> {
+                        listener?.showLoading()
+                    }
+                    else -> {
+                        Log.d(
+                            TAG, "Unknown status when editing private share"
+                        )
+                    }
+                }
+            }
+        )
     }
 
     /**
@@ -397,10 +445,20 @@ class EditPrivateShareFragment : DialogFragment() {
         }
         val permissions = spb.build()
 
-        listener?.updatePrivateShare(
-            share?.remoteId!!,
-            permissions
-        )
+        ocShareViewModel.updatePrivateShare(share?.remoteId!!, permissions)
+    }
+
+    private fun refreshPrivateShare(remoteId: Long) {
+        ocShareViewModel.refreshPrivateShare(remoteId)
+    }
+
+    /**
+     * Updates the UI after the result of an update operation on the edited [RemoteShare] permissions.
+     *
+     */
+    fun updateShare(updatedShare: OCShareEntity?) {
+        share = updatedShare
+        refreshUiFromState()
     }
 
     /**
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt
index 9e52830af86..f59a60fe3e4 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/PublicShareDialogFragment.kt
@@ -49,7 +49,6 @@ import com.owncloud.android.lib.resources.status.CapabilityBooleanType
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
 import com.owncloud.android.presentation.UIResult.Status
 import com.owncloud.android.presentation.viewmodels.sharing.OCShareViewModel
-import com.owncloud.android.ui.activity.BaseActivity
 import com.owncloud.android.ui.dialog.ExpirationDatePickerDialogFragment
 import com.owncloud.android.utils.DateUtils
 import kotlinx.android.synthetic.main.share_public_dialog.*
@@ -449,10 +448,10 @@ class PublicShareDialogFragment : DialogFragment() {
                     }
                     Status.ERROR -> {
                         showError(uiResult.errorMessage!!)
-                        (activity as BaseActivity).dismissLoadingDialog()
+                        listener?.dismissLoading()
                     }
                     Status.LOADING -> {
-                        (activity as BaseActivity).showLoadingDialog(R.string.common_loading)
+                        listener?.showLoading()
                     }
                     else -> {
                         Log.d(
@@ -474,10 +473,10 @@ class PublicShareDialogFragment : DialogFragment() {
                     }
                     Status.ERROR -> {
                         showError(uiResult.errorMessage!!)
-                        (activity as BaseActivity).dismissLoadingDialog()
+                        listener?.dismissLoading()
                     }
                     Status.LOADING -> {
-                        (activity as BaseActivity).showLoadingDialog(R.string.common_loading)
+                        listener?.showLoading()
                     }
                     else -> {
                         Log.d(
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt
index 8b904644058..f8a1aa33292 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/SearchShareesFragment.kt
@@ -47,10 +47,9 @@ import com.owncloud.android.data.sharing.shares.db.OCShareEntity
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.ShareType
-import com.owncloud.android.presentation.UIResult
+import com.owncloud.android.presentation.UIResult.Status
 import com.owncloud.android.presentation.adapters.sharing.ShareUserListAdapter
 import com.owncloud.android.presentation.viewmodels.sharing.OCShareViewModel
-import com.owncloud.android.ui.activity.BaseActivity
 import com.owncloud.android.utils.PreferenceUtils
 import kotlinx.android.synthetic.main.search_users_groups_layout.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -157,21 +156,21 @@ class SearchShareesFragment : Fragment(),
                             share.shareType == ShareType.FEDERATED.value
                 } as ArrayList<OCShareEntity>
                 when (uiResult?.status) {
-                    UIResult.Status.SUCCESS -> {
+                    Status.SUCCESS -> {
                         updatePrivateShares(privateShares)
-                        (activity as BaseActivity).dismissLoadingDialog() // TODO Use listener
+                        listener?.dismissLoading()
                     }
-                    UIResult.Status.ERROR -> {
+                    Status.ERROR -> {
                         Snackbar.make(
                             activity?.findViewById(android.R.id.content)!!,
                             uiResult.errorMessage!!,
                             Snackbar.LENGTH_SHORT
                         ).show()
                         updatePrivateShares(privateShares)
-                        (activity as BaseActivity).dismissLoadingDialog() // TODO Use listener
+                        listener?.dismissLoading()
                     }
-                    UIResult.Status.LOADING -> {
-                        (activity as BaseActivity).showLoadingDialog(R.string.common_loading)
+                    Status.LOADING -> {
+                        listener?.showLoading()
                         updatePrivateShares(privateShares)
                     }
                     else -> {
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt
index 2b8c2fb120e..d14ddec0b35 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFileFragment.kt
@@ -50,7 +50,6 @@ import com.owncloud.android.presentation.UIResult.Status
 import com.owncloud.android.presentation.adapters.sharing.SharePublicLinkListAdapter
 import com.owncloud.android.presentation.adapters.sharing.ShareUserListAdapter
 import com.owncloud.android.presentation.viewmodels.sharing.OCShareViewModel
-import com.owncloud.android.ui.activity.BaseActivity
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.MimetypeIconUtil
 import kotlinx.android.synthetic.main.share_file_layout.*
@@ -333,7 +332,7 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe
                 when (uiResult?.status) {
                     Status.SUCCESS -> {
                         updateShares(uiResult.data as ArrayList<OCShareEntity>)
-                        (activity as BaseActivity).dismissLoadingDialog() // TODO Use listener
+                        listener?.dismissLoading()
                     }
                     Status.ERROR -> {
                         Snackbar.make(
@@ -342,10 +341,10 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe
                             Snackbar.LENGTH_SHORT
                         ).show()
                         updateShares(uiResult.data)
-                        (activity as BaseActivity).dismissLoadingDialog() // TODO Use listener
+                        listener?.dismissLoading()
                     }
                     Status.LOADING -> {
-                        (activity as BaseActivity).showLoadingDialog(R.string.common_loading) // TODO Use listener
+                        listener?.showLoading() // TODO Use listener
                         updateShares(uiResult.data)
                     }
                     else -> {
@@ -447,11 +446,6 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe
         listener?.showEditPrivateShare(share)
     }
 
-    override fun removeShare(share: OCShareEntity) {
-        // Remove public link from server
-        listener?.showRemoveShare(share)
-    }
-
     /**************************************************************************************************************
      *********************************************** PUBLIC SHARES ************************************************
      **************************************************************************************************************/
@@ -538,6 +532,11 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe
         listener?.showEditPublicShare(share)
     }
 
+    override fun removeShare(share: OCShareEntity) {
+        // Remove public link from server
+        listener?.showRemoveShare(share)
+    }
+
     /**
      * Hide share features sections that are not enabled
      *
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFragmentListener.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFragmentListener.kt
index 1f52d7cf33e..d57540c2ef6 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFragmentListener.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/ui/sharing/fragments/ShareFragmentListener.kt
@@ -42,6 +42,10 @@ interface ShareFragmentListener {
 
     fun observeCapabilities()
 
+    fun showLoading()
+
+    fun dismissLoading()
+
     /**************************************************************************************************************
      *********************************************** PUBLIC SHARES ************************************************
      **************************************************************************************************************/
@@ -58,21 +62,7 @@ interface ShareFragmentListener {
      *********************************************** PRIVATE SHARES ***********************************************
      **************************************************************************************************************/
 
-    fun observePrivateShareCreation()
-
     fun showSearchUsersAndGroups()
 
-    fun observePrivateShareToEdit()
-
     fun showEditPrivateShare(share: OCShareEntity)
-
-    fun refreshPrivateShare(remoteId: Long)
-
-    fun updatePrivateShare(remoteId: Long, permissions: Int)
-
-    /**************************************************************************************************************
-     *************************************************** COMMON ***************************************************
-     **************************************************************************************************************/
-
-    fun startObserving()
 }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt
index 87819d62d92..17810cb70cf 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/RemoveShareDialogFragment.kt
@@ -30,6 +30,7 @@ package com.owncloud.android.ui.dialog
 
 import android.accounts.Account
 import android.app.Dialog
+import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import androidx.lifecycle.Observer
@@ -38,8 +39,8 @@ import com.owncloud.android.data.sharing.shares.db.OCShareEntity
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.ShareType
 import com.owncloud.android.presentation.UIResult.Status
+import com.owncloud.android.presentation.ui.sharing.fragments.ShareFragmentListener
 import com.owncloud.android.presentation.viewmodels.sharing.OCShareViewModel
-import com.owncloud.android.ui.activity.BaseActivity
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -48,6 +49,11 @@ class RemoveShareDialogFragment : ConfirmationDialogFragment(), ConfirmationDial
     private var targetShare: OCShareEntity? = null
     private var account: Account? = null
 
+    /**
+     * Reference to parent listener
+     */
+    private var listener: ShareFragmentListener? = null
+
     private val ocShareViewModel: OCShareViewModel by viewModel {
         parametersOf(
             targetShare?.path,
@@ -86,6 +92,16 @@ class RemoveShareDialogFragment : ConfirmationDialogFragment(), ConfirmationDial
         observeShareDeletion()
     }
 
+    override fun onAttach(context: Context?) {
+        super.onAttach(context)
+
+        try {
+            listener = activity as ShareFragmentListener?
+        } catch (e: IllegalStateException) {
+            throw IllegalStateException(activity!!.toString() + " must implement OnShareFragmentInteractionListener")
+        }
+    }
+
     private fun observeShareDeletion() {
         ocShareViewModel.shareDeletionStatus.observe(
             this,
@@ -95,7 +111,7 @@ class RemoveShareDialogFragment : ConfirmationDialogFragment(), ConfirmationDial
                         dismiss()
                     }
                     Status.LOADING -> {
-                        (activity as BaseActivity).showLoadingDialog(R.string.common_loading)
+                        listener?.showLoading()
                     }
                     else -> {
                         Log.d(
diff --git a/owncloudApp/src/main/res/layout/edit_share_layout.xml b/owncloudApp/src/main/res/layout/edit_share_layout.xml
index 8be49e52b35..cda4c8c14ac 100644
--- a/owncloudApp/src/main/res/layout/edit_share_layout.xml
+++ b/owncloudApp/src/main/res/layout/edit_share_layout.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   ownCloud Android client application
-
   @author David A. Velasco
   Copyright (C) 2016 ownCloud GmbH.
-
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
   as published by the Free Software Foundation.
-
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU General Public License for more details.
-
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
@@ -23,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".presentation.ui.sharing.fragments.EditPrivateShareFragment"
+    tools:context="presentation.ui.sharing.fragments.EditPrivateShareFragment"
     >
 
     <LinearLayout