From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 31 Oct 2012 16:52:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into long_press
X-Git-Tag: oc-android-1.4.3~88^2~15
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/463194d0b45b5f87bf23eef2a60e2dd6fb904819?hp=454f15138edf56b470b0cfe6fad7c09e46b9159b

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 597e600a..0c15b2d8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="103012"
-    android:versionName="1.3.12" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="103014"
+    android:versionName="1.3.14" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java
index 773276d8..5785f914 100644
--- a/src/eu/alefzero/webdav/WebdavEntry.java
+++ b/src/eu/alefzero/webdav/WebdavEntry.java
@@ -50,6 +50,8 @@ public class WebdavEntry {
                     mName = tmp[tmp.length - 1];
             }
 
+            // use unknown mimetype as default behavior
+            mContentType = "application/octet-stream";
             prop = propSet.get(DavPropertyName.GETCONTENTTYPE);
             if (prop != null) {
                 mContentType = (String) prop.getValue();