Merge branch 'in-progress'

woohyeok-choi · Oct 22, 2020 · 83fce1e · 83fce1e
2 parents 46b9b2e + d2382d9
commit 83fce1e
Show file tree

Hide file tree

Showing 22 changed files with 558 additions and 386 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,8 +47,8 @@ android {
         minSdkVersion 23
         targetSdkVersion 30
 
-        versionCode 32
-        versionName "0.9.9-gamma"
+        versionCode 33
+        versionName "0.9.9-delta"
         setProperty("archivesBaseName", "$applicationId-v.$versionName")
         buildConfigField("Boolean", "GENERATE_DUMMY_ENTITY", "false")
         buildConfigField("String", "SERVER_ADDRESS", "\"${rootProject.ext.server_address}\"")

diff --git a/app/src/main/kotlin/kaist/iclab/abclogger/collector/activity/ActivityCollector.kt b/app/src/main/kotlin/kaist/iclab/abclogger/collector/activity/ActivityCollector.kt
@@ -94,7 +94,8 @@ class ActivityCollector(
         recordsUploaded += entities.size
     }
 
-    override suspend fun list(limit: Long): Collection<PhysicalActivityEntity> = dataRepository.find(0, limit)
+    override suspend fun list(limit: Long): Collection<PhysicalActivityEntity> =
+        dataRepository.find(0, limit)
 
     private fun handleActivityRetrieval(intent: Intent) = launch {
         if (!ActivityRecognitionResult.hasResult(intent)) return@launch
@@ -111,7 +112,11 @@ class ActivityCollector(
             )
         }
 
-        put(PhysicalActivityEntity(activities = activities), curTime)
+        put(
+            PhysicalActivityEntity(activities = activities).apply {
+                timestamp = curTime
+            }
+        )
     }
 
     companion object {

diff --git a/app/src/main/kotlin/kaist/iclab/abclogger/collector/appusage/AppUsageCollector.kt b/app/src/main/kotlin/kaist/iclab/abclogger/collector/appusage/AppUsageCollector.kt
@@ -130,7 +130,11 @@ class AppUsageCollector(
             }
             entities.add(entity)
         }
-        putAll(entities)
+
+        entities.forEach {
+            put(it)
+        }
+
     }
 
     companion object {

diff --git a/app/src/main/kotlin/kaist/iclab/abclogger/collector/battery/BatteryCollector.kt b/app/src/main/kotlin/kaist/iclab/abclogger/collector/battery/BatteryCollector.kt
@@ -77,7 +77,9 @@ class BatteryCollector(
                 currentNow = manager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW),
                 energyCounter = manager.getLongProperty(BatteryManager.BATTERY_PROPERTY_ENERGY_COUNTER),
                 technology = intent.getStringExtra(BatteryManager.EXTRA_TECHNOLOGY) ?: ""
-        )
-        put(entity, timestamp)
+        ).apply {
+            this.timestamp = timestamp
+        }
+        put(entity)
     }
 }
diff --git a/app/src/main/kotlin/kaist/iclab/abclogger/collector/bluetooth/BluetoothCollector.kt b/app/src/main/kotlin/kaist/iclab/abclogger/collector/bluetooth/BluetoothCollector.kt
@@ -161,14 +161,14 @@ class BluetoothCollector(
     }
 
     private fun handleDeviceFound(intent: Intent) = launch {
-        val timestamp = System.currentTimeMillis()
         val extras = intent.extras ?: return@launch
         val rssi = extras.getShort(BluetoothDevice.EXTRA_RSSI, 0).toInt()
         val device = extras.getParcelable<BluetoothDevice>(BluetoothDevice.EXTRA_DEVICE)
                 ?: return@launch
-        val entity = buildEntity(device, rssi, false)
-
-        put(entity, timestamp)
+        val entity = buildEntity(device, rssi, false).apply {
+            timestamp = System.currentTimeMillis()
+        }
+        put(entity)
     }
 
     private fun handleLeScanRequest() = launch {
@@ -190,12 +190,15 @@ class BluetoothCollector(
             leScanner.stopScan(scanCallback)
         }
 
-        val timestamp = System.currentTimeMillis()
-        putAll(discoveredLeDevices.values, timestamp)
+        discoveredLeDevices.values.forEach {
+            put(it)
+        }
     }
 
     private fun handleLeDeviceFound(scanResult: ScanResult) {
-        discoveredLeDevices[scanResult.device.address] = buildEntity(scanResult.device, scanResult.rssi, true)
+        discoveredLeDevices[scanResult.device.address] = buildEntity(scanResult.device, scanResult.rssi, true).apply {
+            timestamp = System.currentTimeMillis()
+        }
     }
 
     private fun buildEntity(device: BluetoothDevice, rssi: Int, isLowEnergy: Boolean) =

diff --git a/app/src/main/kotlin/kaist/iclab/abclogger/collector/call/CallLogCollector.kt b/app/src/main/kotlin/kaist/iclab/abclogger/collector/call/CallLogCollector.kt
@@ -134,7 +134,7 @@ class CallLogCollector(
                 timestamp = millis
             }
         }
-        putAll(entities)
+        entities.forEach { put(it) }
     }
 
     companion object {

diff --git a/app/src/main/kotlin/kaist/iclab/abclogger/collector/embedded/EmbeddedSensorCollector.kt b/app/src/main/kotlin/kaist/iclab/abclogger/collector/embedded/EmbeddedSensorCollector.kt
@@ -86,8 +86,10 @@ class EmbeddedSensorCollector(
                 10, TimeUnit.SECONDS
             ).toFlowable(
                 BackpressureStrategy.BUFFER
-            ).asFlow().collect {
-                putAll(it)
+            ).asFlow().collect { entities ->
+                entities.forEach {
+                    put(it)
+                }
             }
         }
     }
@@ -106,7 +108,7 @@ class EmbeddedSensorCollector(
     override suspend fun list(limit: Long): Collection<EmbeddedSensorEntity> =
         dataRepository.find(0, limit)
 
-    private fun handleSensorEvent(event: SensorEvent, timestamp: Long) {
+    private fun handleSensorEvent(event: SensorEvent, timeInMillis: Long) {
         val type = event.sensor.type
         if (type !in arrayOf(Sensor.TYPE_PROXIMITY, Sensor.TYPE_LIGHT)) return
 
@@ -121,8 +123,9 @@ class EmbeddedSensorCollector(
             values = listOfNotNull(
                 event.values.firstOrNull()?.toString()
             )
-        )
-        entity.timestamp = timestamp
+        ).apply {
+            timestamp = timeInMillis
+        }
         buffer.onNext(entity)
     }