github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-01 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adding unsupported action plugin result return if invalid action string is specified to accel and compass listener plugins

Browse Source
This commit is contained in:
Fil Maj 2012-01-25 14:10:22 -08:00
parent 95b9cd0229
commit 003e3d4d85
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/org/apache/cordova/AccelListener.java
View File

@ -148,7 +148,10 @@ public class AccelListener extends Plugin implements SensorEventListener {
else if (action.equals("getTimeout")) { else if (action.equals("getTimeout")) {
float f = this.getTimeout(); float f = this.getTimeout();
return new PluginResult(status, f); return new PluginResult(status, f);
} } else {
// Unsupported action
return new PluginResult(PluginResult.Status.INVALID_ACTION);
}
return new PluginResult(status, result); return new PluginResult(status, result);
} catch (JSONException e) { } catch (JSONException e) {
return new PluginResult(PluginResult.Status.JSON_EXCEPTION); return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
@ -167,7 +170,7 @@ public class AccelListener extends Plugin implements SensorEventListener {
} }
else if (action.equals("getAcceleration")) { else if (action.equals("getAcceleration")) {
// Can only return value if RUNNING // Can only return value if RUNNING
if (this.status == RUNNING) { if (this.status == AccelListener.RUNNING) {
return true; return true;
} }
} }

19
framework/src/org/apache/cordova/CompassListener.java
View File

@ -59,6 +59,7 @@ public class CompassListener extends Plugin implements SensorEventListener {
* Constructor. * Constructor.
*/ */
public CompassListener() { public CompassListener() {
this.heading = 0.0;
this.timeStamp = 0; this.timeStamp = 0;
this.setStatus(CompassListener.STOPPED); this.setStatus(CompassListener.STOPPED);
} }
@ -99,10 +100,10 @@ public class CompassListener extends Plugin implements SensorEventListener {
} }
else if (action.equals("getHeading")) { else if (action.equals("getHeading")) {
// If not running, then this is an async call, so don't worry about waiting // If not running, then this is an async call, so don't worry about waiting
if (this.status != RUNNING) { if (this.status != CompassListener.RUNNING) {
int r = this.start(); int r = this.start();
if (r == ERROR_FAILED_TO_START) { if (r == CompassListener.ERROR_FAILED_TO_START) {
return new PluginResult(PluginResult.Status.IO_EXCEPTION, ERROR_FAILED_TO_START); return new PluginResult(PluginResult.Status.IO_EXCEPTION, CompassListener.ERROR_FAILED_TO_START);
} }
// Wait until running // Wait until running
long timeout = 2000; long timeout = 2000;
@ -115,10 +116,9 @@ public class CompassListener extends Plugin implements SensorEventListener {
} }
} }
if (timeout == 0) { if (timeout == 0) {
return new PluginResult(PluginResult.Status.IO_EXCEPTION, AccelListener.ERROR_FAILED_TO_START); return new PluginResult(PluginResult.Status.IO_EXCEPTION, CompassListener.ERROR_FAILED_TO_START);
} }
} }
//float f = this.getHeading();
return new PluginResult(status, getCompassHeading()); return new PluginResult(status, getCompassHeading());
} }
else if (action.equals("setTimeout")) { else if (action.equals("setTimeout")) {
@ -127,6 +127,9 @@ public class CompassListener extends Plugin implements SensorEventListener {
else if (action.equals("getTimeout")) { else if (action.equals("getTimeout")) {
long l = this.getTimeout(); long l = this.getTimeout();
return new PluginResult(status, l); return new PluginResult(status, l);
} else {
// Unsupported action
return new PluginResult(PluginResult.Status.INVALID_ACTION);
} }
return new PluginResult(status, result); return new PluginResult(status, result);
} catch (JSONException e) { } catch (JSONException e) {
@ -147,7 +150,7 @@ public class CompassListener extends Plugin implements SensorEventListener {
} }
else if (action.equals("getHeading")) { else if (action.equals("getHeading")) {
// Can only return value if RUNNING // Can only return value if RUNNING
if (this.status == RUNNING) { if (this.status == CompassListener.RUNNING) {
return true; return true;
} }
} }
@ -180,11 +183,11 @@ public class CompassListener extends Plugin implements SensorEventListener {
return this.status; return this.status;
} }
// Get accelerometer from sensor manager // Get compass sensor from sensor manager
List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_ORIENTATION); List<Sensor> list = this.sensorManager.getSensorList(Sensor.TYPE_ORIENTATION);
// If found, then register as listener // If found, then register as listener
if (list.size() > 0) { if (list != null && list.size() > 0) {
this.mSensor = list.get(0); this.mSensor = list.get(0);
this.sensorManager.registerListener(this, this.mSensor, SensorManager.SENSOR_DELAY_NORMAL); this.sensorManager.registerListener(this, this.mSensor, SensorManager.SENSOR_DELAY_NORMAL);
this.lastAccessTime = System.currentTimeMillis(); this.lastAccessTime = System.currentTimeMillis();