feat: unlock watcher

Author: 0xbrayo

mobile/src/main/java/net/activitywatch/android/parser/SessionParser.kt

@@ -95,6 +95,40 @@ class SessionParser(private val context: Context) {
         return parseUsageEventsForPeriod(lastUpdateTimestamp, currentTime)
     }
 
+    /**
+     * Parse unlock (KEYGUARD_HIDDEN) events for a period starting from a timestamp
+     */
+    fun parseUnlockEventsForPeriod(startTimestamp: Long, endTimestamp: Long): List<Long> {
+        val usageEvents = usageStatsManager.queryEvents(startTimestamp, endTimestamp)
+        val unlockTimestamps = mutableListOf<Long>()
+
+        while (usageEvents.hasNextEvent()) {
+            val event = UsageEvents.Event()
+            usageEvents.getNextEvent(event)
+            if (event.eventType == UsageEvents.Event.KEYGUARD_HIDDEN) {
+                unlockTimestamps.add(event.timeStamp)
+            }
+        }
+
+        return unlockTimestamps.sorted()
+    }
+
+    /**
+     * Parse unlock events since a specific timestamp
+     */
+    fun parseUnlockEventsSince(lastUpdateTimestamp: Long): List<Long> {
+        val currentTime = System.currentTimeMillis()
+        return parseUnlockEventsForPeriod(lastUpdateTimestamp, currentTime)
+    }
+
+    /**
+     * Parse unlock events for a given day
+     */
+    fun parseUnlockEventsForDay(dayStartMs: Long): List<Long> {
+        val dayEndMs = dayStartMs + 24 * 60 * 60 * 1000 // 24 hours later
+        return parseUnlockEventsForPeriod(dayStartMs, dayEndMs)
+    }
+
     /**
      * Extract raw events from UsageEvents iterator
      */

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

@@ -73,6 +73,7 @@ class SessionEventWatcher(val context: Context) {
 
         val startTimestamp = lastUpdated?.toEpochMilli() ?: 0L
         val sessions = sessionParser.parseUsageEventsSince(startTimestamp)
+        val unlockTimestamps = sessionParser.parseUnlockEventsSince(startTimestamp)
 
         var eventsSent = 0
 
@@ -82,7 +83,12 @@ class SessionEventWatcher(val context: Context) {
             eventsSent++
         }
 
-        Log.i(TAG, "Finished processing events, sent $eventsSent session events")
+        for (timestamp in unlockTimestamps) {
+            val instant = DateTimeUtils.toInstant(java.util.Date(timestamp))
+            ri.heartbeatHelper(UNLOCK_BUCKET_ID, instant, 0.0, JSONObject(), 0.0)
+        }
+        
+        Log.i(TAG, "Finished processing events, sent $eventsSent session events and ${unlockTimestamps.size} unlock events")
         return eventsSent
     }
 
@@ -110,16 +116,23 @@ class SessionEventWatcher(val context: Context) {
         Log.i(TAG, "Sending session events for specific day: ${SessionUtils.formatDate(dayStartMs)}")
 
         val timeline = sessionParser.parseUsageEventsForDay(dayStartMs)
+        val unlockTimestamps = sessionParser.parseUnlockEventsForDay(dayStartMs)
 
         ri.createBucketHelper(SESSION_BUCKET_ID, "currentwindow")
+        ri.createBucketHelper(UNLOCK_BUCKET_ID, "os.lockscreen.unlocks")
 
         var eventsSent = 0
         for (session in timeline.sessions) {
             insertSessionAsEvent(session)
             eventsSent++
         }
 
-        Log.i(TAG, "Sent $eventsSent session events for day")
+        for (timestamp in unlockTimestamps) {
+            val instant = DateTimeUtils.toInstant(java.util.Date(timestamp))
+            ri.heartbeatHelper(UNLOCK_BUCKET_ID, instant, 0.0, JSONObject(), 0.0)
+        }
+
+        Log.i(TAG, "Sent $eventsSent session events and ${unlockTimestamps.size} unlock events for day")
     }
 
     /**
@@ -129,16 +142,23 @@ class SessionEventWatcher(val context: Context) {
         Log.i(TAG, "Sending session events for period: ${SessionUtils.formatDateTime(startTimestamp)} to ${SessionUtils.formatDateTime(endTimestamp)}")
 
         val sessions = sessionParser.parseUsageEventsForPeriod(startTimestamp, endTimestamp)
+        val unlockTimestamps = sessionParser.parseUnlockEventsForPeriod(startTimestamp, endTimestamp)
 
         ri.createBucketHelper(SESSION_BUCKET_ID, "currentwindow")
+        ri.createBucketHelper(UNLOCK_BUCKET_ID, "os.lockscreen.unlocks")
 
         var eventsSent = 0
         for (session in sessions) {
             insertSessionAsEvent(session)
             eventsSent++
         }
 
-        Log.i(TAG, "Sent $eventsSent session events for period")
+        for (timestamp in unlockTimestamps) {
+            val instant = DateTimeUtils.toInstant(java.util.Date(timestamp))
+            ri.heartbeatHelper(UNLOCK_BUCKET_ID, instant, 0.0, JSONObject(), 0.0)
+        }
+
+        Log.i(TAG, "Sent $eventsSent session events and ${unlockTimestamps.size} unlock events for period")
     }
 
     /**
@@ -186,22 +206,31 @@ class SessionEventWatcher(val context: Context) {
         Log.i(TAG, "Sending session events for last $numberOfDays days")
 
         ri.createBucketHelper(SESSION_BUCKET_ID, "currentwindow")
+        ri.createBucketHelper(UNLOCK_BUCKET_ID, "os.lockscreen.unlocks")
 
         var totalEventsSent = 0
+        var totalUnlocksSent = 0
 
         for (i in 0 until numberOfDays) {
             val dayStart = SessionUtils.getStartOfDayDaysAgo(i)
             val timeline = sessionParser.parseUsageEventsForDay(dayStart)
+            val unlockTimestamps = sessionParser.parseUnlockEventsForDay(dayStart)
 
             for (session in timeline.sessions) {
                 insertSessionAsEvent(session)
                 totalEventsSent++
             }
 
-            Log.d(TAG, "Sent ${timeline.sessions.size} session events for day ${SessionUtils.formatDate(dayStart)}")
+            for (timestamp in unlockTimestamps) {
+                val instant = DateTimeUtils.toInstant(java.util.Date(timestamp))
+                ri.heartbeatHelper(UNLOCK_BUCKET_ID, instant, 0.0, JSONObject(), 0.0)
+                totalUnlocksSent++
+            }
+
+            Log.d(TAG, "Sent ${timeline.sessions.size} session events and ${unlockTimestamps.size} unlock events for day ${SessionUtils.formatDate(dayStart)}")
         }
 
-        Log.i(TAG, "Sent total of $totalEventsSent session events for last $numberOfDays days")
+        Log.i(TAG, "Sent total of $totalEventsSent session events and $totalUnlocksSent unlock events for last $numberOfDays days")
     }
 
     /**