From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 2 Nov 2015 21:29:16 +0000 (+0100)
Subject: update
X-Git-Tag: beta-20151122~45^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f15c2f32ceea2f2e6abff36f828a37196db3040a?ds=inline;hp=-c

update
---

f15c2f32ceea2f2e6abff36f828a37196db3040a
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e8ca43f..a970f8ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2015-11-02
+- PR [#1240](https://github.com/owncloud/android/pull/1240) "Set as wallpaper" merged
+- updated other PRs
+
 # 2015-11-01
 - PR [#1236](https://github.com/owncloud/android/pull/1236) "Streaming video/audio" merged
 - PR [#1035](https://github.com/owncloud/android/pull/1035) "Enable video thumbnail" merged
diff --git a/apks/latest.apk b/apks/latest.apk
index 567891ab..924f6260 100644
Binary files a/apks/latest.apk and b/apks/latest.apk differ
diff --git a/src/com/owncloud/android/ui/adapter/DiskLruImageCacheFileProvider.java b/src/com/owncloud/android/ui/adapter/DiskLruImageCacheFileProvider.java
index 4f1119ff..a3c54e8e 100644
--- a/src/com/owncloud/android/ui/adapter/DiskLruImageCacheFileProvider.java
+++ b/src/com/owncloud/android/ui/adapter/DiskLruImageCacheFileProvider.java
@@ -68,8 +68,6 @@ public class DiskLruImageCacheFileProvider extends ContentProvider {
 
     @Override
     public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
-        Log_OC.d(TAG, "try to send: " + uri);
-
         OCFile ocFile = getFile(uri);
 
         Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 92177f4a..88b0dd16 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -499,7 +499,7 @@ public class OCFileListFragment extends ExtendedListFragment {
                         ((FileDisplayActivity) mContainerActivity).startMediaPreview(file, 0, true);
                     } else if (file.isDown()) {
                         mContainerActivity.getFileOperationsHelper().openFile(file);
-                } else {
+                    } else {
                     // automatic download, preview on finish
                     ((FileDisplayActivity) mContainerActivity).startDownloadForPreview(file);
                 }