From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 2 Nov 2015 21:02:24 +0000 (+0100)
Subject: update
X-Git-Tag: beta-20151124~7^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e192084434669c86fcbd880685646ec81b4bfc0b

update
---

diff --git a/owncloud-android-library b/owncloud-android-library
index 59fb6160..652cd28b 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 59fb61601de4dd8bfcab1afb619e016e1a7b904d
+Subproject commit 652cd28bb15672eaedfe8c1d9a46cf293c909b89
diff --git a/res/values/setup.xml b/res/values/setup.xml
index 76bdd9f8..1c65801e 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -4,6 +4,7 @@
     <string name="app_name">ownCloud</string>
     <string name="account_type">owncloud</string>	<!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">org.owncloud</string>	<!-- better if was the app package with ".provider" appended ; it identifies the provider -->
+    <string name="authorityCache">org.owncloud.imageCache.provider</string>
     <string name ="db_file">owncloud.db</string>
     <string name ="db_name">ownCloud</string>
     <string name ="data_folder">owncloud</string>
diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java
index a4e23ae8..78206628 100644
--- a/src/com/owncloud/android/files/FileOperationsHelper.java
+++ b/src/com/owncloud/android/files/FileOperationsHelper.java
@@ -238,27 +238,21 @@ public class FileOperationsHelper {
     }
 
     public void setPictureAs(OCFile file) {
-        if (file != null) {
+        if (file != null){
             if (file.isDown()) {
-                File externalFile=new File(file.getStoragePath());
+                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());
-////            sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + "/#" + file.getRemoteId() + "#" + file.getFileName()));
-//                sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://" + DiskLruImageCacheFileProvider.AUTHORITY + file.getRemotePath()));
-//                sendIntent.putExtra(Intent.ACTION_SEND, true);      // Send Action
-//
-//                // Show dialog, without the own app
-//                String[] packagesToExclude = new String[] { mFileActivity.getPackageName() };
-//                DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude, file);
-//                chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
+//                 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");