X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/bdf8a5cb8d4072bc5f6e3704184b2d08c913f59e..597d5640bb97e2594bedecbcbbc16c5ebc4bb6d6:/src/com/owncloud/android/files/FileOperationsHelper.java diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index 48fe1191..a4e23ae8 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -40,7 +40,6 @@ import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.lib.common.network.WebdavUtils; import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.status.OwnCloudVersion; -import com.owncloud.android.providers.FileContentProvider; import com.owncloud.android.services.OperationsService; import com.owncloud.android.services.observer.FileObserverService; import com.owncloud.android.ui.activity.FileActivity; @@ -48,6 +47,7 @@ import com.owncloud.android.ui.dialog.ShareLinkToDialog; import org.apache.http.protocol.HTTP; +import java.io.File; import java.util.List; /** @@ -240,22 +240,14 @@ public class FileOperationsHelper { public void setPictureAs(OCFile file) { if (file != null) { 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.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://" + FileContentProvider.AUTHORITY + file.getRemotePath())); -// sendIntent.setData(Uri.parse(encodedStoragePath)); -// sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(encodedStoragePath)); -// sendIntent.setDataAndType(Uri.parse(encodedStoragePath), "image/*"); -// sendIntent.putExtra("jpg", "image/*"); - // 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))); + 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 // Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND); // // set MimeType // sendIntent.setType(file.getMimetype());