Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7E59410DD1 for ; Thu, 6 Jun 2013 21:36:03 +0000 (UTC) Received: (qmail 10744 invoked by uid 500); 6 Jun 2013 21:36:03 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 10715 invoked by uid 500); 6 Jun 2013 21:36:03 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 10698 invoked by uid 99); 6 Jun 2013 21:36:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jun 2013 21:36:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1FF59813997; Thu, 6 Jun 2013 21:36:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Date: Thu, 06 Jun 2013 21:36:03 -0000 Message-Id: <351758c271db41cb84a48f4e693bfc73@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] android commit: Revert "CB-3496: Fixed streaming audio, this is pretty important for mobile spec" Updated Branches: refs/heads/master e518eacbd -> 3753e3f35 Revert "CB-3496: Fixed streaming audio, this is pretty important for mobile spec" This reverts commit aa81966e0bf1460c6e40b9f5cc7290247cc84786. Going to revert all DataResource changes for on the 2.8.x branch. Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/43172cf5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/43172cf5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/43172cf5 Branch: refs/heads/master Commit: 43172cf53035e91125606fbb0046059c05c5a227 Parents: e518eac Author: Andrew Grieve Authored: Mon May 27 22:20:01 2013 -0400 Committer: Joe Bowser Committed: Thu Jun 6 14:06:54 2013 -0700 ---------------------------------------------------------------------- framework/src/org/apache/cordova/AudioHandler.java | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/43172cf5/framework/src/org/apache/cordova/AudioHandler.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/AudioHandler.java b/framework/src/org/apache/cordova/AudioHandler.java index ef20306..20c3c4e 100644 --- a/framework/src/org/apache/cordova/AudioHandler.java +++ b/framework/src/org/apache/cordova/AudioHandler.java @@ -58,10 +58,7 @@ public class AudioHandler extends CordovaPlugin { public String getFilePath(String url, String source){ DataResource dataResource = DataResource.initiateNewDataRequestForUri(url, this.webView.pluginManager, cordova, source); - if(dataResource.getUri().getScheme().equals("http") || dataResource.getUri().getScheme().equals("https")) - return dataResource.getUri().toString(); - else - return dataResource.getRealFile().getPath(); + return dataResource.getRealFile().getPath(); } /**