wip

Author: 0xbrayo

mobile/src/main/java/net/activitywatch/android/RustInterface.kt

@@ -48,6 +48,7 @@ class RustInterface (context: Context? = null) {
     external fun createBucket(bucket: String): String
     external fun getEvents(bucket_id: String, limit: Int): String
     external fun heartbeat(bucket_id: String, event: String, pulsetime: Double): String
+    external fun query(query: String, timeperiods: String): String
 
     fun sayHello(to: String): String {
         return greeting(to)
@@ -172,6 +173,8 @@ class RustInterface (context: Context? = null) {
                 ?: android.os.Build.MODEL ?: "Unknown"
     }
 
+    fun query
+
     fun test() {
         // TODO: Move to instrumented test
         Log.w(TAG, sayHello("Android"))
@@ -182,6 +185,9 @@ class RustInterface (context: Context? = null) {
         Log.w(TAG, event)
         Log.w(TAG, heartbeat("test", event, 60.0))
         Log.w(TAG, getBucketsJSON().toString(2))
+        Log.w(TAG, getBucketsJSON().toString(2))
         Log.w(TAG, getEventsJSON("test").toString(2))
+        val timeintervals = "[${"\""}${Instant.now()}/${Instant.now()}${"\""}]"
+        Log.w(TAG, query("events = query_bucket(\"test\"); RETURN = events;", timeintervals))
     }
 }

mobile/src/main/java/net/activitywatch/android/watcher/WebWatcher.kt

@@ -145,7 +145,6 @@ class WebWatcher : AccessibilityService() {
 
     private fun logBrowserEvent(url: String, browser: String, windowTitle: String, lastUrlTimestamp : Instant) {
         val now = Instant.ofEpochMilli(System.currentTimeMillis())
-        val start = lastUrlTimestamp
         val duration = Duration.between(lastUrlTimestamp, now)
 
         val data = JSONObject()
@@ -156,7 +155,7 @@ class WebWatcher : AccessibilityService() {
             .put("incognito", false) // TODO
 
         Log.i(tag, "Registered event: $data")
-        ri?.heartbeatHelper(bucketId, start, duration.seconds.toDouble(), data, 1.0)
+        ri?.heartbeatHelper(bucketId, lastUrlTimestamp, duration.seconds.toDouble(), data, 1.0)
     }
 
     override fun onInterrupt() {}