Merge pull request #2968 from owncloud/feature/share_sheet

[Feature] Android Sharesheet
owncloud · Oct 6, 2020 · dd561fc · dd561fc
2 parents 7e276f3 + 9849dc3
commit dd561fc
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 4 deletions.
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
@@ -28,6 +28,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.Build;
 import android.webkit.MimeTypeMap;
 
 import androidx.fragment.app.DialogFragment;
@@ -192,9 +193,20 @@ public void sendDownloadedFile(OCFile file) {
 
             // Show dialog, without the own app
             String[] packagesToExclude = new String[]{mFileActivity.getPackageName()};
-            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude);
-            chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
 
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                Intent shareSheetIntent = new ShareSheetHelper().getShareSheetIntent(
+                        sendIntent,
+                        mFileActivity.getApplicationContext(),
+                        R.string.activity_chooser_send_file_title,
+                        packagesToExclude
+                );
+
+                mFileActivity.startActivity(shareSheetIntent);
+            } else {
+                DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude);
+                chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+            }
         } else {
             Timber.e("Trying to send a NULL OCFile");
         }
@@ -441,7 +453,19 @@ private void shareLink(String link) {
         }
 
         String[] packagesToExclude = new String[]{mFileActivity.getPackageName()};
-        DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
-        chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            Intent shareSheetIntent = new ShareSheetHelper().getShareSheetIntent(
+                    intentToShareLink,
+                    mFileActivity.getApplicationContext(),
+                    R.string.activity_chooser_title,
+                    packagesToExclude
+            );
+
+            mFileActivity.startActivity(shareSheetIntent);
+        } else {
+            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
+            chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+        }
     }
 }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/ShareSheetHelper.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/helpers/ShareSheetHelper.kt
@@ -0,0 +1,64 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Abel García de Prada
+ * Copyright (C) 2020 ownCloud GmbH.
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.ui.helpers
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.os.Build
+import android.os.Parcelable
+import androidx.annotation.RequiresApi
+import androidx.annotation.StringRes
+import java.util.ArrayList
+
+class ShareSheetHelper {
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    fun getShareSheetIntent(
+        intent: Intent,
+        context: Context,
+        @StringRes title: Int,
+        packagesToExclude: Array<String>
+    ): Intent {
+
+        // Get excluding specific targets by component. We want to hide oC targets.
+        val resInfo: List<ResolveInfo> =
+            context.packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)
+        val excludeLists = ArrayList<ComponentName>()
+        if (resInfo.isNotEmpty()) {
+            for (info in resInfo) {
+                val activityInfo = info.activityInfo
+                for (packageToExclude in packagesToExclude) {
+                    if (activityInfo != null && activityInfo.packageName == packageToExclude) {
+                        excludeLists.add(ComponentName(activityInfo.packageName, activityInfo.name))
+                    }
+                }
+            }
+        }
+
+        // Return a new ShareSheet intent
+        return Intent.createChooser(intent, "").apply {
+            putExtra(Intent.EXTRA_EXCLUDE_COMPONENTS, excludeLists.toArray(arrayOf<Parcelable>()))
+            putExtra(Intent.EXTRA_TITLE, context.getString(title))
+        }
+    }
+}