Merge remote-tracking branch 'origin/master'

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0a1bac7..65874d0 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -160,4 +160,4 @@
         <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
-            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