Better file opening; new ownCloud logo in account settings page

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / syncadapter / FileSyncAdapter.java

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index d5512a1..8d76328 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -34,6 +34,7 @@ import android.content.Intent;
 import android.content.SyncResult;\r
 import android.os.Bundle;\r
 import android.util.Log;\r
+import android.webkit.MimeTypeMap;\r
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.WebdavEntry;\r
@@ -142,7 +143,16 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         OCFile file = new OCFile(we.path());\r
         file.setCreationTimestamp(we.createTimestamp());\r
         file.setFileLength(we.contentLength());\r
-        file.setMimetype(we.contentType());\r
+        \r
+        // dvelasco; looks like server is not sending very precise mimeTypes; mp3 file results un application/oct\r
+        String filename = file.getFileName();\r
+        String mimeType = MimeTypeMap.getSingleton()\r
+                .getMimeTypeFromExtension(filename.substring(filename.lastIndexOf('.') + 1));\r
+        if (mimeType == null)\r
+            file.setMimetype(we.contentType());\r
+        else\r
+            file.setMimetype(mimeType);\r
+        \r
         file.setModificationTimestamp(we.modifiedTimesamp());\r
         file.setLastSyncDate(mCurrentSyncTime);\r
         return file;\r