From eba47f0a4902e0cb62a6cbaea10ff0e2ef1346dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konrad=20Kr=C3=B3l?= <konrad.krol@incubly.com>
Date: Fri, 26 Sep 2025 14:41:21 +0200
Subject: [PATCH 1/2] build(deps): updated project dependencies, jvm target to
 11, gradle to 8.14

---
 .idea/misc.xml                           |  1 +
 .idea/vcs.xml                            |  1 +
 build.gradle                             | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties |  3 ++-
 mobile/build.gradle                      | 21 ++++++++++++---------
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5480c98a..d3dac033 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,5 @@
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddf..2617fefd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/mobile/src/main/res/drawable/media" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 0d0482b8..ed92e171 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
-    ext.androidXTestVersion = '1.5.0'
-    ext.espressoVersion = '3.5.0'
-    ext.extJUnitVersion = '1.1.4'
+    ext.kotlin_version = '1.9.0'
+    ext.androidXTestVersion = '1.7.0'
+    ext.espressoVersion = '3.7.0'
+    ext.extJUnitVersion = '1.3.0'
     ext.servicesVersion = '1.4.2'
     repositories {
         google()
@@ -14,7 +14,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.11.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 59bc51a2..fc3c9a78 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Sep 26 14:49:59 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mobile/build.gradle b/mobile/build.gradle
index 8476d85c..4a901d3b 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -42,12 +42,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
     namespace 'net.activitywatch.android'
     // Never got this to work...
@@ -69,19 +70,21 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
+
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.annotation:annotation:1.5.0'
+    implementation 'androidx.annotation:annotation:1.9.1'
 
-    implementation 'com.google.android.material:material:1.7.0'
-    implementation 'com.jakewharton.threetenabp:threetenabp:1.4.3'
+    implementation 'com.google.android.material:material:1.13.0'
+    implementation 'com.jakewharton.threetenabp:threetenabp:1.4.9'
 
     testImplementation "junit:junit:4.13.2"
     androidTestImplementation "androidx.test.ext:junit-ktx:$extJUnitVersion"

From 7f94a2a97e0e61ed2fe5e431783b85371ff895bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konrad=20Kr=C3=B3l?= <konrad.krol@incubly.com>
Date: Fri, 26 Sep 2025 11:15:35 +0200
Subject: [PATCH 2/2] feat: implemented generic web watcher with support of
 multiple web browsers

---
 mobile/build.gradle                           |   5 +
 .../activitywatch/android/ScreenshotTest.kt   |   5 +-
 .../android/watcher/WebWatcherTest.kt         | 154 ++++++++++++++++
 .../watcher/utils/CustomTabsWrapper.kt        | 134 ++++++++++++++
 .../android/watcher/utils/TestTimeouts.kt     |   8 +
 mobile/src/main/AndroidManifest.xml           |   7 +-
 .../net/activitywatch/android/MainActivity.kt |  29 ++--
 .../android/OnboardingActivity.kt             |  17 +-
 .../android/watcher/ChromeWatcher.kt          | 136 ---------------
 .../android/watcher/WebWatcher.kt             | 164 ++++++++++++++++++
 10 files changed, 497 insertions(+), 162 deletions(-)
 create mode 100644 mobile/src/androidTest/java/net/activitywatch/android/watcher/WebWatcherTest.kt
 create mode 100644 mobile/src/androidTest/java/net/activitywatch/android/watcher/utils/CustomTabsWrapper.kt
 create mode 100644 mobile/src/androidTest/java/net/activitywatch/android/watcher/utils/TestTimeouts.kt
 delete mode 100644 mobile/src/main/java/net/activitywatch/android/watcher/ChromeWatcher.kt
 create mode 100644 mobile/src/main/java/net/activitywatch/android/watcher/WebWatcher.kt

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 4a901d3b..c64a7fc3 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -93,6 +93,11 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
     androidTestUtil "androidx.test.services:test-services:$servicesVersion"
     androidTestImplementation "androidx.test.espresso:espresso-web:$espressoVersion"
+    androidTestImplementation "androidx.browser:browser:1.8.0"
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0'
+    androidTestImplementation('org.awaitility:awaitility:4.3.0') {
+        exclude group: 'org.hamcrest', module: 'hamcrest'
+    }
 }
 
 // Can be used to build with: ./gradlew cargoBuild
diff --git a/mobile/src/androidTest/java/net/activitywatch/android/ScreenshotTest.kt b/mobile/src/androidTest/java/net/activitywatch/android/ScreenshotTest.kt
index 4040f3c7..9fb01069 100644
--- a/mobile/src/androidTest/java/net/activitywatch/android/ScreenshotTest.kt
+++ b/mobile/src/androidTest/java/net/activitywatch/android/ScreenshotTest.kt
@@ -4,9 +4,8 @@ import android.content.Intent
 import android.util.Log
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
-import androidx.test.core.app.takeScreenshot
 import androidx.test.core.graphics.writeToTestStorage
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import org.junit.Rule
 import org.junit.Test
@@ -50,7 +49,7 @@ class ScreenshotTest {
         Thread.sleep(5000)
         Log.i(TAG, "Taking screenshot")
 
-        val bitmap = takeScreenshot()
+        val bitmap = InstrumentationRegistry.getInstrumentation().uiAutomation.takeScreenshot()
         // Only supported on API levels >=28
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
             bitmap.writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}")
diff --git a/mobile/src/androidTest/java/net/activitywatch/android/watcher/WebWatcherTest.kt b/mobile/src/androidTest/java/net/activitywatch/android/watcher/WebWatcherTest.kt
new file mode 100644
index 00000000..5995d42b
--- /dev/null
+++ b/mobile/src/androidTest/java/net/activitywatch/android/watcher/WebWatcherTest.kt
@@ -0,0 +1,154 @@
+package net.activitywatch.android.watcher
+
+import android.app.UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ServiceTestRule
+import net.activitywatch.android.RustInterface
+import net.activitywatch.android.watcher.utils.MAX_CONDITION_WAIT_TIME_MILLIS
+import net.activitywatch.android.watcher.utils.PAGE_MAX_WAIT_TIME_MILLIS
+import net.activitywatch.android.watcher.utils.PAGE_VISIT_TIME_MILLIS
+import net.activitywatch.android.watcher.utils.createCustomTabsWrapper
+import org.awaitility.Awaitility.await
+import org.hamcrest.CoreMatchers.not
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.TypeSafeMatcher
+import org.json.JSONArray
+import org.json.JSONObject
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit.MILLISECONDS
+import kotlin.time.Duration.Companion.milliseconds
+
+private const val BUCKET_NAME = "aw-watcher-android-web"
+
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+class WebWatcherTest {
+
+    @get:Rule
+    val serviceTestRule: ServiceTestRule = ServiceTestRule()
+
+    private val context = InstrumentationRegistry.getInstrumentation().targetContext
+    private val applicationContext = ApplicationProvider.getApplicationContext<Context>()
+
+    private val testWebPages = listOf(
+        WebPage("https://example.com", "Example Domain"),
+        WebPage("https://example.org", "Example Domain"),
+        WebPage("https://example.net", "Example Domain"),
+        WebPage("https://w3.org", "W3C"),
+    )
+
+    @Test
+    fun registerWebActivities() {
+        val ri = RustInterface(context)
+
+        Intent(applicationContext, WebWatcher::class.java)
+            .also { serviceTestRule.bindService(it) }
+            .also { enableAccessibilityService(serviceName = it.component!!.flattenToString()) }
+
+        val browsers = getAvailableBrowsers()
+            .also { assertThat(it, not(emptyList())) }
+
+        browsers.forEach { browser ->
+            openUris(uris = testWebPages.map { it.url }, browser = browser)
+            openHome() // to commit last event
+
+            val matchers = testWebPages.map { it.toMatcher(browser) }
+
+            await("expected events for: $browser").atMost(MAX_CONDITION_WAIT_TIME_MILLIS, MILLISECONDS).until {
+                val rawEvents = ri.getEvents(BUCKET_NAME, 100)
+                val events = JSONArray(rawEvents).asListOfJsonObjects()
+                    .filter { it.getJSONObject("data").getString("browser") == browser }
+
+                matchers.all { matcher -> events.any { matcher.matches(it) } }
+            }
+        }
+    }
+
+    private fun enableAccessibilityService(serviceName: String) {
+        executeShellCmd("settings put secure enabled_accessibility_services $serviceName")
+        executeShellCmd("settings put secure accessibility_enabled 1")
+    }
+
+    private fun executeShellCmd(cmd: String) {
+        InstrumentationRegistry.getInstrumentation()
+            .getUiAutomation(FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES)
+            .executeShellCommand(cmd)
+    }
+
+    private fun getAvailableBrowsers() : List<String> {
+        val activityIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://"))
+        return context.packageManager
+            .queryIntentActivities(activityIntent, PackageManager.MATCH_ALL)
+            .map { it.activityInfo.packageName.toString() }
+    }
+
+    private fun openUris(uris: List<String>, browser: String) {
+        val customTabs = createCustomTabsWrapper(browser, context)
+        uris.forEach { uri -> customTabs.openAndWait(
+            uri,
+            pageVisitTime = PAGE_VISIT_TIME_MILLIS.milliseconds,
+            maxWaitTime = PAGE_MAX_WAIT_TIME_MILLIS.milliseconds
+        )}
+    }
+
+    private fun openHome() {
+        val intent = Intent(Intent.ACTION_MAIN).apply {
+            addCategory(Intent.CATEGORY_HOME)
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        }
+
+        context.startActivity(intent)
+    }
+}
+
+private fun JSONArray.asListOfJsonObjects() = this.let {
+    jsonArray -> (0 until jsonArray.length()).map { jsonArray.get(it) as JSONObject }
+}
+
+data class WebPage(val url: String, val title: String) {
+    fun toMatcher(expectedBrowser: String): WebWatcherEventMatcher = WebWatcherEventMatcher(
+        expectedUrl = url.removePrefix("https://"),
+        expectedTitle = title.takeIf { shouldMatchTitle(expectedBrowser) },
+        expectedBrowser = expectedBrowser,
+    )
+
+    // Samsung Internet does not match title at all as no android.webkit.WebView node is present
+    private fun shouldMatchTitle(browser: String) = browser != "com.sec.android.app.sbrowser"
+}
+
+class WebWatcherEventMatcher(
+    private val expectedUrl: String,
+    private val expectedTitle: String?,
+    private val expectedBrowser: String
+) : TypeSafeMatcher<JSONObject>() {
+
+    override fun describeTo(description: org.hamcrest.Description?) {
+        description?.appendText("event with url=$expectedUrl registered by: $expectedBrowser")
+    }
+
+    override fun matchesSafely(obj: JSONObject): Boolean {
+        val timestamp = obj.optString("timestamp", "")
+
+        val duration = obj.optLong("duration", -1)
+        val data = obj.optJSONObject("data")
+
+        val url = data?.optString("url")
+        val title = data?.optString("title")
+        val browser = data?.optString("browser")
+
+        return timestamp.isNotBlank()
+                && duration >= 0
+                && url?.startsWith(expectedUrl) ?: false
+                && expectedTitle?.let { it == title } ?: true
+                && browser == expectedBrowser
+    }
+}
\ No newline at end of file
diff --git a/mobile/src/androidTest/java/net/activitywatch/android/watcher/utils/CustomTabsWrapper.kt b/mobile/src/androidTest/java/net/activitywatch/android/watcher/utils/CustomTabsWrapper.kt
new file mode 100644
index 00000000..d829c6be
--- /dev/null
+++ b/mobile/src/androidTest/java/net/activitywatch/android/watcher/utils/CustomTabsWrapper.kt
@@ -0,0 +1,134 @@
+package net.activitywatch.android.watcher.utils
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import androidx.browser.customtabs.CustomTabsCallback
+import androidx.browser.customtabs.CustomTabsCallback.NAVIGATION_FINISHED
+import androidx.browser.customtabs.CustomTabsCallback.NAVIGATION_STARTED
+import androidx.browser.customtabs.CustomTabsClient
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.browser.customtabs.CustomTabsServiceConnection
+import org.awaitility.Awaitility.await
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration
+import kotlin.time.toJavaDuration
+
+private const val FLAGS = Intent.FLAG_ACTIVITY_NEW_TASK + Intent.FLAG_ACTIVITY_NO_HISTORY
+
+fun createCustomTabsWrapper(browser: String, context: Context) : CustomTabsWrapper {
+    val navigationEventsQueue = LinkedBlockingQueue<Int>()
+
+    val customTabsCallback = object : CustomTabsCallback() {
+        override fun onNavigationEvent(navigationEvent: Int, extras: Bundle?) {
+            if (navigationEvent == NAVIGATION_STARTED || navigationEvent == NAVIGATION_FINISHED) {
+                navigationEventsQueue.offer(navigationEvent)
+            }
+        }
+    }
+
+    val customTabsIntent =
+        createCustomTabsIntentWithCallback(context, browser, customTabsCallback)
+            ?: createFallbackCustomTabsIntent(browser)
+
+    return CustomTabsWrapper(customTabsIntent, context, navigationEventsQueue)
+}
+
+private fun createCustomTabsIntentWithCallback(context: Context, browser: String, callback: CustomTabsCallback) : CustomTabsIntent? {
+    val customTabsIntent: CompletableFuture<CustomTabsIntent> = CompletableFuture()
+
+    return CustomTabsClient.bindCustomTabsService(context, browser, object : CustomTabsServiceConnection() {
+        override fun onCustomTabsServiceConnected(name: ComponentName, client: CustomTabsClient) {
+            val session = client.newSession(callback)
+            client.warmup(0)
+
+            customTabsIntent.complete(
+                CustomTabsIntent.Builder(session).build().also {
+                    it.intent.setPackage(browser)
+                    it.intent.addFlags(FLAGS)
+                }
+            )
+        }
+
+        override fun onServiceDisconnected(name: ComponentName) {}
+    }).takeIf { it }?.run {
+        customTabsIntent.get(CUSTOM_TABS_SERVICE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+    }
+}
+
+private fun createFallbackCustomTabsIntent(browser: String) = CustomTabsIntent.Builder().build()
+    .also {
+        it.intent.setPackage(browser)
+        it.intent.addFlags(FLAGS)
+    }
+
+class CustomTabsWrapper(
+    private val customTabsIntent: CustomTabsIntent,
+    private val context: Context,
+    navigationEventsQueue: LinkedBlockingQueue<Int>?
+) {
+
+    private val navigationCompletionAwaiter : NavigationCompletionAwaiter;
+
+    init {
+        val fallback = FallbackNavigationCompletionAwaiter()
+        navigationCompletionAwaiter = navigationEventsQueue?.let {
+            EventBasedNavigationCompletionAwaiter(it, fallback)
+        } ?: fallback
+    }
+
+    fun openAndWait(uri: String, pageVisitTime: Duration, maxWaitTime: Duration) {
+        customTabsIntent.launchUrl(context, Uri.parse(uri))
+        navigationCompletionAwaiter.waitForNavigationCompleted(pageVisitTime, maxWaitTime)
+    }
+}
+
+private interface NavigationCompletionAwaiter {
+    fun waitForNavigationCompleted(pageVisitTime: Duration, maxWaitTime: Duration)
+}
+
+private class EventBasedNavigationCompletionAwaiter(
+    private val navigationEventsQueue: LinkedBlockingQueue<Int>,
+    private val fallback: NavigationCompletionAwaiter,
+) : NavigationCompletionAwaiter {
+
+    private var useFallback = false
+
+    private fun waitForNavigationStarted() : Boolean {
+        val event = navigationEventsQueue.poll(NAVIGATION_STARTED_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+        return event == NAVIGATION_STARTED
+    }
+
+    override fun waitForNavigationCompleted(
+        pageVisitTime: Duration,
+        maxWaitTime: Duration
+    ) {
+        if (!useFallback && waitForNavigationStarted()) {
+            await()
+                .pollDelay(pageVisitTime.toJavaDuration())
+                .atMost(maxWaitTime.toJavaDuration())
+                .until { navigationEventsQueue.peek() == NAVIGATION_FINISHED }
+            navigationEventsQueue.peek()
+        } else {
+            useFallback = true
+            fallback.waitForNavigationCompleted(pageVisitTime, maxWaitTime)
+        }
+    }
+}
+
+private class FallbackNavigationCompletionAwaiter : NavigationCompletionAwaiter {
+    override fun waitForNavigationCompleted(
+        pageVisitTime: Duration,
+        maxWaitTime: Duration
+    ) {
+        await()
+            .pollDelay(pageVisitTime.toJavaDuration())
+            .atMost(maxWaitTime.toJavaDuration())
+            .until { true } // just wait page visit time as no callback is available
+    }
+
+}
\ No newline at end of file
diff --git a/mobile/src/androidTest/java/net/activitywatch/android/watcher/utils/TestTimeouts.kt b/mobile/src/androidTest/java/net/activitywatch/android/watcher/utils/TestTimeouts.kt
new file mode 100644
index 00000000..f185a95d
--- /dev/null
+++ b/mobile/src/androidTest/java/net/activitywatch/android/watcher/utils/TestTimeouts.kt
@@ -0,0 +1,8 @@
+package net.activitywatch.android.watcher.utils
+
+const val PAGE_VISIT_TIME_MILLIS = 5000L
+const val PAGE_MAX_WAIT_TIME_MILLIS = 10000L
+const val MAX_CONDITION_WAIT_TIME_MILLIS = 10000L
+
+const val CUSTOM_TABS_SERVICE_TIMEOUT_MILLIS = 30000L
+const val NAVIGATION_STARTED_TIMEOUT_MILLIS = 10000L
\ No newline at end of file
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index c983de3a..49336b9d 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingLeanbackLauncher">
 
     <uses-feature
         android:name="android.software.leanback"
@@ -11,7 +12,7 @@
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:ignore="QueryAllPackagesPermission" />
     <uses-permission
             android:name="android.permission.PACKAGE_USAGE_STATS"
             tools:ignore="ProtectedPermissions"/>
@@ -58,7 +59,7 @@
             </intent-filter>
         </receiver>
 
-        <service android:name=".watcher.ChromeWatcher"
+        <service android:name=".watcher.WebWatcher"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
             android:exported="true">
             <intent-filter>
diff --git a/mobile/src/main/java/net/activitywatch/android/MainActivity.kt b/mobile/src/main/java/net/activitywatch/android/MainActivity.kt
index 0c439e0f..e81b4f24 100644
--- a/mobile/src/main/java/net/activitywatch/android/MainActivity.kt
+++ b/mobile/src/main/java/net/activitywatch/android/MainActivity.kt
@@ -3,14 +3,15 @@ package net.activitywatch.android
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.navigation.NavigationView
-import androidx.core.view.GravityCompat
-import androidx.appcompat.app.AppCompatActivity
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.GravityCompat
 import androidx.fragment.app.Fragment
-import android.util.Log
+import com.google.android.material.navigation.NavigationView
+import com.google.android.material.snackbar.Snackbar
 import net.activitywatch.android.databinding.ActivityMainBinding
 import net.activitywatch.android.fragments.TestFragment
 import net.activitywatch.android.fragments.WebUIFragment
@@ -65,6 +66,16 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         val firstFragment = WebUIFragment.newInstance(baseURL)
         supportFragmentManager.beginTransaction()
             .add(R.id.fragment_container, firstFragment).commit()
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+                    binding.drawerLayout.closeDrawer(GravityCompat.START)
+                } else {
+                    finish()
+                }
+            }
+        })
     }
 
     override fun onResume() {
@@ -76,14 +87,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         usw.sendHeartbeats()
     }
 
-    override fun onBackPressed() {
-        if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
-            binding.drawerLayout.closeDrawer(GravityCompat.START)
-        } else {
-            super.onBackPressed()
-        }
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         // Inflate the menu; this adds items to the action bar if it is present.
         menuInflater.inflate(R.menu.main, menu)
diff --git a/mobile/src/main/java/net/activitywatch/android/OnboardingActivity.kt b/mobile/src/main/java/net/activitywatch/android/OnboardingActivity.kt
index 76d05bf0..915beec7 100644
--- a/mobile/src/main/java/net/activitywatch/android/OnboardingActivity.kt
+++ b/mobile/src/main/java/net/activitywatch/android/OnboardingActivity.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
@@ -86,14 +87,16 @@ class OnboardingActivity : AppCompatActivity() {
                 updateButtons()
             }
         })
-    }
 
-    override fun onBackPressed() {
-        // If back button is pressed, exit the app,
-        // since we don't want to allow the user to accidentally skip onboarding.
-        // (Google Play policy, due to sensitive permissions)
-        // https://developer.android.com/distribute/best-practices/develop/restrictions-non-sdk-interfaces#back-button
-        finishAffinity()
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                // If back button is pressed, exit the app,
+                // since we don't want to allow the user to accidentally skip onboarding.
+                // (Google Play policy, due to sensitive permissions)
+                // https://developer.android.com/distribute/best-practices/develop/restrictions-non-sdk-interfaces#back-button
+                finishAffinity()
+            }
+        })
     }
 }
 
diff --git a/mobile/src/main/java/net/activitywatch/android/watcher/ChromeWatcher.kt b/mobile/src/main/java/net/activitywatch/android/watcher/ChromeWatcher.kt
deleted file mode 100644
index 80528ad2..00000000
--- a/mobile/src/main/java/net/activitywatch/android/watcher/ChromeWatcher.kt
+++ /dev/null
@@ -1,136 +0,0 @@
-package net.activitywatch.android.watcher
-
-import android.accessibilityservice.AccessibilityService
-import android.app.AlarmManager
-import android.app.AppOpsManager
-import android.app.PendingIntent
-import android.app.usage.UsageEvents
-import android.app.usage.UsageStatsManager
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import android.os.*
-import android.provider.Settings
-import android.util.Log
-import android.view.accessibility.AccessibilityEvent
-import android.view.accessibility.AccessibilityNodeInfo
-import android.widget.Toast
-import android.annotation.TargetApi
-import androidx.annotation.RequiresApi
-import net.activitywatch.android.R
-import net.activitywatch.android.RustInterface
-import net.activitywatch.android.models.Event
-import org.json.JSONObject
-import org.threeten.bp.DateTimeUtils
-import org.threeten.bp.Duration
-import org.threeten.bp.Instant
-import java.net.URL
-import java.text.ParseException
-import java.text.SimpleDateFormat
-
-class ChromeWatcher : AccessibilityService() {
-
-    private val TAG = "ChromeWatcher"
-    private val bucket_id = "aw-watcher-android-web-chrome"
-
-    private var ri : RustInterface? = null
-
-    var lastUrlTimestamp : Instant? = null
-    var lastUrl : String? = null
-    var lastTitle : String? = null
-
-    override fun onCreate() {
-        ri = RustInterface(applicationContext)
-        ri?.createBucketHelper(bucket_id, "web.tab.current")
-    }
-
-    override fun onAccessibilityEvent(event: AccessibilityEvent) {
-
-        // TODO: This method is called very often, which might affect performance. Future optimizations needed.
-
-        // Only track Chrome and System events
-        if (event.packageName != "com.android.chrome" && event.packageName != "com.android.systemui") {
-            onUrl(null)
-            return
-        }
-
-        try {
-            if (event.source != null) {
-                // Get URL
-                val urlBars = event.source!!.findAccessibilityNodeInfosByViewId("com.android.chrome:id/url_bar")
-                if (urlBars.any()) {
-                    val newUrl = "http://" + urlBars[0].text.toString() // TODO: We can't access the URI scheme, so we assume HTTP.
-                    onUrl(newUrl)
-                }
-
-                // Get title
-                val webView = findWebView(event.source!!)
-                if (webView != null) {
-                    val title = webView.text.toString()
-                    if (title != lastTitle) {
-                        lastTitle = title
-                        Log.i(TAG, "Title: ${lastTitle}")
-                    }
-                }
-            }
-        }
-        catch(ex : Exception) {
-            Log.e(TAG, ex.message!!)
-        }
-    }
-
-    fun findWebView(info : AccessibilityNodeInfo) : AccessibilityNodeInfo? {
-        if(info.className == "android.webkit.WebView" && info.text != null)
-            return info
-
-        for (i in 0 until info.childCount) {
-            val child = info.getChild(i)
-            val webView = findWebView(child)
-            if (webView != null) {
-                return webView
-            }
-            child?.recycle()
-        }
-
-        return null
-    }
-
-    fun onUrl(newUrl : String?) {
-        if (newUrl != lastUrl) { // URL changed
-            if (newUrl != null) {
-                Log.i(TAG, "Url: $newUrl")
-            }
-            if (lastUrl != null) {
-                // Log last URL and title as a completed browser event.
-                // We wait for the event to complete (marked by a change in URL) to ensure that
-                // we had a chance to receive the title of the page, which often only arrives after
-                // the page loads completely and/or the user interacts with the page.
-                logBrowserEvent(lastUrl!!, lastTitle ?: "", lastUrlTimestamp!!)
-            }
-
-            lastUrlTimestamp = Instant.ofEpochMilli(System.currentTimeMillis())
-            lastUrl = newUrl
-            lastTitle = null
-        }
-    }
-
-    fun logBrowserEvent(url: String, title: String, lastUrlTimestamp : Instant) {
-        val now = Instant.ofEpochMilli(System.currentTimeMillis())
-        val start = lastUrlTimestamp
-        val end = now
-        val duration = Duration.between(start, end)
-
-        val data = JSONObject()
-        data.put("url", url)
-        data.put("title", title)
-        data.put("audible", false) // TODO
-        data.put("incognito", false) // TODO
-
-        ri?.heartbeatHelper(bucket_id, start, duration.seconds.toDouble(), data, 1.0)
-    }
-
-    override fun onInterrupt() {
-        TODO("not implemented")
-    }
-}
diff --git a/mobile/src/main/java/net/activitywatch/android/watcher/WebWatcher.kt b/mobile/src/main/java/net/activitywatch/android/watcher/WebWatcher.kt
new file mode 100644
index 00000000..1950b8ff
--- /dev/null
+++ b/mobile/src/main/java/net/activitywatch/android/watcher/WebWatcher.kt
@@ -0,0 +1,164 @@
+package net.activitywatch.android.watcher
+
+import android.accessibilityservice.AccessibilityService
+import android.util.Log
+import android.view.accessibility.AccessibilityEvent
+import android.view.accessibility.AccessibilityNodeInfo
+import androidx.core.util.Function
+import net.activitywatch.android.RustInterface
+import org.json.JSONObject
+import org.threeten.bp.Duration
+import org.threeten.bp.Instant
+
+private typealias UrlExtractor = (AccessibilityEvent) -> String?
+
+private fun extractTextByViewId(
+    event: AccessibilityEvent,
+    viewId: String,
+    transformer: Function<String, String>? = null
+) = event.source
+    ?.findAccessibilityNodeInfosByViewId(viewId)
+    ?.firstOrNull()?.text?.toString()
+    ?.let { originalValue -> transformer?.apply(originalValue) ?: originalValue }
+
+class WebWatcher : AccessibilityService() {
+
+    private val stripProtocol: (String) -> String = { url ->
+        url.removePrefix("http://").removePrefix("https://")
+    }
+
+    private val TAG = "WebWatcher"
+    private val bucket_id = "aw-watcher-android-web"
+
+    private var ri : RustInterface? = null
+
+    private var lastUrlTimestamp : Instant? = null
+    private var lastUrl : String? = null
+    private var lastBrowser: String? = null
+    private var lastWindowTitle : String? = null
+    private var lastWindowId: Int? = null
+
+    private val urlExtractors : Map<String, UrlExtractor> = mapOf(
+        "com.android.chrome" to { event ->
+            extractTextByViewId(event, "com.android.chrome:id/url_bar")
+        },
+        "org.mozilla.firefox" to { event ->
+            // Firefox has multiple variants depending on version
+            extractTextByViewId(event, "org.mozilla.firefox:id/url_bar_title")
+                ?: extractTextByViewId(event, "org.mozilla.firefox:id/mozac_browser_toolbar_url_view")
+        },
+        "com.sec.android.app.sbrowser" to { event ->
+            extractTextByViewId(event, "com.sec.android.app.sbrowser:id/location_bar_edit_text")
+                ?: extractTextByViewId(event, "com.sec.android.app.sbrowser:id/custom_tab_toolbar_url_bar_text", transformer = stripProtocol)
+        },
+        "com.opera.browser" to { event ->
+            extractTextByViewId(event, "com.opera.browser:id/url_field")
+                ?: extractTextByViewId(event, "com.opera.browser:id/address_field")
+        },
+        "com.microsoft.emmx" to { event ->
+            extractTextByViewId(event, "com.microsoft.emmx:id/url_bar")
+        }
+    )
+
+    override fun onCreate() {
+        Log.i(TAG, "Creating WebWatcher")
+        ri = RustInterface(applicationContext).also { it.createBucketHelper(bucket_id, "web.tab.current") }
+    }
+
+    // TODO: This method is called very often, which might affect performance. Future optimizations needed.
+    override fun onAccessibilityEvent(event: AccessibilityEvent) {
+        if (shouldIgnoreEvent(event)) {
+            return
+        }
+
+        val packageName = event.packageName?.toString()
+        val urlExtractor = urlExtractors[packageName]
+
+        val windowChanged = windowChanged(event.windowId)
+        lastWindowId = event.windowId
+
+        if (urlExtractor == null) {
+            // for some browsers like Firefox event.packageName can be null (no extractor matched)
+            // but we are still on the same window
+            if (windowChanged) {
+                handleUrl(null, newBrowser = null)
+            }
+
+            return
+        }
+
+        try {
+            event.source?.let { source ->
+                val newUrl = urlExtractor(event)
+
+                newUrl?.let { handleUrl(it, newBrowser = packageName) }.also {
+                    findWebView(source)
+                        ?.let { handleWindowTitle(it.text.toString()) }
+                }
+            }
+        } catch(ex : Exception) {
+            Log.e(TAG, ex.message!!)
+        }
+    }
+
+    private fun windowChanged(windowId: Int): Boolean = windowId != lastWindowId
+
+    private fun shouldIgnoreEvent(event: AccessibilityEvent) =
+        event.packageName == "com.android.systemui"
+
+    private fun findWebView(info : AccessibilityNodeInfo) : AccessibilityNodeInfo? {
+        if (info.className == "android.webkit.WebView" && info.text != null) return info
+
+        return (0 until info.childCount)
+            .mapNotNull { info.getChild(it) }
+            .firstNotNullOfOrNull { child ->
+                findWebView(child).also { child.recycle() }
+            }
+    }
+
+    private fun handleUrl(newUrl : String?, newBrowser: String?) {
+        if (newUrl != lastUrl || newBrowser != lastBrowser) {
+            newUrl?.let { Log.i(TAG, "Url: $it, browser: $newBrowser") }
+            lastUrl?.let { url ->
+                lastBrowser?.let { browser ->
+                    // Log last URL and title as a completed browser event.
+                    // We wait for the event to complete (marked by a change in URL) to ensure that
+                    // we had a chance to receive the title of the page, which often only arrives after
+                    // the page loads completely and/or the user interacts with the page.
+                    val windowTitle = lastWindowTitle ?: ""
+                    logBrowserEvent(url, browser, windowTitle, lastUrlTimestamp!!)
+                }
+            }
+
+            lastUrlTimestamp = Instant.ofEpochMilli(System.currentTimeMillis())
+            lastUrl = newUrl
+            lastBrowser = newBrowser
+            lastWindowTitle = null
+        }
+    }
+
+    private fun handleWindowTitle(newWindowTitle: String) {
+        if (newWindowTitle != lastWindowTitle) {
+            lastWindowTitle = newWindowTitle
+            Log.i(TAG, "Title: $lastWindowTitle")
+        }
+    }
+
+    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()
+            .put("url", url)
+            .put("browser", browser)
+            .put("title", windowTitle)
+            .put("audible", false) // TODO
+            .put("incognito", false) // TODO
+
+        Log.i(TAG, "Registered event: $data")
+        ri?.heartbeatHelper(bucket_id, start, duration.seconds.toDouble(), data, 1.0)
+    }
+
+    override fun onInterrupt() {}
+}