You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2012/11/12 16:22:37 UTC

android commit: Correctly report the mime type of 3ga files

Updated Branches:
  refs/heads/master 4fe73cf6a -> e95bde62a


Correctly report the mime type of 3ga files


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/e95bde62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/e95bde62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/e95bde62

Branch: refs/heads/master
Commit: e95bde62a24557c903234adcef2f8e9c087d5d45
Parents: 4fe73cf
Author: Simon MacDonald <si...@gmail.com>
Authored: Mon Nov 12 10:22:35 2012 -0500
Committer: Simon MacDonald <si...@gmail.com>
Committed: Mon Nov 12 10:22:35 2012 -0500

----------------------------------------------------------------------
 framework/src/org/apache/cordova/FileUtils.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e95bde62/framework/src/org/apache/cordova/FileUtils.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/FileUtils.java b/framework/src/org/apache/cordova/FileUtils.java
index c2f90b6..8aff262 100755
--- a/framework/src/org/apache/cordova/FileUtils.java
+++ b/framework/src/org/apache/cordova/FileUtils.java
@@ -988,7 +988,12 @@ public class FileUtils extends CordovaPlugin {
         // So we need to replace the space with a url encoded %20
         String url = filename.replace(" ", "%20");
         MimeTypeMap map = MimeTypeMap.getSingleton();
-        return map.getMimeTypeFromExtension(MimeTypeMap.getFileExtensionFromUrl(url));
+        String extension = MimeTypeMap.getFileExtensionFromUrl(url);
+        if (extension.toLowerCase().equals("3ga")) {
+            return "audio/3gpp";
+        } else {
+            return map.getMimeTypeFromExtension(extension);
+        }
     }
 
     /**