From b1b7eef80c94c30736ce3602f4ff3f2e78ff3fa3 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 11 Feb 2022 14:44:58 +0000
Subject: [PATCH] Add a new key rather that reusing the EXTRA_PACKAGE_NAME key.
---
.../src/main/java/org/torproject/jni/TorService.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/tor-android-binary/src/main/java/org/torproject/jni/TorService.java b/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
index e95bbb5d..582f6bb0 100644
--- a/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
+++ b/tor-android-binary/src/main/java/org/torproject/jni/TorService.java
@@ -83,6 +83,13 @@ public class TorService extends Service {
*/
public final static String EXTRA_PACKAGE_NAME = "org.torproject.android.intent.extra.PACKAGE_NAME";
+ /**
+ * The {@link String} {@code packageName} of the app to which this {@code TorService} belongs.
+ * This allows broadcast receivers to distinguish between broadcasts from different apps that
+ * use {@code TorService}.
+ */
+ public final static String EXTRA_SERVICE_PACKAGE_NAME = "org.torproject.android.intent.extra.SERVICE_PACKAGE_NAME";
+
/**
* All tor-related services and daemons are stopped
*/
@@ -447,6 +454,7 @@ public class TorService extends Service {
*/
static void sendBroadcastStatusIntent(Context context) {
Intent intent = getBroadcastIntent(ACTION_STATUS, currentStatus);
+ intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
context.sendBroadcast(intent);
}
@@ -457,7 +465,7 @@ public class TorService extends Service {
static void broadcastStatus(Context context, String currentStatus) {
TorService.currentStatus = currentStatus;
Intent intent = getBroadcastIntent(ACTION_STATUS, currentStatus);
- intent.putExtra(EXTRA_PACKAGE_NAME, context.getPackageName());
+ intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
context.sendBroadcast(intent);
}
--
GitLab