From 7c0880ab6deedaa8f49049754ba885858dece124 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 17 Feb 2022 17:35:30 +0100
Subject: [PATCH] add EXTRA_SERVICE_PACKAGE_NAME to all broadcasts
#71 missed the errors, and this moves setting to the getBroadcastIntent()
method.
---
.../src/main/java/org/torproject/jni/TorService.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 582f6bb0..8f777180 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
@@ -453,8 +453,7 @@ public class TorService extends Service {
* Broadcasts the current status to any apps following the status of TorService.
*/
static void sendBroadcastStatusIntent(Context context) {
- Intent intent = getBroadcastIntent(ACTION_STATUS, currentStatus);
- intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
+ Intent intent = getBroadcastIntent(context, ACTION_STATUS, currentStatus);
context.sendBroadcast(intent);
}
@@ -464,8 +463,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_SERVICE_PACKAGE_NAME, context.getPackageName());
+ Intent intent = getBroadcastIntent(context, ACTION_STATUS, currentStatus);
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
context.sendBroadcast(intent);
}
@@ -479,12 +477,14 @@ public class TorService extends Service {
if (e != null) {
intent.putExtra(Intent.EXTRA_TEXT, e.getLocalizedMessage());
}
+ intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
context.sendBroadcast(intent);
}
- private static Intent getBroadcastIntent(String action, String currentStatus) {
+ private static Intent getBroadcastIntent(Context context, String action, String currentStatus) {
Intent intent = new Intent(action);
+ intent.putExtra(EXTRA_SERVICE_PACKAGE_NAME, context.getPackageName());
intent.putExtra(EXTRA_STATUS, currentStatus);
return intent;
}
--
GitLab