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 2013/02/15 23:26:32 UTC
[3/3] android commit: CB-2447: This is a non-trivial task. Migrated
test plugin to modern plugin API.
Updated Branches:
refs/heads/master c20b2330a -> a31714f8a
CB-2447: This is a non-trivial task. Migrated test plugin to modern plugin API.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a31714f8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a31714f8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a31714f8
Branch: refs/heads/master
Commit: a31714f8a456c94f04c73a2605c15ba92615dbd2
Parents: 23d2a80
Author: Joe Bowser <bo...@apache.org>
Authored: Fri Feb 15 14:25:56 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri Feb 15 14:25:56 2013 -0800
----------------------------------------------------------------------
test/res/xml/cordova.xml | 37 --------------
test/res/xml/plugins.xml | 39 ---------------
.../org/apache/cordova/test/ActivityPlugin.java | 22 +++++---
3 files changed, 13 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a31714f8/test/res/xml/cordova.xml
----------------------------------------------------------------------
diff --git a/test/res/xml/cordova.xml b/test/res/xml/cordova.xml
deleted file mode 100755
index 4aebda4..0000000
--- a/test/res/xml/cordova.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<cordova>
- <!--
- access elements control the Android whitelist.
- Domains are assumed blocked unless set otherwise
- -->
-
- <access origin="http://127.0.0.1*"/> <!-- allow local pages -->
-
- <!-- <access origin="https://example.com" /> allow any secure requests to example.com -->
- <!-- <access origin="https://example.com" subdomains="true" /> such as above, but including subdomains, such as www -->
- <!-- <access origin=".*"/> Allow all domains, suggested development use only -->
-
- <log level="DEBUG"/>
- <preference name="useBrowserHistory" value="true" />
-</cordova>
-
-
-
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a31714f8/test/res/xml/plugins.xml
----------------------------------------------------------------------
diff --git a/test/res/xml/plugins.xml b/test/res/xml/plugins.xml
deleted file mode 100644
index 17074ef..0000000
--- a/test/res/xml/plugins.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<plugins>
- <plugin name="App" value="org.apache.cordova.App"/>
- <plugin name="Activity" value="org.apache.cordova.test.ActivityPlugin"/>
- <plugin name="Geolocation" value="org.apache.cordova.GeoBroker"/>
- <plugin name="Device" value="org.apache.cordova.Device"/>
- <plugin name="Accelerometer" value="org.apache.cordova.AccelListener"/>
- <plugin name="Compass" value="org.apache.cordova.CompassListener"/>
- <plugin name="Media" value="org.apache.cordova.AudioHandler"/>
- <plugin name="Camera" value="org.apache.cordova.CameraLauncher"/>
- <plugin name="Contacts" value="org.apache.cordova.ContactManager"/>
- <plugin name="File" value="org.apache.cordova.FileUtils"/>
- <plugin name="NetworkStatus" value="org.apache.cordova.NetworkManager"/>
- <plugin name="Notification" value="org.apache.cordova.Notification"/>
- <plugin name="Storage" value="org.apache.cordova.Storage"/>
- <plugin name="Temperature" value="org.apache.cordova.TempListener"/>
- <plugin name="FileTransfer" value="org.apache.cordova.FileTransfer"/>
- <plugin name="Capture" value="org.apache.cordova.Capture"/>
- <plugin name="Battery" value="org.apache.cordova.BatteryListener"/>
- <plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/>
-</plugins>
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a31714f8/test/src/org/apache/cordova/test/ActivityPlugin.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/ActivityPlugin.java b/test/src/org/apache/cordova/test/ActivityPlugin.java
index 787a0ee..0c1d1da 100755
--- a/test/src/org/apache/cordova/test/ActivityPlugin.java
+++ b/test/src/org/apache/cordova/test/ActivityPlugin.java
@@ -18,12 +18,14 @@
*/
package org.apache.cordova.test;
+import org.apache.cordova.CordovaArgs;
import org.apache.cordova.api.LOG;
import org.json.JSONArray;
import org.json.JSONException;
import android.content.Intent;
+import org.apache.cordova.api.CallbackContext;
import org.apache.cordova.api.CordovaPlugin;
import org.apache.cordova.api.PluginResult;
@@ -48,19 +50,21 @@ public class ActivityPlugin extends CordovaPlugin {
* @param callbackId The callback id used when calling back into JavaScript.
* @return A PluginResult object with a status and message.
*/
- @Override
- public PluginResult execute(String action, JSONArray args, String callbackId) {
- PluginResult.Status status = PluginResult.Status.OK;
- String result = "";
-
+ public boolean execute(String action, CordovaArgs args, final CallbackContext callbackContext) {
+ PluginResult result = new PluginResult(PluginResult.Status.OK, "");
try {
if (action.equals("start")) {
this.startActivity(args.getString(0));
+ callbackContext.sendPluginResult(result);
+ callbackContext.success();
+ return true;
}
- return new PluginResult(status, result);
} catch (JSONException e) {
- return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
+ result = new PluginResult(PluginResult.Status.JSON_EXCEPTION, "JSON Exception");
+ callbackContext.sendPluginResult(result);
+ return false;
}
+ return false;
}
// --------------------------------------------------------------------------
@@ -69,9 +73,9 @@ public class ActivityPlugin extends CordovaPlugin {
public void startActivity(String className) {
try {
- Intent intent = new Intent().setClass(this.ctx.getActivity(), Class.forName(className));
+ Intent intent = new Intent().setClass(this.cordova.getActivity(), Class.forName(className));
LOG.d(TAG, "Starting activity %s", className);
- this.ctx.getActivity().startActivity(intent);
+ this.cordova.getActivity().startActivity(intent);
} catch (ClassNotFoundException e) {
e.printStackTrace();
LOG.e(TAG, "Error starting activity %s", className);