From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 2 Jul 2012 08:42:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~323^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/16b5c6b9ad29bee58dec8aa301b21a2992d63d00?hp=41f2cf116916d7fd8e2adbe3b513713fed02eefa

Merge remote-tracking branch 'origin/master'
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0a1bac7a..65874d0b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -160,4 +160,4 @@
         <activity android:name="CrashlogSendActivity"></activity>
     </application>
 
-</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 fc28e1ff..6008d166 100644
--- 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 {
 
             fileName.setText(name);
             ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);
-            if (!file.getMimetype().equals("DIR")) {
+            if (file.getMimetype() == null || !file.getMimetype().equals("DIR")) {
                 fileIcon.setImageResource(R.drawable.file);
             } else {
                 fileIcon.setImageResource(R.drawable.ic_menu_archive);