X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/309f8c699de8591ac525428ef69fb3a3cf998878..c54d7e35d0efb3d1352ff6d1330cac185bef0a21:/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 cc1a0c37..78206628 100644
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -47,6 +47,7 @@ import com.owncloud.android.ui.dialog.ShareLinkToDialog;
 
 import org.apache.http.protocol.HTTP;
 
+import java.io.File;
 import java.util.List;
 
 /**
@@ -237,18 +238,22 @@ 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 != 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);
+            }
         } else {
             Log_OC.wtf(TAG, "Trying to send a NULL OCFile");
         }