little fixes

Author: sercant

example/src/main/java/com/awareframework/example_accelerometer/MainActivity.kt

@@ -1,6 +1,8 @@
 package com.awareframework.example_accelerometer
 
 import android.Manifest
+import android.content.Context
+import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
@@ -10,6 +12,7 @@ import android.support.v4.content.ContextCompat
 import com.awareframework.android.core.db.Engine
 import com.awareframework.android.core.manager.DbSyncManager
 import com.awareframework.android.sensor.accelerometer.Accelerometer
+import java.util.*
 
 class MainActivity : AppCompatActivity() {
 
@@ -38,11 +41,16 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun startSensors() {
+        val prefs = getSharedPreferences("deviceId", Context.MODE_PRIVATE)
+        val deviceId = prefs.getString("deviceId", UUID.randomUUID().toString())
+        prefs.edit().putString("deviceId", deviceId).apply()
+
         accelerometer = Accelerometer.Builder(this)
                 .setDebug(true)
                 .setDatabaseType(Engine.DatabaseType.ROOM)
                 .setDatabasePath("database-name")
-                .setDatabaseHost("http://100.70.109.77:3000/insert")
+                .setDatabaseHost("https://node.awareframework.com/insert")
+                .setDeviceId(deviceId)
                 .build()
         syncManager = DbSyncManager.Builder(this)
                 .setDebug(true)

library/src/main/java/com/awareframework/android/sensor/accelerometer/Accelerometer.kt

@@ -33,6 +33,8 @@ class Accelerometer private constructor(
         const val ACTION_AWARE_ACCELEROMETER_LABEL = "com.aware.android.sensor.accelerometer.SET_LABEL"
         const val ACTION_AWARE_ACCELEROMETER_SYNC = "com.aware.android.sensor.accelerometer.SYNC"
 
+        const val EXTRA_AWARE_ACCELEROMETER_LABEL = "label"
+
         val defaultConfig: AccelerometerConfig = AccelerometerConfig()
     }
 
@@ -123,10 +125,10 @@ class Accelerometer private constructor(
          */
         fun setSensorObserver(sensorObserver: SensorObserver) = apply { config.sensorObserver = sensorObserver }
 
-//        /**
-//         * @param deviceId id of the device that will be associated with the events and the sensor. (default = "")
-//         */
-//        fun setDeviceId(deviceId: String) = apply { CONFIG.deviceId = deviceId }
+        /**
+         * @param deviceId id of the device that will be associated with the events and the sensor. (default = "")
+         */
+        fun setDeviceId(deviceId: String) = apply { config.deviceId = deviceId }
 
         /**
          * @param wakeLock enable/disable wakelock, permissions needs to be handled by the client.

library/src/main/java/com/awareframework/android/sensor/accelerometer/AccelerometerSensor.kt

@@ -247,7 +247,7 @@ class AccelerometerSensor : AwareSensor(), SensorEventListener {
             when (intent?.action) {
 
                 Accelerometer.ACTION_AWARE_ACCELEROMETER_LABEL -> {
-                    AccelerometerSensor.CONFIG.label = intent.getStringExtra(Accelerometer.ACTION_AWARE_ACCELEROMETER_LABEL)
+                    AccelerometerSensor.CONFIG.label = intent.getStringExtra(Accelerometer.EXTRA_AWARE_ACCELEROMETER_LABEL)
                 }
 
                 Accelerometer.ACTION_AWARE_ACCELEROMETER_SYNC -> {