From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 9 Aug 2014 08:20:07 +0000 (+0200)
Subject: Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop
X-Git-Tag: oc-android-1.7.0_signed~163^2~8^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8c96447fe75afb512621a6c6bb134aa6852e9162?ds=inline;hp=--cc

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

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

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