Use android share sheet when sharing links and files

owncloud · Sep 16, 2020 · dfe1f8d · dfe1f8d
1 parent 894bb4c
commit dfe1f8d
Showing 1 changed file with 14 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,13 @@ 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) {
+                mFileActivity.startActivity(Intent.createChooser(sendIntent, ""));
+            } 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 +446,12 @@ 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) {
+            mFileActivity.startActivity(Intent.createChooser(intentToShareLink, ""));
+        } else {
+            DialogFragment chooserDialog = ShareLinkToDialog.newInstance(intentToShareLink, packagesToExclude);
+            chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+        }
     }
 }