You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/11/02 21:33:25 UTC
[2/2] android commit: Fixing CB-1801
Fixing CB-1801
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/eb59e76c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/eb59e76c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/eb59e76c
Branch: refs/heads/master
Commit: eb59e76cde1b269e7f617cbd98ac6ab94cdfce9c
Parents: d9db845
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Nov 1 12:23:18 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Nov 1 12:23:18 2012 -0700
----------------------------------------------------------------------
.../src/org/apache/cordova/CordovaWebView.java | 7 +++++++
test/src/org/apache/cordova/test/CordovaTest.java | 3 ++-
.../cordova/test/CordovaWebViewTestActivity.java | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/eb59e76c/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index a870c40..4740610 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -35,6 +35,7 @@ import org.xmlpull.v1.XmlPullParserException;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
+import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -688,6 +689,12 @@ public class CordovaWebView extends WebView {
* <log level="DEBUG" />
*/
private void loadConfiguration() {
+ Activity action = this.cordova.getActivity();
+ if(action == null)
+ {
+ LOG.i("CordovaLog", "There is no activity. Is this on the lock screen?");
+ return;
+ }
int id = getResources().getIdentifier("config", "xml", this.cordova.getActivity().getPackageName());
if(id == 0)
{
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/eb59e76c/test/src/org/apache/cordova/test/CordovaTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaTest.java b/test/src/org/apache/cordova/test/CordovaTest.java
index 64cd036..fdded36 100644
--- a/test/src/org/apache/cordova/test/CordovaTest.java
+++ b/test/src/org/apache/cordova/test/CordovaTest.java
@@ -51,7 +51,8 @@ public class CordovaTest extends
String className = testView.getClass().getSimpleName();
assertTrue(className.equals("CordovaWebView"));
}
-/*
+
+ /*
public void testForPluginManager() {
CordovaWebView v = (CordovaWebView) testView;
PluginManager p = v.getPluginManager();
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/eb59e76c/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
index 7f96948..675ecc7 100644
--- a/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
+++ b/test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
@@ -69,9 +69,9 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
}
+ //Note: This must always return an activity!
public Activity getActivity() {
- // TODO Auto-generated method stub
- return null;
+ return this;
}
@Deprecated