Merge branch 'develop' into sorting_files_2
authorjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 08:18:20 +0000 (10:18 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 08:18:20 +0000 (10:18 +0200)
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java

1  2 
res/values-de/strings.xml
res/values/strings.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java

Simple merge
Simple merge
   */\r
  package com.owncloud.android.ui.adapter;\r
  \r
- import java.lang.ref.WeakReference;\r
++
 +import java.io.File;\r
 +import java.util.Collections;\r
 +import java.util.Comparator;\r
  import java.util.Vector;\r
  \r
  import android.accounts.Account;\r
  import android.content.Context;\r
- import android.content.res.Resources;\r
 +import android.content.SharedPreferences;\r
  import android.graphics.Bitmap;\r
- import android.graphics.Bitmap.CompressFormat;\r
- import android.graphics.BitmapFactory;\r
- import android.graphics.drawable.BitmapDrawable;\r
- import android.graphics.drawable.Drawable;\r
- import android.media.ThumbnailUtils;\r
- import android.os.AsyncTask;\r
 +import android.preference.PreferenceManager;\r
- import android.util.TypedValue;\r
  import android.view.LayoutInflater;\r
  import android.view.View;\r
  import android.view.ViewGroup;\r
@@@ -47,17 -33,14 +39,17 @@@ import android.widget.TextView
  \r
  import com.owncloud.android.R;\r
  import com.owncloud.android.authentication.AccountUtils;\r
 +import com.owncloud.android.datamodel.AlphanumComparator;\r
  import com.owncloud.android.datamodel.FileDataStorageManager;\r
  import com.owncloud.android.datamodel.OCFile;\r
+ import com.owncloud.android.datamodel.ThumbnailsCacheManager;\r
+ import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncDrawable;\r
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
- import com.owncloud.android.lib.common.utils.Log_OC;\r
  import com.owncloud.android.ui.activity.ComponentsGetter;\r
- import com.owncloud.android.utils.BitmapUtils;\r
  import com.owncloud.android.utils.DisplayUtils;\r
 +import com.owncloud.android.utils.FileStorageUtils;\r
 +\r
  \r
  \r
  /**\r
@@@ -81,18 -62,7 +71,10 @@@ public class FileListListAdapter extend
      private FileDataStorageManager mStorageManager;
      private Account mAccount;
      private ComponentsGetter mTransferServiceGetter;\r
 +    private Integer sortOrder;\r
 +    private Boolean sortAscending;\r
 +    private SharedPreferences appPreferences;\r
      \r
-     private final Object thumbnailDiskCacheLock = new Object();\r
-     private DiskLruImageCache mThumbnailCache;\r
-     private boolean mThumbnailCacheStarting = true;\r
-     private static final int DISK_CACHE_SIZE = 1024 * 1024 * 10; // 10MB\r
-     private static final CompressFormat mCompressFormat = CompressFormat.JPEG;\r
-     private static final int mCompressQuality = 70;\r
-     private Bitmap defaultImg;\r
-         \r
      public FileListListAdapter(\r
              boolean justFolders, \r
              Context context, \r
          mJustFolders = justFolders;\r
          mContext = context;\r
          mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
--        mTransferServiceGetter = transferServiceGetter;\r
++        mTransferServiceGetter = transferServiceGetter;
 +        \r
 +        appPreferences = PreferenceManager\r
 +                .getDefaultSharedPreferences(mContext);\r
 +        \r
 +        // Read sorting order, default to sort by name ascending\r
 +        sortOrder = appPreferences\r
 +                .getInt("sortOrder", 0);\r
-         sortAscending = appPreferences.getBoolean("sortAscending", true);\r
-         \r
-         defaultImg = BitmapFactory.decodeResource(mContext.getResources(), \r
-                     DisplayUtils.getResourceId("image/png", "default.png"));\r
-         \r
-         // Initialise disk cache on background thread\r
-         new InitDiskCacheTask().execute();\r
-     }\r
-     \r
-     class InitDiskCacheTask extends AsyncTask<File, Void, Void> {\r
-         @Override\r
-         protected Void doInBackground(File... params) {\r
-             synchronized (thumbnailDiskCacheLock) {\r
-                 try {\r
-                     mThumbnailCache = new DiskLruImageCache(mContext, "thumbnailCache", \r
-                                         DISK_CACHE_SIZE, mCompressFormat, mCompressQuality);\r
-                 } catch (Exception e) {\r
-                     Log_OC.d(TAG, "Thumbnail cache could not be opened ", e);\r
-                     mThumbnailCache = null;\r
-                 }\r
-                 mThumbnailCacheStarting = false; // Finished initialization\r
-                 thumbnailDiskCacheLock.notifyAll(); // Wake any waiting threads\r
-             }\r
-             return null;\r
-         }\r
-     }\r
-     \r
-     static class AsyncDrawable extends BitmapDrawable {\r
-         private final WeakReference<ThumbnailGenerationTask> bitmapWorkerTaskReference;\r
\r
-         public AsyncDrawable(Resources res, Bitmap bitmap,\r
-                 ThumbnailGenerationTask bitmapWorkerTask) {\r
-             super(res, bitmap);\r
-             bitmapWorkerTaskReference =\r
-                 new WeakReference<ThumbnailGenerationTask>(bitmapWorkerTask);\r
-         }\r
\r
-         public ThumbnailGenerationTask getBitmapWorkerTask() {\r
-             return bitmapWorkerTaskReference.get();\r
-         }\r
-     }\r
\r
-     class ThumbnailGenerationTask extends AsyncTask<OCFile, Void, Bitmap> {\r
-         private final WeakReference<ImageView> imageViewReference;\r
-         private OCFile file;\r
\r
-         \r
-         public ThumbnailGenerationTask(ImageView imageView) {\r
-          // Use a WeakReference to ensure the ImageView can be garbage collected\r
-             imageViewReference = new WeakReference<ImageView>(imageView);\r
-         }\r
\r
-         // Decode image in background.\r
-         @Override\r
-         protected Bitmap doInBackground(OCFile... params) {\r
-             Bitmap thumbnail = null;\r
-             \r
-             try {\r
-                 file = params[0];\r
-                 final String imageKey = String.valueOf(file.getRemoteId());\r
-     \r
-                 // Check disk cache in background thread\r
-                 thumbnail = getBitmapFromDiskCache(imageKey);\r
-     \r
-                 // Not found in disk cache\r
-                 if (thumbnail == null || file.needsUpdateThumbnail()) { \r
-                     // Converts dp to pixel\r
-                     Resources r = mContext.getResources();\r
-                     int px = (int) Math.round(TypedValue.applyDimension(\r
-                             TypedValue.COMPLEX_UNIT_DIP, 150, r.getDisplayMetrics()\r
-                     ));\r
-                     \r
-                     if (file.isDown()){\r
-                         Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(\r
-                                 file.getStoragePath(), px, px);\r
-                         \r
-                         if (bitmap != null) {\r
-                             thumbnail = ThumbnailUtils.extractThumbnail(bitmap, px, px);\r
-     \r
-                             // Add thumbnail to cache\r
-                             addBitmapToCache(imageKey, thumbnail);\r
\r
-                             file.setNeedsUpdateThumbnail(false);\r
-                             mStorageManager.saveFile(file);\r
-                         }\r
-     \r
-                     }\r
-                 }\r
-                 \r
-             } catch (Throwable t) {\r
-                 // the app should never break due to a problem with thumbnails\r
-                 Log_OC.e(TAG, "Generation of thumbnail for " + file + " failed", t);\r
-                 if (t instanceof OutOfMemoryError) {\r
-                     System.gc();\r
-                 }\r
-             }\r
-             \r
-             return thumbnail;\r
-         }\r
++        sortAscending = appPreferences.getBoolean("sortAscending", true);
          \r
-         protected void onPostExecute(Bitmap bitmap){\r
-             if (isCancelled()) {\r
-                 bitmap = null;\r
-             }\r
\r
-             if (imageViewReference != null && bitmap != null) {\r
-                 final ImageView imageView = imageViewReference.get();\r
-                 final ThumbnailGenerationTask bitmapWorkerTask =\r
-                         getBitmapWorkerTask(imageView);\r
-                 if (this == bitmapWorkerTask && imageView != null) {\r
-                     imageView.setImageBitmap(bitmap);\r
-                 }\r
-             }\r
-         }\r
-     }\r
-   \r
-     public void addBitmapToCache(String key, Bitmap bitmap) {\r
-         synchronized (thumbnailDiskCacheLock) {\r
-             if (mThumbnailCache != null) {\r
-                 mThumbnailCache.put(key, bitmap);\r
-             }\r
-         }\r
+         // initialise thumbnails cache on background thread\r
+         new ThumbnailsCacheManager.InitDiskCacheTask().execute();\r
      }\r
\r
-     public Bitmap getBitmapFromDiskCache(String key) {\r
-         synchronized (thumbnailDiskCacheLock) {\r
-             // Wait while disk cache is started from background thread\r
-             while (mThumbnailCacheStarting) {\r
-                 try {\r
-                     thumbnailDiskCacheLock.wait();\r
-                 } catch (InterruptedException e) {}\r
-             }\r
-             if (mThumbnailCache != null) {\r
-                 return (Bitmap) mThumbnailCache.getBitmap(key);\r
-             }\r
-         }\r
-         return null;
-     }
\r
 -    \r
++    
      @Override\r
      public boolean areAllItemsEnabled() {\r
          return true;\r
  \r
          return view;\r
      }\r
 -    \r
 +
-     public static boolean cancelPotentialWork(OCFile file, ImageView imageView) {\r
-         final ThumbnailGenerationTask bitmapWorkerTask = getBitmapWorkerTask(imageView);\r
\r
-         if (bitmapWorkerTask != null) {\r
-             final OCFile bitmapData = bitmapWorkerTask.file;\r
-             // If bitmapData is not yet set or it differs from the new data\r
-             if (bitmapData == null || bitmapData != file) {\r
-                 // Cancel previous task\r
-                 bitmapWorkerTask.cancel(true);\r
-             } else {\r
-                 // The same work is already in progress\r
-                 return false;\r
-             }\r
-         }\r
-         // No task associated with the ImageView, or an existing task was cancelled\r
-         return true;\r
-     }\r
-     \r
-     private static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) {\r
-         if (imageView != null) {\r
-             final Drawable drawable = imageView.getDrawable();\r
-             if (drawable instanceof AsyncDrawable) {\r
-                 final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;\r
-                 return asyncDrawable.getBitmapWorkerTask();\r
-             }\r
-          }\r
-          return null;\r
-      }\r
 +    /**\r
 +     * Local Folder size in human readable format\r
 +     * @param path String\r
 +     * @return Size in human readable format\r
 +     */\r
 +    private String getFolderSizeHuman(String path) {\r
 +\r
 +        File dir = new File(path);\r
 +\r
 +        if(dir.exists()) {\r
 +            long bytes = getFolderSize(dir);\r
 +            if (bytes < 1024) return bytes + " B";\r
 +            int exp = (int) (Math.log(bytes) / Math.log(1024));\r
 +            String pre = ("KMGTPE").charAt(exp-1) + "";\r
 +\r
 +            return String.format("%.1f %sB", bytes / Math.pow(1024, exp), pre);\r
 +        }\r
 +\r
 +        return "0 B";\r
 +    }\r
 +\r
 +    /**\r
 +     * Local Folder size\r
 +     * @param dir File\r
 +     * @return Size in bytes\r
 +     */\r
 +    private long getFolderSize(File dir) {\r
 +        if (dir.exists()) {\r
 +            long result = 0;\r
 +            File[] fileList = dir.listFiles();\r
 +            for(int i = 0; i < fileList.length; i++) {\r
 +                if(fileList[i].isDirectory()) {\r
 +                    result += getFolderSize(fileList[i]);\r
 +                } else {\r
 +                    result += fileList[i].length();\r
 +                }\r
 +            }\r
 +            return result;\r
 +        }\r
 +        return 0;\r
 +    } 
\r
++
      @Override\r
      public int getViewTypeCount() {\r
          return 1;\r