This commit is contained in:
tobiasKaminsky 2015-11-02 09:01:08 +01:00 committed by AndyScherzinger
parent 33b749d775
commit 4553e39ddd
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
3 changed files with 7 additions and 4 deletions

View file

@ -66,7 +66,7 @@
<bool name="feedback_enabled">true</bool> <bool name="feedback_enabled">true</bool>
<bool name="logger_enabled">false</bool> <bool name="logger_enabled">false</bool>
<string name="url_help">https://help.nextcloud.com/c/feature</string> <string name="url_help">https://help.nextcloud.com/c/feature</string>
<string name="url_imprint"></string> <string name="url_imprint"></string>/
<string name="mail_recommend">"mailto:"</string> <string name="mail_recommend">"mailto:"</string>
<string name="mail_feedback">"mailto:android@nextcloud.com"</string> <string name="mail_feedback">"mailto:android@nextcloud.com"</string>
<string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string> <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string>

View file

@ -64,6 +64,7 @@ import java.util.Locale;
public class FileContentProvider extends ContentProvider { public class FileContentProvider extends ContentProvider {
private DataBaseHelper mDbHelper; private DataBaseHelper mDbHelper;
public static final String AUTHORITY = "org.owncloud";
private static final int SINGLE_FILE = 1; private static final int SINGLE_FILE = 1;
private static final int DIRECTORY = 2; private static final int DIRECTORY = 2;

View file

@ -44,6 +44,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.shares.OCShare; import com.owncloud.android.lib.resources.shares.OCShare;
import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.lib.resources.status.OwnCloudVersion; 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.OperationsService;
import com.owncloud.android.services.observer.FileObserverService; import com.owncloud.android.services.observer.FileObserverService;
import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileActivity;
@ -526,11 +527,12 @@ public class FileOperationsHelper {
String encodedStoragePath = WebdavUtils.encodePath(storagePath); String encodedStoragePath = WebdavUtils.encodePath(storagePath);
Intent sendIntent = new Intent(Intent.ACTION_ATTACH_DATA); Intent sendIntent = new Intent(Intent.ACTION_ATTACH_DATA);
// set MimeType // 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.setData(Uri.parse(encodedStoragePath));
// sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(encodedStoragePath)); // sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse(encodedStoragePath));
sendIntent.setDataAndType(Uri.parse(encodedStoragePath), "image/*"); // sendIntent.setDataAndType(Uri.parse(encodedStoragePath), "image/*");
sendIntent.putExtra("jpg", "image/*"); // sendIntent.putExtra("jpg", "image/*");
// sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + encodedStoragePath)); // sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + encodedStoragePath));
// sendIntent.putExtra("jpg", "image/*"); // sendIntent.putExtra("jpg", "image/*");