fix crash on list adapter when file has no mimetype

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 905391e..935a8fc 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.133B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.134B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r


@@ -160,4 +160,4 @@
         <activity android:name="CrashlogSendActivity"></activity>\r
     </application>\r
 \r
         <activity android:name="CrashlogSendActivity"></activity>\r
     </application>\r
 \r

-</manifest>
\ No newline at end of file
+</manifest>

diff --git a/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java b/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
index fc28e1f..6008d16 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
+++ b/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
@@ -104,7 +104,7 @@ public class FileListListAdapter implements ListAdapter {
 \r
             fileName.setText(name);\r
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r
 \r
             fileName.setText(name);\r
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r

-            if (!file.getMimetype().equals("DIR")) {\r
+            if (file.getMimetype() == null || !file.getMimetype().equals("DIR")) {\r

                 fileIcon.setImageResource(R.drawable.file);\r
             } else {\r
                 fileIcon.setImageResource(R.drawable.ic_menu_archive);\r
                 fileIcon.setImageResource(R.drawable.file);\r
             } else {\r
                 fileIcon.setImageResource(R.drawable.ic_menu_archive);\r