From 3ace32e9ae9c579f214800ded8330b98899cc6fa Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Sat, 13 Sep 2014 10:15:00 +0200 Subject: [PATCH] Removed accidently added remote thumbnail generation. --- .../ui/adapter/FileListListAdapter.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java index 8e281cda1b..c1ab8aa49d 100644 --- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java @@ -187,32 +187,32 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter { } else { // Download thumbnail from server // Commented out as maybe changes to client library are needed - DefaultHttpClient httpclient = new DefaultHttpClient(); - try { - httpclient.getCredentialsProvider().setCredentials( - new AuthScope(mClient.getBaseUri().toString().replace("https://", ""), 443), - new UsernamePasswordCredentials(mClient.getCredentials().getUsername(), mClient.getCredentials().getAuthToken())); - - - HttpGet httpget = new HttpGet(mClient.getBaseUri() + "/ocs/v1.php/thumbnail?x=50&y=50&path=" + URLEncoder.encode(file.getRemotePath(), "UTF-8")); - HttpResponse response = httpclient.execute(httpget); - HttpEntity entity = response.getEntity(); - - if (entity != null) { - byte[] bytes = EntityUtils.toByteArray(entity); - Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length); - thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px); - - // Add thumbnail to cache - if (thumbnail != null){ - addBitmapToCache(imageKey, thumbnail); - } - } - } catch(Exception e){ - e.printStackTrace(); - }finally { - httpclient.getConnectionManager().shutdown(); - } +// DefaultHttpClient httpclient = new DefaultHttpClient(); +// try { +// httpclient.getCredentialsProvider().setCredentials( +// new AuthScope(mClient.getBaseUri().toString().replace("https://", ""), 443), +// new UsernamePasswordCredentials(mClient.getCredentials().getUsername(), mClient.getCredentials().getAuthToken())); +// +// +// HttpGet httpget = new HttpGet(mClient.getBaseUri() + "/ocs/v1.php/thumbnail?x=50&y=50&path=" + URLEncoder.encode(file.getRemotePath(), "UTF-8")); +// HttpResponse response = httpclient.execute(httpget); +// HttpEntity entity = response.getEntity(); +// +// if (entity != null) { +// byte[] bytes = EntityUtils.toByteArray(entity); +// Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length); +// thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px); +// +// // Add thumbnail to cache +// if (thumbnail != null){ +// addBitmapToCache(imageKey, thumbnail); +// } +// } +// } catch(Exception e){ +// e.printStackTrace(); +// }finally { +// httpclient.getConnectionManager().shutdown(); +// } } } return thumbnail;