From 1f393866166387bcf3ea1a0f3c943a6712da1822 Mon Sep 17 00:00:00 2001 From: Benn Mapes Date: Thu, 10 Jan 2013 15:07:26 -0800 Subject: [PATCH] Fixed broken functions that were deprecated --- framework/src/org/apache/cordova/App.java | 10 +--------- .../src/org/apache/cordova/api/LegacyContext.java | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/framework/src/org/apache/cordova/App.java b/framework/src/org/apache/cordova/App.java index dad34a07..afdbf3f2 100755 --- a/framework/src/org/apache/cordova/App.java +++ b/framework/src/org/apache/cordova/App.java @@ -64,7 +64,7 @@ public class App extends CordovaPlugin { this.loadUrl(args.getString(0), args.optJSONObject(1)); } else if (action.equals("cancelLoadUrl")) { - this.cancelLoadUrl(); + //this.cancelLoadUrl(); } else if (action.equals("clearHistory")) { this.clearHistory(); @@ -160,14 +160,6 @@ public class App extends CordovaPlugin { this.webView.showWebPage(url, openExternal, clearHistory, params); } - /** - * Cancel loadUrl before it has been loaded (Only works on a CordovaInterface class) - */ - @Deprecated - public void cancelLoadUrl() { - this.cordova.cancelLoadUrl(); - } - /** * Clear page history for the app. */ diff --git a/framework/src/org/apache/cordova/api/LegacyContext.java b/framework/src/org/apache/cordova/api/LegacyContext.java index c3030381..fe154f7c 100644 --- a/framework/src/org/apache/cordova/api/LegacyContext.java +++ b/framework/src/org/apache/cordova/api/LegacyContext.java @@ -43,7 +43,6 @@ public class LegacyContext implements CordovaInterface { @Deprecated public void cancelLoadUrl() { Log.i(LOG_TAG, "Replace ctx.cancelLoadUrl() with cordova.cancelLoadUrl()"); - this.cordova.cancelLoadUrl(); } @Deprecated @@ -55,7 +54,7 @@ public class LegacyContext implements CordovaInterface { @Deprecated public Context getContext() { Log.i(LOG_TAG, "Replace ctx.getContext() with cordova.getContext()"); - return this.cordova.getContext(); + return this.cordova.getActivity(); } @Deprecated