Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 88e64b1,b1e38e8..03f5ddc
--- 1/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
--- 2/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -28,10 -23,8 +28,15 @@@ import android.accounts.OperationCancel
  import android.content.Context;\r
  import android.content.res.Resources;\r
  import android.graphics.Bitmap;\r
++<<<<<<< HEAD
 +import android.graphics.Bitmap.CompressFormat;\r
  import android.graphics.BitmapFactory;\r
  import android.media.ThumbnailUtils;\r
 +import android.os.AsyncTask;\r
++=======
++import android.graphics.BitmapFactory;\r
++import android.media.ThumbnailUtils;\r
++>>>>>>> c0dc4c42d71eb9593ff48a02a8af74bd7df8776e
  import android.util.TypedValue;\r
  import android.view.LayoutInflater;\r
  import android.view.View;\r
@@@ -320,22 -168,18 +325,37 @@@ public class FileListListAdapter extend
                      }\r
                      checkBoxV.setVisibility(View.VISIBLE);\r
                  }\r
++<<<<<<< HEAD
 +                \r
 +                // first set thumbnail according to Mimetype, prevents empty thumbnails\r
 +                fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));\r
 +                \r
 +                // get Thumbnail if file is image\r
 +                if (file.isImage()){\r
 +                    // Thumbnail in Cache?\r
 +                    Bitmap thumbnail = getBitmapFromDiskCache(String.valueOf(file.getRemoteId()));\r
 +                    if (thumbnail != null){\r
 +                        fileIcon.setImageBitmap(thumbnail);\r
 +                    } else {\r
 +                        // generate new Thumbnail\r
 +                        new BitmapWorkerTask(fileIcon).execute(file);\r
 +                    }\r
 +                }\r
 +                \r
++=======
+ \r
+                 // generate Thumbnail if file is available local and image\r
+                 if (file.isDown() && file.isImage()){\r
+                     // Converts dp to pixel\r
+                     Resources r = mContext.getResources();\r
+                     int px = (int) Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 150, r.getDisplayMetrics()));\r
+                     Bitmap bitmap = BitmapFactory.decodeFile(file.getStoragePath());\r
+                     fileIcon.setImageBitmap(ThumbnailUtils.extractThumbnail(bitmap, px, px));\r
+                 } else {\r
+                     fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype(), file.getFileName()));  \r
+                 }\r
+ \r
++>>>>>>> c0dc4c42d71eb9593ff48a02a8af74bd7df8776e
                  if (checkIfFileIsSharedWithMe(file)) {\r
                      sharedWithMeIconV.setVisibility(View.VISIBLE);\r
                  }\r