From: tobiasKaminsky Date: Mon, 2 Nov 2015 08:38:24 +0000 (+0100) Subject: Merge branch 'setAsWallpaper' into beta X-Git-Tag: beta-20151122~45^2~8 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fdf892fed3acab6f994a6393ad9426595b97c625?hp=12dbd25ac9691faebd909322e9fa4662fa5cc1f8 Merge branch 'setAsWallpaper' into beta --- diff --git a/res/menu/file_actions_menu.xml b/res/menu/file_actions_menu.xml index 9b742d12..44caabfd 100644 --- a/res/menu/file_actions_menu.xml +++ b/res/menu/file_actions_menu.xml @@ -90,6 +90,11 @@ android:icon="@android:drawable/ic_menu_set_as" android:orderInCategory="1" /> + Error Log Stream file with external player Do you want to stream this file with an external app?\n\nCAUTION: This may expose your password! + Set picture as diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index e799e176..8722ccfc 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -51,6 +51,7 @@ import com.owncloud.android.ui.dialog.ShareLinkToDialog; import org.apache.http.protocol.HTTP; +import java.io.File; import java.util.List; import java.io.ByteArrayOutputStream; @@ -248,6 +249,19 @@ public class FileOperationsHelper { } } + public void setPictureAs(OCFile file) { + if (file != null || 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 { + Log_OC.wtf(TAG, "Trying to send a NULL OCFile"); + } + } + public void sendCachedImage(OCFile file) { if (file != null) { Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND); diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index dc96b9f2..2e4ffb55 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -367,6 +367,10 @@ public class PreviewImageFragment extends FileFragment { mContainerActivity.getFileOperationsHelper().toggleFavorite(getFile(), false); return true; } + case R.id.action_set_as_wallpaper:{ + mContainerActivity.getFileOperationsHelper().setPictureAs(getFile()); + return true; + } default: return false; }