From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 3 Nov 2014 10:30:44 +0000 (+0100)
Subject: Some clean-up in ThumbnailsCacheManager
X-Git-Tag: oc-android-1.7.0_signed~121^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/58040881bdcf0cf12798cc670e464e688dbb83c8?ds=inline;hp=-c

Some clean-up in ThumbnailsCacheManager
---

58040881bdcf0cf12798cc670e464e688dbb83c8
diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 93da1390..c2a4c68b 100644
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -19,7 +19,6 @@ package com.owncloud.android;
 import android.app.Application;
 import android.content.Context;
 
-import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
@@ -58,7 +57,7 @@ public class MainApp extends Application {
         }
 
         // initialise thumbnails cache on background thread
-        new ThumbnailsCacheManager.InitDiskCacheTask(mContext).execute();
+        new ThumbnailsCacheManager.InitDiskCacheTask().execute();
         
         if (BuildConfig.DEBUG) {
 
diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 5540aa5b..1d2cda8c 100644
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -18,7 +18,6 @@
 package com.owncloud.android.datamodel;
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.ref.WeakReference;
 
 import org.apache.commons.httpclient.HttpStatus;
@@ -26,9 +25,6 @@ import org.apache.commons.httpclient.methods.GetMethod;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
@@ -38,7 +34,6 @@ import android.graphics.drawable.Drawable;
 import android.media.ThumbnailUtils;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.util.TypedValue;
 import android.widget.ImageView;
 
 import com.owncloud.android.MainApp;
@@ -46,7 +41,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
@@ -85,11 +79,6 @@ public class ThumbnailsCacheManager {
 
     
     public static class InitDiskCacheTask extends AsyncTask<File, Void, Void> {
-        private static Context mContext;
-
-        public InitDiskCacheTask(Context context) {
-            mContext = context;
-           }
 
         @Override
         protected Void doInBackground(File... params) {
@@ -204,7 +193,8 @@ public class ThumbnailsCacheManager {
                     
                     mServerVersion = accountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION);
                     OwnCloudAccount ocAccount = new OwnCloudAccount(mAccount, MainApp.getAppContext());
-                    mClient = OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, MainApp.getAppContext());
+                    mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                            getClientFor(ocAccount, MainApp.getAppContext());
                 }
                 
                 mFile = params[0];
@@ -242,8 +232,8 @@ public class ThumbnailsCacheManager {
                                 try {
                                     int status = -1;
 
-                                    String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" + px + "/" + px
-                                            + Uri.encode(mFile.getRemotePath(), "/");
+                                    String uri = mClient.getBaseUri() + "/index.php/apps/files/api/v1/thumbnail/" + 
+                                            px + "/" + px + Uri.encode(mFile.getRemotePath(), "/");
                                     Log_OC.d("Thumbnail", "URI: " + uri);
                                     GetMethod get = new GetMethod(uri);
                                     status = mClient.executeMethod(get);
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 7007ad3f..e002efb7 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -98,7 +98,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
         mSortAscending = mAppPreferences.getBoolean("sortAscending", true);
         
         // initialise thumbnails cache on background thread
-        new ThumbnailsCacheManager.InitDiskCacheTask(mContext).execute();
+        new ThumbnailsCacheManager.InitDiskCacheTask().execute();
 
     }