Merge pull request #152 from owncloud/oauth_login

[pub/Android/ownCloud.git] / src / com / owncloud / android / DisplayUtils.java

diff --git a/src/com/owncloud/android/DisplayUtils.java b/src/com/owncloud/android/DisplayUtils.java
index d618811..d2939c8 100644 (file)
--- a/src/com/owncloud/android/DisplayUtils.java
+++ b/src/com/owncloud/android/DisplayUtils.java
@@ -1,11 +1,10 @@
 /* ownCloud Android client application\r
  *   Copyright (C) 2011  Bartek Przybylski\r
- *   Copyright (2) 2012-2013 ownCloud Inc.\r
+ *   Copyright (C) 2012-2013 ownCloud Inc.\r
  *\r
  *   This program is free software: you can redistribute it and/or modify\r
- *   it under the terms of the GNU General Public License as published by\r
- *   the Free Software Foundation, either version 3 of the License, or\r
- *   (at your option) any later version.\r
+ *   it under the terms of the GNU General Public License version 2,\r
+ *   as published by the Free Software Foundation.\r
  *\r
  *   This program is distributed in the hope that it will be useful,\r
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
@@ -25,8 +24,6 @@ import java.util.HashMap;
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r
-import android.util.Log;\r
-\r
 /**\r
  * A helper class for some string operations.\r
  * \r
@@ -59,7 +56,7 @@ public class DisplayUtils {
     private static final String TYPE_APPLICATION = "application";\r
     private static final String TYPE_AUDIO = "audio";\r
     private static final String TYPE_IMAGE = "image";\r
-    private static final String TYPE_TXT = "txt";\r
+    private static final String TYPE_TXT = "text";\r
     private static final String TYPE_VIDEO = "video";\r
     \r
     private static final String SUBTYPE_PDF = "pdf";\r
@@ -145,7 +142,7 @@ public class DisplayUtils {
         } else {\r
             String [] parts = mimetype.split("/");\r
             String type = parts[0];\r
-            String subtype = parts[1];\r
+            String subtype = (parts.length > 1) ? parts[1] : "";\r
             \r
             if(TYPE_TXT.equals(type)) {\r
                 return R.drawable.file_doc;\r