Merge branch 'develop'

minoskt · minoskt · commit 2dcac6957ff1 · 2015-07-04T16:08:34.000+01:00
diff --git a/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/SensorModuleManager.java b/SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/SensorModuleManager.java
@@ -100,7 +100,8 @@ public void deregisterSensorModule(SensorModuleType moduleType) throws SKExcepti
 
     public boolean isSensorModuleRegistered(SensorModuleType moduleType) throws SKException {
 
-        return (getSensorModule(moduleType) != null);
+        int sensorIndex = moduleType.ordinal();
+        return (mSensors.get(sensorIndex) != null);
     }
 
     public boolean isSensorModuleSensing(SensorModuleType moduleType) throws SKException {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ public void deregisterSensorModule(SensorModuleType moduleType) throws SKExcepti`
`100`	`100`
`101`	`101`	`public boolean isSensorModuleRegistered(SensorModuleType moduleType) throws SKException {`
`102`	`102`
`103`		`- return (getSensorModule(moduleType) != null);`
	`103`	`+ int sensorIndex = moduleType.ordinal();`
	`104`	`+ return (mSensors.get(sensorIndex) != null);`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`public boolean isSensorModuleSensing(SensorModuleType moduleType) throws SKException {`