Re-added thumbnail generation for files that are not images.

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 5a069e7..8e281cd 100644 (file)
--- 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 {\r
                     // Download thumbnail from server\r
                     // Commented out as maybe changes to client library are needed\r
                 } else {\r
                     // Download thumbnail from server\r
                     // Commented out as maybe changes to client library are needed\r

-//                    DefaultHttpClient httpclient = new DefaultHttpClient();\r
-//                    try {\r
-//                        httpclient.getCredentialsProvider().setCredentials(\r
-//                                new AuthScope(mClient.getBaseUri().toString().replace("https://", ""), 443), \r
-//                                new UsernamePasswordCredentials(mClient.getCredentials().getUsername(), mClient.getCredentials().getAuthToken()));\r
-//                        \r
-//\r
-//                        HttpGet httpget = new HttpGet(mClient.getBaseUri() + "/ocs/v1.php/thumbnail?x=50&y=50&path=" + URLEncoder.encode(file.getRemotePath(), "UTF-8"));\r
-//                        HttpResponse response = httpclient.execute(httpget);\r
-//                        HttpEntity entity = response.getEntity();\r
-//                        \r
-//                        if (entity != null) {\r
-//                            byte[] bytes = EntityUtils.toByteArray(entity);\r
-//                            Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);\r
-//                            thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);\r
-//                            \r
-//                            // Add thumbnail to cache\r
-//                            if (thumbnail != null){\r
-//                                addBitmapToCache(imageKey, thumbnail);\r
-//                            }\r
-//                        }\r
-//                    } catch(Exception e){\r
-//                        e.printStackTrace();\r
-//                    }finally {\r
-//                        httpclient.getConnectionManager().shutdown();\r
-//                    }\r
+                    DefaultHttpClient httpclient = new DefaultHttpClient();\r
+                    try {\r
+                        httpclient.getCredentialsProvider().setCredentials(\r
+                                new AuthScope(mClient.getBaseUri().toString().replace("https://", ""), 443), \r
+                                new UsernamePasswordCredentials(mClient.getCredentials().getUsername(), mClient.getCredentials().getAuthToken()));\r
+                        \r
+\r
+                        HttpGet httpget = new HttpGet(mClient.getBaseUri() + "/ocs/v1.php/thumbnail?x=50&y=50&path=" + URLEncoder.encode(file.getRemotePath(), "UTF-8"));\r
+                        HttpResponse response = httpclient.execute(httpget);\r
+                        HttpEntity entity = response.getEntity();\r
+                        \r
+                        if (entity != null) {\r
+                            byte[] bytes = EntityUtils.toByteArray(entity);\r
+                            Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);\r
+                            thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);\r
+                            \r
+                            // Add thumbnail to cache\r
+                            if (thumbnail != null){\r
+                                addBitmapToCache(imageKey, thumbnail);\r
+                            }\r
+                        }\r
+                    } catch(Exception e){\r
+                        e.printStackTrace();\r
+                    }finally {\r
+                        httpclient.getConnectionManager().shutdown();\r
+                    }\r

                 } \r
             }\r
             return thumbnail;\r
                 } \r
             }\r
             return thumbnail;\r


@@ -373,6 +373,8 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                             task.execute(file);\r
                         }\r
                     }\r
                             task.execute(file);\r
                         }\r
                     }\r

+                } else {\r
+                    fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r

                 }\r
 
                 if (checkIfFileIsSharedWithMe(file)) {\r
                 }\r
 
                 if (checkIfFileIsSharedWithMe(file)) {\r