mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 21:55:48 +03:00
Merge remote-tracking branch 'origin/master' into long_press
This commit is contained in:
commit
463194d0b4
2 changed files with 4 additions and 2 deletions
|
@ -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" />
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue