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/11/12 23:27:30 UTC
[1/2] android commit: Removing device plugin
Updated Branches:
refs/heads/master 4dd792a49 -> e5b68f4a3
Removing device plugin
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/95babc01
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/95babc01
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/95babc01
Branch: refs/heads/master
Commit: 95babc01e3fc3672f12724cbf4d6f0b04449c482
Parents: 4dd792a
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Nov 12 14:25:37 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Nov 12 14:25:37 2013 -0800
----------------------------------------------------------------------
test/src/org/apache/cordova/device/Device.java | 200 --------------------
1 file changed, 200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/95babc01/test/src/org/apache/cordova/device/Device.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/device/Device.java b/test/src/org/apache/cordova/device/Device.java
deleted file mode 100644
index 2ce3cc7..0000000
--- a/test/src/org/apache/cordova/device/Device.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- 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.
-*/
-package org.apache.cordova.device;
-
-import java.util.TimeZone;
-
-import org.apache.cordova.CordovaWebView;
-import org.apache.cordova.CallbackContext;
-import org.apache.cordova.CordovaPlugin;
-import org.apache.cordova.LOG;
-import org.apache.cordova.CordovaInterface;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.provider.Settings;
-import android.telephony.TelephonyManager;
-
-public class Device extends CordovaPlugin {
- public static final String TAG = "Device";
-
- public static String cordovaVersion = "dev"; // Cordova version
- public static String platform = "Android"; // Device OS
- public static String uuid; // Device UUID
-
- BroadcastReceiver telephonyReceiver = null;
-
- /**
- * Constructor.
- */
- public Device() {
- }
-
- /**
- * Sets the context of the Command. This can then be used to do things like
- * get file paths associated with the Activity.
- *
- * @param cordova The context of the main Activity.
- * @param webView The CordovaWebView Cordova is running in.
- */
- public void initialize(CordovaInterface cordova, CordovaWebView webView) {
- super.initialize(cordova, webView);
- Device.uuid = getUuid();
- this.initTelephonyReceiver();
- }
-
- /**
- * Executes the request and returns PluginResult.
- *
- * @param action The action to execute.
- * @param args JSONArry of arguments for the plugin.
- * @param callbackContext The callback id used when calling back into JavaScript.
- * @return True if the action was valid, false if not.
- */
- public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
- if (action.equals("getDeviceInfo")) {
- JSONObject r = new JSONObject();
- r.put("uuid", Device.uuid);
- r.put("version", this.getOSVersion());
- r.put("platform", Device.platform);
- r.put("cordova", Device.cordovaVersion);
- r.put("model", this.getModel());
- callbackContext.success(r);
- }
- else {
- return false;
- }
- return true;
- }
-
- /**
- * Unregister receiver.
- */
- public void onDestroy() {
- this.cordova.getActivity().unregisterReceiver(this.telephonyReceiver);
- }
-
- //--------------------------------------------------------------------------
- // LOCAL METHODS
- //--------------------------------------------------------------------------
-
- /**
- * Listen for telephony events: RINGING, OFFHOOK and IDLE
- * Send these events to all plugins using
- * CordovaActivity.onMessage("telephone", "ringing" | "offhook" | "idle")
- */
- private void initTelephonyReceiver() {
- IntentFilter intentFilter = new IntentFilter();
- intentFilter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
- //final CordovaInterface mycordova = this.cordova;
- this.telephonyReceiver = new BroadcastReceiver() {
-
- @Override
- public void onReceive(Context context, Intent intent) {
-
- // If state has changed
- if ((intent != null) && intent.getAction().equals(TelephonyManager.ACTION_PHONE_STATE_CHANGED)) {
- if (intent.hasExtra(TelephonyManager.EXTRA_STATE)) {
- String extraData = intent.getStringExtra(TelephonyManager.EXTRA_STATE);
- if (extraData.equals(TelephonyManager.EXTRA_STATE_RINGING)) {
- LOG.i(TAG, "Telephone RINGING");
- webView.postMessage("telephone", "ringing");
- }
- else if (extraData.equals(TelephonyManager.EXTRA_STATE_OFFHOOK)) {
- LOG.i(TAG, "Telephone OFFHOOK");
- webView.postMessage("telephone", "offhook");
- }
- else if (extraData.equals(TelephonyManager.EXTRA_STATE_IDLE)) {
- LOG.i(TAG, "Telephone IDLE");
- webView.postMessage("telephone", "idle");
- }
- }
- }
- }
- };
-
- // Register the receiver
- this.cordova.getActivity().registerReceiver(this.telephonyReceiver, intentFilter);
- }
-
- /**
- * Get the OS name.
- *
- * @return
- */
- public String getPlatform() {
- return Device.platform;
- }
-
- /**
- * Get the device's Universally Unique Identifier (UUID).
- *
- * @return
- */
- public String getUuid() {
- String uuid = Settings.Secure.getString(this.cordova.getActivity().getContentResolver(), android.provider.Settings.Secure.ANDROID_ID);
- return uuid;
- }
-
- /**
- * Get the Cordova version.
- *
- * @return
- */
- public String getCordovaVersion() {
- return Device.cordovaVersion;
- }
-
- public String getModel() {
- String model = android.os.Build.MODEL;
- return model;
- }
-
- public String getProductName() {
- String productname = android.os.Build.PRODUCT;
- return productname;
- }
-
- /**
- * Get the OS version.
- *
- * @return
- */
- public String getOSVersion() {
- String osversion = android.os.Build.VERSION.RELEASE;
- return osversion;
- }
-
- public String getSDKVersion() {
- @SuppressWarnings("deprecation")
- String sdkversion = android.os.Build.VERSION.SDK;
- return sdkversion;
- }
-
- public String getTimeZoneID() {
- TimeZone tz = TimeZone.getDefault();
- return (tz.getID());
- }
-
-}
[2/2] android commit: Fixing plugins configuration,
Device shouldn't be checked in here
Posted by bo...@apache.org.
Fixing plugins configuration, Device shouldn't be checked in here
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e5b68f4a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e5b68f4a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e5b68f4a
Branch: refs/heads/master
Commit: e5b68f4a3c44064e5b20d6d6edc4479aee336ccb
Parents: 95babc0
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Nov 12 14:27:09 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Nov 12 14:27:09 2013 -0800
----------------------------------------------------------------------
test/assets/www/cordova_plugins.js | 10 +--
.../org.apache.cordova.device/www/device.js | 78 --------------------
test/res/xml/config.xml | 5 +-
3 files changed, 2 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e5b68f4a/test/assets/www/cordova_plugins.js
----------------------------------------------------------------------
diff --git a/test/assets/www/cordova_plugins.js b/test/assets/www/cordova_plugins.js
index f23dd64..fbe1f44 100644
--- a/test/assets/www/cordova_plugins.js
+++ b/test/assets/www/cordova_plugins.js
@@ -1,11 +1,3 @@
cordova.define('cordova/plugin_list', function(require, exports, module) {
-module.exports = [
- {
- "file": "plugins/org.apache.cordova.device/www/device.js",
- "id": "org.apache.cordova.device.device",
- "clobbers": [
- "device"
- ]
- }
-]
+module.exports = []
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e5b68f4a/test/assets/www/plugins/org.apache.cordova.device/www/device.js
----------------------------------------------------------------------
diff --git a/test/assets/www/plugins/org.apache.cordova.device/www/device.js b/test/assets/www/plugins/org.apache.cordova.device/www/device.js
deleted file mode 100644
index c0697f6..0000000
--- a/test/assets/www/plugins/org.apache.cordova.device/www/device.js
+++ /dev/null
@@ -1,78 +0,0 @@
-cordova.define("org.apache.cordova.device.device", function(require, exports, module) {/*
- *
- * 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.
- *
-*/
-
-var argscheck = require('cordova/argscheck'),
- channel = require('cordova/channel'),
- utils = require('cordova/utils'),
- exec = require('cordova/exec'),
- cordova = require('cordova');
-
-channel.createSticky('onCordovaInfoReady');
-// Tell cordova channel to wait on the CordovaInfoReady event
-channel.waitForInitialization('onCordovaInfoReady');
-
-/**
- * This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
- * phone, etc.
- * @constructor
- */
-function Device() {
- this.available = false;
- this.platform = null;
- this.version = null;
- this.uuid = null;
- this.cordova = null;
- this.model = null;
-
- var me = this;
-
- channel.onCordovaReady.subscribe(function() {
- me.getInfo(function(info) {
- //ignoring info.cordova returning from native, we should use value from cordova.version defined in cordova.js
- //TODO: CB-5105 native implementations should not return info.cordova
- var buildLabel = cordova.version;
- me.available = true;
- me.platform = info.platform;
- me.version = info.version;
- me.uuid = info.uuid;
- me.cordova = buildLabel;
- me.model = info.model;
- channel.onCordovaInfoReady.fire();
- },function(e) {
- me.available = false;
- utils.alert("[ERROR] Error initializing Cordova: " + e);
- });
- });
-}
-
-/**
- * Get device info
- *
- * @param {Function} successCallback The function to call when the heading data is available
- * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
- */
-Device.prototype.getInfo = function(successCallback, errorCallback) {
- argscheck.checkArgs('fF', 'Device.getInfo', arguments);
- exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
-};
-
-module.exports = new Device();
-});
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e5b68f4a/test/res/xml/config.xml
----------------------------------------------------------------------
diff --git a/test/res/xml/config.xml b/test/res/xml/config.xml
index 6988887..24fb933 100644
--- a/test/res/xml/config.xml
+++ b/test/res/xml/config.xml
@@ -4,7 +4,7 @@
<description>
A sample Apache Cordova application that responds to the deviceready event.
</description>
- <author href="http://cordova.io" email="dev@cordova.apache.org">
+ <author email="dev@cordova.apache.org" href="http://cordova.io">
Apache Cordova Team
</author>
<access origin="*.apache.org" />
@@ -18,7 +18,4 @@
<feature name="App">
<param name="android-package" value="org.apache.cordova.App" />
</feature>
- <feature name="Device">
- <param name="android-package" value="org.apache.cordova.device.Device" />
- </feature>
</widget>