Address remaining PR review feedback

- Make KolibriEnvironmentSetup.initialized volatile for cross-thread visibility
- Use LC_CTYPE instead of LC_ALL to avoid overriding user locale for
  non-encoding operations
- Remove commented-out server service code from App.onCreate()
- Use context.getApplicationContext() in WorkController constructor to
  prevent potential Activity context leaks
- Redact auth token from log output in AppPlugin.SERVING
- Use explicit "kolibri:job:" tag prefix for WorkManager tasks instead
  of fragile negative pattern matching against class name prefixes
- Pin fkirc/skip-duplicate-actions to v5.3.1 instead of mutable @master

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: rtibbles

.github/workflows/build_and_test.yml

@@ -16,7 +16,7 @@ jobs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/skip-duplicate-actions@master
+        uses: fkirc/skip-duplicate-actions@v5.3.1
         with:
           github_token: ${{ github.token }}
           paths_ignore: '["**.po", "**.json"]'

.github/workflows/pre-commit.yml

@@ -17,7 +17,7 @@ jobs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/skip-duplicate-actions@master
+        uses: fkirc/skip-duplicate-actions@v5.3.1
         with:
           github_token: ${{ github.token }}
           paths_ignore: '["**.po", "**.json"]'

app/src/main/java/org/learningequality/Kolibri/App.java

@@ -30,10 +30,6 @@ public void onCreate() {
     // Initialize Kolibri environment
     KolibriEnvironmentSetup.initializeEnv(this);
 
-    // Start Kolibri server service
-    // Intent serviceIntent = new Intent(this, KolibriServerService.class);
-    // startService(serviceIntent);
-
     createNotificationChannels();
     // Register activity lifecycle callbacks
     registerActivityLifecycleCallbacks(new KolibriActivityLifecycleCallbacks());

app/src/main/java/org/learningequality/Kolibri/KolibriEnvironmentSetup.java

@@ -13,7 +13,7 @@
 /** Sets up the Kolibri environment including environment variables and Python initialization */
 public class KolibriEnvironmentSetup {
   private static final String TAG = "KolibriEnvironmentSetup";
-  private static boolean initialized = false;
+  private static volatile boolean initialized = false;
 
   /** Initialize Kolibri environment Starts Python and sets up all required environment variables */
   public static synchronized void initializeEnv(Context context) {
@@ -81,7 +81,7 @@ private static void setPythonEnvironmentVariables(Context context) {
       environ.callAttr("__setitem__", "TZ", tz.getID());
 
       // Locale
-      environ.callAttr("__setitem__", "LC_ALL", "en_US.UTF-8");
+      environ.callAttr("__setitem__", "LC_CTYPE", "en_US.UTF-8");
 
       // Android language
       String language = context.getResources().getConfiguration().getLocales().get(0).getLanguage();

app/src/main/java/org/learningequality/Kolibri/WorkController.java

@@ -27,7 +27,7 @@ public class WorkController {
   private final AtomicBoolean isConnected = new AtomicBoolean(false);
 
   private WorkController(Context context) {
-    this.context = context;
+    this.context = context.getApplicationContext();
     this.connected = new CompletableFuture<>();
   }
 

app/src/main/java/org/learningequality/Kolibri/task/Task.java

@@ -55,7 +55,9 @@ public static String enqueueOnce(
 
       // Build work request with delay and priority
       OneTimeWorkRequest.Builder requestBuilder =
-          new OneTimeWorkRequest.Builder(workerClass).setInputData(inputData).addTag(id);
+          new OneTimeWorkRequest.Builder(workerClass)
+              .setInputData(inputData)
+              .addTag("kolibri:job:" + id);
 
       // Set initial delay if specified
       if (delay > 0) {
@@ -108,7 +110,7 @@ public static void clear(String id) {
     try {
       Context context = ContextUtil.getApplicationContext();
       RemoteWorkManager workManager = RemoteWorkManager.getInstance(context);
-      workManager.cancelAllWorkByTag(id);
+      workManager.cancelAllWorkByTag("kolibri:job:" + id);
       Log.d(TAG, "Cancelled task " + id);
     } catch (Exception e) {
       Log.e(TAG, "Failed to cancel task " + id, e);

app/src/main/python/main.py

@@ -54,7 +54,7 @@ def SERVING(self, port):
             port=port
         ) + interface.get_initialize_url(auth_token=auth_token)
 
-        logger.info(f"Kolibri server ready at: {init_url}")
+        logger.info("Kolibri server ready on port %s", port)
 
         # Signal Java that server is ready
         KolibriServerViewModel.getInstance().setServerReady(True, port, init_url)

app/src/main/python/task_reconciler.py

@@ -63,15 +63,15 @@ def _get_workmanager_job_ids():
     work_query = WorkQuery.fromStates(states)
     work_info_list = work_manager.getWorkInfos(work_query).get()
 
-    # Extract job IDs from tags
+    # Extract Kolibri job IDs from tags
+    # Tags include both worker class FQNs and our job ID tag set via Task.enqueueOnce
+    # We use an explicit prefix to identify our tags rather than excluding known patterns
     job_ids = set()
     for work_info in work_info_list.toArray():
         tags = work_info.getTags()
         for tag in tags.toArray():
-            # Filter out class names (worker class FQNs), keep job IDs
-            # Job IDs can be UUIDs, numbers, or strings like "streamed_cache_cleanup"
-            if not tag.startswith("org.") and not tag.startswith("androidx."):
-                job_ids.add(tag)
+            if tag.startswith("kolibri:job:"):
+                job_ids.add(tag[len("kolibri:job:") :])
 
     return job_ids