mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
David A. Velasco 2012-10-31 17:52:28 +01:00
commit 463194d0b4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AndroidManifest.xml
View file

@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<manifest package="com.owncloud.android" <manifest package="com.owncloud.android"
android:versionCode="103012" android:versionCode="103014"
android:versionName="1.3.12" xmlns:android="http://schemas.android.com/apk/res/android"> 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.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.USE_CREDENTIALS" />

2
src/eu/alefzero/webdav/WebdavEntry.java
View file

@ -50,6 +50,8 @@ public class WebdavEntry {
mName = tmp[tmp.length - 1]; mName = tmp[tmp.length - 1];
} }
// use unknown mimetype as default behavior
mContentType = "application/octet-stream";
prop = propSet.get(DavPropertyName.GETCONTENTTYPE); prop = propSet.get(DavPropertyName.GETCONTENTTYPE);
if (prop != null) { if (prop != null) {
mContentType = (String) prop.getValue(); mContentType = (String) prop.getValue();