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

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / adapter / DiskLruImageCache.java

diff --git a/src/com/owncloud/android/ui/adapter/DiskLruImageCache.java b/src/com/owncloud/android/ui/adapter/DiskLruImageCache.java
index d3479af..7d12249 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/DiskLruImageCache.java
+++ b/src/com/owncloud/android/ui/adapter/DiskLruImageCache.java
@@ -12,7 +12,6 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;

-import android.os.Environment;

 import android.util.Log;
 
 import com.jakewharton.disklrucache.DiskLruCache;
 import android.util.Log;
 
 import com.jakewharton.disklrucache.DiskLruCache;


@@ -27,13 +26,15 @@ public class DiskLruImageCache {
     private static final int CACHE_VERSION = 1;
     private static final int VALUE_COUNT = 1;
     private static final int IO_BUFFER_SIZE = 8 * 1024;
     private static final int CACHE_VERSION = 1;
     private static final int VALUE_COUNT = 1;
     private static final int IO_BUFFER_SIZE = 8 * 1024;

-    private static final String TAG = "DiskLruImageCache";
+    //private static final String TAG = "DiskLruImageCache";

 
     public DiskLruImageCache( Context context,String uniqueName, int diskCacheSize,
         CompressFormat compressFormat, int quality ) {
         try {
                 final File diskCacheDir = getDiskCacheDir(context, uniqueName );
 
     public DiskLruImageCache( Context context,String uniqueName, int diskCacheSize,
         CompressFormat compressFormat, int quality ) {
         try {
                 final File diskCacheDir = getDiskCacheDir(context, uniqueName );

-                mDiskCache = DiskLruCache.open( diskCacheDir, CACHE_VERSION, VALUE_COUNT, diskCacheSize );
+                mDiskCache = DiskLruCache.open(
+                        diskCacheDir, CACHE_VERSION, VALUE_COUNT, diskCacheSize 
+                );

                 mCompressFormat = compressFormat;
                 mCompressQuality = quality;
             } catch (IOException e) {
                 mCompressFormat = compressFormat;
                 mCompressQuality = quality;
             } catch (IOException e) {


@@ -125,7 +126,7 @@ public class DiskLruImageCache {
         }
 
         if ( BuildConfig.DEBUG ) {
         }
 
         if ( BuildConfig.DEBUG ) {

-            Log.d( "cache_test_DISK_", bitmap == null ? "not found" : "image read from disk " + key);
+            Log.d("cache_test_DISK_", bitmap == null ? "not found" : "image read from disk " + key);

         }
 
         return bitmap;
         }
 
         return bitmap;