X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fdf892fed3acab6f994a6393ad9426595b97c625..21cacceea00a4181566b4c41ee50cdf2ed1cd55f:/src/com/owncloud/android/files/FileOperationsHelper.java?ds=sidebyside diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index 8722ccfc..68c5662e 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -250,13 +250,34 @@ public class FileOperationsHelper { } public void setPictureAs(OCFile file) { - if (file != null || file.isDown()) { - File externalFile=new File(file.getStoragePath()); - Uri sendUri = Uri.fromFile(externalFile); - Intent intent = new Intent(Intent.ACTION_ATTACH_DATA); - intent.setDataAndType(sendUri, file.getMimetype()); - intent.putExtra("mimeType", file.getMimetype()); - mFileActivity.startActivityForResult(Intent.createChooser(intent, "Set As"), 200); + if (file != null){ + if (file.isDown()) { + File externalFile = new File(file.getStoragePath()); + Uri sendUri = Uri.fromFile(externalFile); + Intent intent = new Intent(Intent.ACTION_ATTACH_DATA); + intent.setDataAndType(sendUri, file.getMimetype()); + intent.putExtra("mimeType", file.getMimetype()); + mFileActivity.startActivityForResult(Intent.createChooser(intent, "Set As"), 200); + } else { + // TODO re-enable after resized images is available + Uri sendUri = Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + file.getRemotePath()); + Intent intent = new Intent(Intent.ACTION_ATTACH_DATA); + intent.setDataAndType(sendUri, file.getMimetype()); + intent.putExtra("mimeType", file.getMimetype()); + mFileActivity.startActivityForResult(Intent.createChooser(intent, "Set As"), 200); + +// Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND); +// // set MimeType +// sendIntent.setType(file.getMimetype()); +//// sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + "/#" + file.getRemoteId() + "#" + file.getFileName())); +// sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + file.getRemotePath())); +// sendIntent.putExtra(Intent.ACTION_SEND, true); // Send Action +// +// // Show dialog, without the own app +// String[] packagesToExclude = new String[] { mFileActivity.getPackageName() }; +// DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude, file); +// chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG); + } } else { Log_OC.wtf(TAG, "Trying to send a NULL OCFile"); }