mobile/build.gradle

@@ -11,12 +11,10 @@ android {
         targetSdkVersion 34
 
         // Set in CI on tagged commit
-        // FIXME: should be set before tagging, so that F-droid picks it up correctly
-        //        https://gitlab.com/fdroid/fdroiddata/-/merge_requests/11786?commit_id=d2cedcbe3d26db59378d582a8cf952af16b6407f#note_1966750559
-        versionName "0.12.1"
+        versionName "0.12.0"
 
         // Set in CI by `bundle exec fastlane update_version`
-        versionCode 34
+        versionCode 26
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         // NOTE: This only works for API level 28 and above

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

@@ -53,15 +53,6 @@ class RustInterface constructor(context: Context? = null) {
 
     fun startServerTask(context: Context) {
         if(!serverStarted) {
-            // check if port 5600 is already in use
-            try {
-                val socket = java.net.ServerSocket(5600)
-                socket.close()
-            } catch(e: java.net.BindException) {
-                Log.e(TAG, "Port 5600 is already in use, server probably already started")
-                return
-            }
-
             serverStarted = true
             val executor = Executors.newSingleThreadExecutor()
             val handler = Handler(Looper.getMainLooper())
@@ -74,8 +65,6 @@ class RustInterface constructor(context: Context? = null) {
 
                 handler.post {
                     // will run on UI thread after the task is done
-                    Log.i(TAG, "Server finished")
-                    serverStarted = false
                 }
             }
             Log.w(TAG, "Server started")

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

@@ -56,7 +56,7 @@ class ChromeWatcher : AccessibilityService() {
         }
 
         try {
-            if (event.source != null) {
+            if (event != null && event.source != null) {
                 // Get URL
                 val urlBars = event.source!!.findAccessibilityNodeInfosByViewId("com.android.chrome:id/url_bar")
                 if (urlBars.any()) {
@@ -65,13 +65,10 @@ class ChromeWatcher : AccessibilityService() {
                 }
 
                 // Get title
-                val webView = findWebView(event.source!!)
+                var webView = findWebView(event.source!!)
                 if (webView != null) {
-                    val title = webView.text.toString()
-                    if (title != lastTitle) {
-                        lastTitle = title
-                        Log.i(TAG, "Title: ${lastTitle}")
-                    }
+                    lastTitle = webView.text.toString()
+                    Log.i(TAG, "Title: ${lastTitle}")
                 }
             }
         }
@@ -81,6 +78,9 @@ class ChromeWatcher : AccessibilityService() {
     }
 
     fun findWebView(info : AccessibilityNodeInfo) : AccessibilityNodeInfo? {
+        if(info == null)
+            return null
+
         if(info.className == "android.webkit.WebView" && info.text != null)
             return info
 
@@ -90,17 +90,17 @@ class ChromeWatcher : AccessibilityService() {
             if (webView != null) {
                 return webView
             }
-            child?.recycle()
+            if(child != null){
+                child.recycle()
+            }
         }
 
         return null
     }
 
     fun onUrl(newUrl : String?) {
+        Log.i(TAG, "Url: ${newUrl}")
         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