Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortobiasKaminsky <tobias@kaminsky.me>2022-03-11 09:39:25 +0300
committertobiasKaminsky <tobias@kaminsky.me>2022-03-11 09:39:25 +0300
commit5da6fd235f037e52cd5537e87b901e7135514281 (patch)
tree86b38eb9f214c5b0c7aba3e3befa616ad426d4ef
parente5cf4dd231ffa6afe4edaab786ae96279e056bcb (diff)
Fix sharing from media viewshareFromMediaView
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
-rw-r--r--src/main/java/com/owncloud/android/ui/activity/FileActivity.java3
-rw-r--r--src/main/java/com/owncloud/android/ui/activity/ShareActivity.java16
2 files changed, 16 insertions, 3 deletions
diff --git a/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
index 3f2bfc8158..3fd6b5ccfa 100644
--- a/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
@@ -877,10 +877,11 @@ public abstract class FileActivity extends DrawerActivity
/**
* open the new sharing process fragment to create the share
+ *
* @param shareeName
* @param shareType
*/
- private void doShareWith(String shareeName, ShareType shareType) {
+ protected void doShareWith(String shareeName, ShareType shareType) {
FileDetailFragment fragment = getFileDetailFragment();
if (fragment != null) {
fragment.initiateSharingProcess(shareeName, shareType);
diff --git a/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java b/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
index d3f9831423..03b964a3f2 100644
--- a/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
@@ -37,8 +37,10 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation;
import com.owncloud.android.lib.resources.files.model.RemoteFile;
+import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.operations.GetSharesForFileOperation;
import com.owncloud.android.ui.fragment.FileDetailSharingFragment;
+import com.owncloud.android.ui.fragment.FileDetailsSharingProcessFragment;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.MimeTypeUtil;
import com.owncloud.android.utils.theme.ThemeColorUtils;
@@ -133,9 +135,19 @@ public class ShareActivity extends FileActivity {
refreshSharesFromStorageManager();
}
+ @Override
+ protected void doShareWith(String shareeName, ShareType shareType) {
+ getSupportFragmentManager().beginTransaction().replace(R.id.share_fragment_container,
+ FileDetailsSharingProcessFragment.newInstance(getFile(),
+ shareeName,
+ shareType),
+ FileDetailsSharingProcessFragment.TAG)
+ .commit();
+ }
+
/**
- * Updates the view associated to the activity after the finish of some operation over files
- * in the current account.
+ * 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.