wip
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 08:01:08 +0000 (09:01 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 08:01:08 +0000 (09:01 +0100)
res/values/setup.xml
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/providers/FileContentProvider.java

index 76bdd9f..7363b4d 100644 (file)
@@ -46,7 +46,7 @@
     <bool name="recommend_enabled">true</bool>
     <bool name="feedback_enabled">true</bool>
     <string name="url_help">http://owncloud.com/mobile/help</string>
-    <string name="url_imprint"></string>
+    <string name="url_imprint"></string>/
     <string name="mail_recommend">"mailto:"</string>
     <string name="mail_feedback">"mailto:apps@owncloud.com"</string>
     <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.owncloud.android"</string>
index e7d9dfe..48fe119 100644 (file)
@@ -40,6 +40,7 @@ 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;
@@ -243,11 +244,12 @@ public class FileOperationsHelper {
                 String encodedStoragePath = WebdavUtils.encodePath(storagePath);
                 Intent sendIntent = new Intent(Intent.ACTION_ATTACH_DATA);
                 // set MimeType
-//                sendIntent.setType(file.getMimetype());
+                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.setDataAndType(Uri.parse(encodedStoragePath), "image/*");
+//                sendIntent.putExtra("jpg", "image/*");
                 //            sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + encodedStoragePath));
                 //            sendIntent.putExtra("jpg", "image/*");
 
index 609c07c..990d4b4 100644 (file)
@@ -60,6 +60,7 @@ import android.text.TextUtils;
 public class FileContentProvider extends ContentProvider {
 
     private DataBaseHelper mDbHelper;
+    public static final String AUTHORITY = "org.owncloud";
 
     // Projection for filelist table
     private static HashMap<String, String> mFileProjectionMap;