From 0e4243c9961821724581f2622c310fd2078773cd Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Sun, 19 Jun 2016 21:24:36 +0200 Subject: [PATCH 1/3] hofix: https://github.com/nextcloud/server/pull/110 --- src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java index 4ad7317306c5..18adb555054c 100644 --- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java +++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java @@ -285,6 +285,7 @@ private Bitmap doOCFileInBackground() { px + "/" + px + Uri.encode(file.getRemotePath(), "/"); Log_OC.d("Thumbnail", "URI: " + uri); get = new GetMethod(uri); + get.setRequestHeader("Cookie", "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true"); int status = mClient.executeMethod(get); if (status == HttpStatus.SC_OK) { InputStream inputStream = get.getResponseBodyAsStream(); From f1bd8fc59a9c60c0e2a11187ecb4a70f40b510a9 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Sun, 19 Jun 2016 21:24:59 +0200 Subject: [PATCH 2/3] linebreak --- src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java index 18adb555054c..8f495a90c565 100644 --- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java +++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java @@ -285,7 +285,8 @@ private Bitmap doOCFileInBackground() { px + "/" + px + Uri.encode(file.getRemotePath(), "/"); Log_OC.d("Thumbnail", "URI: " + uri); get = new GetMethod(uri); - get.setRequestHeader("Cookie", "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true"); + get.setRequestHeader("Cookie", + "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true"); int status = mClient.executeMethod(get); if (status == HttpStatus.SC_OK) { InputStream inputStream = get.getResponseBodyAsStream(); From 71005ab04be0d57afecd9fc5ec6152fd5974054b Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sun, 19 Jun 2016 23:45:44 +0200 Subject: [PATCH 3/3] version code/name for 1.0.1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 78f5fd92a879..667a7769b32b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,8 +19,8 @@ --> + android:versionCode="10000100" + android:versionName="1.0.1" >