Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-01-23 02:36:05 +00:00
Code Issues Projects Releases Wiki Activity

refactor(tasks): remove isEnableUrl config, always enable URL parsing

Browse source
This commit is contained in:
Johannes Millan 2026-01-20 16:36:38 +01:00
parent 853bbcf268
commit 2844560ef8
8 changed files with 145 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/com/superproductivity/superproductivity/service/FocusModeForegroundService.kt
View file

@ -116,7 +116,11 @@ class FocusModeForegroundService : Service() {
}
ACTION_STOP -> {
stopFocusMode()
if (isRunning) {
stopFocusMode()
} else {
Log.d(TAG, "Ignoring STOP action - service not running")
}
}
else -> {

6
android/app/src/main/java/com/superproductivity/superproductivity/service/TrackingForegroundService.kt
View file

@ -86,7 +86,11 @@ class TrackingForegroundService : Service() {
}
ACTION_STOP -> {
stopTracking()
if (isTracking) {
stopTracking()
} else {
Log.d(TAG, "Ignoring STOP action - service not tracking")
}
}
else -> {

20
android/app/src/main/java/com/superproductivity/superproductivity/webview/JavaScriptInterface.kt
View file

@ -1,7 +1,9 @@
package com.superproductivity.superproductivity.webview
import android.app.Activity
import android.app.ForegroundServiceStartNotAllowedException
import android.content.Intent
import android.os.Build
import android.util.Log
import android.webkit.JavascriptInterface
import android.webkit.WebView
@ -26,7 +28,11 @@ class JavaScriptInterface(
try {
block()
} catch (e: Exception) {
Log.e(TAG, errorMsg, e)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && e is ForegroundServiceStartNotAllowedException) {
Log.e(TAG, "$errorMsg - ForegroundService restrictions violated (Android 12+). App may be in background.", e)
} else {
Log.e(TAG, errorMsg, e)
}
}
}
@ -103,10 +109,8 @@ class JavaScriptInterface(
@JavascriptInterface
fun stopTrackingService() {
safeCall("Failed to stop tracking service") {
val intent = Intent(activity, TrackingForegroundService::class.java).apply {
action = TrackingForegroundService.ACTION_STOP
}
activity.startService(intent)
val intent = Intent(activity, TrackingForegroundService::class.java)
activity.stopService(intent)
}
}
@ -163,10 +167,8 @@ class JavaScriptInterface(
@JavascriptInterface
fun stopFocusModeService() {
safeCall("Failed to stop focus mode service") {
val intent = Intent(activity, FocusModeForegroundService::class.java).apply {
action = FocusModeForegroundService.ACTION_STOP
}
activity.startService(intent)
val intent = Intent(activity, FocusModeForegroundService::class.java)
activity.stopService(intent)
}
}