fixes after merge

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

@@ -23,16 +23,11 @@
 package com.owncloud.android.ui.adapter;
 
 
-import java.util.ArrayList;
-import java.util.Vector;
-
 import android.accounts.Account;
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.os.Build;
+import android.graphics.Color;
+import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -58,6 +53,9 @@ import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimetypeIconUtil;
 
+import java.util.ArrayList;
+import java.util.Vector;
+
 
 /**
  * This Adapter populates a ListView with all files and folders in an ownCloud

src/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -677,10 +677,6 @@ public class OCFileListFragment extends ExtendedListFragment {
                 } else {
                     if (!file.isHidden()) {
                         filesCount++;
-
-                        if (file.isImage() || file.isVideo()) {
-                            imagesCount++;
-                        }
                     }
                 }
             }