From 94e2c8dbedd7b1af0703b44998f77579a9fd9b9f Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Wed, 6 May 2026 10:36:47 +0200
Subject: [PATCH] feat: simplify location streaming wording

---
 .../securesms/geolocation/LocationStreamingService.java     | 6 +++---
 src/main/res/values/strings.xml                             | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/geolocation/LocationStreamingService.java b/src/main/java/org/thoughtcrime/securesms/geolocation/LocationStreamingService.java
index e805e7ce2..961b24958 100644
--- a/src/main/java/org/thoughtcrime/securesms/geolocation/LocationStreamingService.java
+++ b/src/main/java/org/thoughtcrime/securesms/geolocation/LocationStreamingService.java
@@ -188,9 +188,9 @@ public class LocationStreamingService extends Service {
       NotificationChannel channel =
           new NotificationChannel(
               CHANNEL_ID,
-              getString(R.string.location_streaming_notification_title),
+              getString(R.string.pref_on_demand_location_streaming),
               NotificationManager.IMPORTANCE_LOW);
-      channel.setDescription(getString(R.string.location_streaming_channel_desc));
+      channel.setDescription("Channel for Location Streaming");
       channel.setShowBadge(false);
       NotificationManager nm = getSystemService(NotificationManager.class);
       if (nm != null) nm.createNotificationChannel(channel);
@@ -209,7 +209,7 @@ public class LocationStreamingService extends Service {
         PendingIntent.getService(this, 1, stopIntent, PendingIntent.FLAG_IMMUTABLE);
 
     return new NotificationCompat.Builder(this, CHANNEL_ID)
-        .setContentTitle(getString(R.string.location_streaming_notification_title))
+        .setContentTitle(getString(R.string.pref_on_demand_location_streaming))
         .setContentText(getString(R.string.location_streaming_notification_text))
         .setSmallIcon(R.drawable.ic_location_on_white_24dp)
         .setOngoing(true)
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 53ca03c0c..08a9b9746 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -837,7 +837,7 @@
     <string name="pref_show_emails_all">All</string>
     <string name="pref_experimental_features">Experimental Features</string>
     <string name="pref_experimental_features_explain">These features may be unstable and may be changed or removed</string>
-    <string name="pref_on_demand_location_streaming">On-demand Location Streaming</string>
+    <string name="pref_on_demand_location_streaming">Location Streaming</string>
     <string name="pref_background_default">Default image</string>
     <string name="pref_background_default_color">Default color</string>
     <string name="pref_background_custom_image">Custom image</string>
@@ -1079,8 +1079,6 @@
     <string name="n_messages_in_m_chats">%1$d messages in %2$d chats</string>
 
     <!-- location streaming -->
-    <string name="location_streaming_channel_desc">Channel for On-demand Location Streaming</string>
-    <string name="location_streaming_notification_title">Location Streaming</string>
     <string name="location_streaming_notification_text">You are sharing your location</string>
     <string name="location_rationale">To share your live location with chat members, allow Delta Chat to use your location data.\n\nTo make live location work gaplessly, location data is used even when the app is closed or not in use.</string>