From: tobiasKaminsky Date: Mon, 2 Nov 2015 07:45:57 +0000 (+0100) Subject: wip2 X-Git-Tag: beta-20151124~7^2~11 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/73b354da12ed721a09906c3e4f9ecde5a0f4c9c4?hp=--cc wip2 --- 73b354da12ed721a09906c3e4f9ecde5a0f4c9c4 diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index cc1a0c37..9241b640 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -238,17 +238,32 @@ public class FileOperationsHelper { public void setPictureAs(OCFile file) { if (file != null) { - String storagePath = file.getStoragePath(); - String encodedStoragePath = WebdavUtils.encodePath(storagePath); - Intent sendIntent = new Intent(Intent.ACTION_ATTACH_DATA); - // set MimeType - sendIntent.setData(Uri.parse(encodedStoragePath)); -// sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + encodedStoragePath)); -// sendIntent.putExtra("jpg", "image/*"); - - mFileActivity.startActivity(Intent.createChooser(sendIntent, - mFileActivity.getString(R.string.set_picture_as))); - + if (file.isDown()) { + String storagePath = file.getStoragePath(); + String encodedStoragePath = WebdavUtils.encodePath(storagePath); + Intent sendIntent = new Intent(Intent.ACTION_ATTACH_DATA); + // set MimeType + sendIntent.setType(file.getMimetype()); +// sendIntent.setData(Uri.parse(encodedStoragePath)); + sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(encodedStoragePath)); + // sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + encodedStoragePath)); + // sendIntent.putExtra("jpg", "image/*"); + + mFileActivity.startActivity(Intent.createChooser(sendIntent, + mFileActivity.getString(R.string.set_picture_as))); + } else { +// 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"); }