Add source-filtering to Music app, to exclude "media sessions" from apps that aren't really media players

This commit is contained in:
James Babcock committed 2026-09-08 18:14:25 -07:00
1 parent 813668f850
commit 78c56ffc4e
7 files changed
+237 -3

No files matched your search

@@ -23,6 +23,8 @@ import org.json.JSONArray;
import org.json.JSONObject;
import java.util.List;
import java.util.HashSet;
import java.util.Set;
public class FaceclawMediaController {
private final Context appContext;
@@ -71,6 +73,7 @@ public class FaceclawMediaController {
private volatile FaceclawMediaControllerListener listener;
private MediaController activeController;
private boolean started;
private Set<String> ignoredPackages = new HashSet<>();
public FaceclawMediaController(Context context) {
this.appContext = context.getApplicationContext();
@@ -113,6 +116,23 @@ public class FaceclawMediaController {
}
}
/** Apply the complete preference set and immediately choose an allowed session. */
public void setIgnoredPackagesJson(String packagesJson) {
Set<String> packages = new HashSet<>();
try {
JSONArray array = new JSONArray(packagesJson);
for (int i = 0; i < array.length(); i++) packages.add(array.getString(i));
} catch (Exception e) {
Log.w("FaceclawMedia", "invalid ignored packages", e);
return;
}
synchronized (lock) {
if (ignoredPackages.equals(packages)) return;
ignoredPackages = packages;
refreshActiveControllerLocked(null);
}
}
public void stop() {
synchronized (lock) {
if (!started) {
@@ -289,6 +309,7 @@ public class FaceclawMediaController {
controllers = null;
}
}
emitSessionAppsLocked(controllers);
setActiveControllerLocked(chooseController(controllers));
emitStateLocked();
}
@@ -297,8 +318,10 @@ public class FaceclawMediaController {
if (controllers == null || controllers.isEmpty()) {
return null;
}
MediaController first = controllers.get(0);
MediaController first = null;
for (MediaController controller : controllers) {
if (ignoredPackages.contains(controller.getPackageName())) continue;
if (first == null) first = controller;
PlaybackState playbackState = controller.getPlaybackState();
if (playbackState != null && playbackState.getState() == PlaybackState.STATE_PLAYING) {
return controller;
@@ -307,6 +330,27 @@ public class FaceclawMediaController {
return first;
}
private void emitSessionAppsLocked(List<MediaController> controllers) {
FaceclawMediaControllerListener currentListener = listener;
if (currentListener == null || controllers == null) return;
JSONArray apps = new JSONArray();
Set<String> seen = new HashSet<>();
for (MediaController controller : controllers) {
String packageName = safe(controller.getPackageName());
if (packageName.isEmpty() || !seen.add(packageName)) continue;
try {
JSONObject app = new JSONObject();
app.put("packageName", packageName);
app.put("appName", getApplicationLabel(packageName));
apps.put(app);
} catch (Exception e) {
Log.w("FaceclawMedia", "session app serialization failed", e);
}
}
String json = apps.toString();
mainHandler.post(() -> currentListener.onSessionAppsChanged(json));
}
private void setActiveControllerLocked(MediaController controller) {
if (sameController(activeController, controller)) {
return;
@@ -1,6 +1,9 @@
package com.faceclaw.app;
public interface FaceclawMediaControllerListener {
/** All observed session owners, before filtering or choosing the active player. */
void onSessionAppsChanged(String appsJson);
void onStateChange(
String playbackState,
String packageName,