Fixed. Icons which have extensions in UpperCase, in the uploads view are not correct

diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index 73f81cf..8476197 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -160,7 +160,7 @@ public class LocalFileListAdapter extends BaseAdapter implements ListAdapter {
                     }
                 } else {
                     Uri selectedUri = Uri.fromFile(file);
                     }
                 } else {
                     Uri selectedUri = Uri.fromFile(file);

-                    String fileExtension = MimeTypeMap.getFileExtensionFromUrl(selectedUri.toString());
+                    String fileExtension = MimeTypeMap.getFileExtensionFromUrl(selectedUri.toString().toLowerCase());

                     String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
                     fileIcon.setImageResource(DisplayUtils.getResourceId(mimeType, file.getName()));
                 }  
                     String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
                     fileIcon.setImageResource(DisplayUtils.getResourceId(mimeType, file.getName()));
                 }  

diff --git a/src/com/owncloud/android/utils/BitmapUtils.java b/src/com/owncloud/android/utils/BitmapUtils.java
index df04a41..92824f4 100644 (file)
--- a/src/com/owncloud/android/utils/BitmapUtils.java
+++ b/src/com/owncloud/android/utils/BitmapUtils.java
@@ -181,7 +181,7 @@ public class BitmapUtils {
      */
     public static boolean isImage(File file) {
         Uri selectedUri = Uri.fromFile(file);
      */
     public static boolean isImage(File file) {
         Uri selectedUri = Uri.fromFile(file);

-        String fileExtension = MimeTypeMap.getFileExtensionFromUrl(selectedUri.toString());
+        String fileExtension = MimeTypeMap.getFileExtensionFromUrl(selectedUri.toString().toLowerCase());

         String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
 
         return (mimeType != null && mimeType.startsWith("image/"));
         String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
 
         return (mimeType != null && mimeType.startsWith("image/"));