From 5ea6d1b2d584b2e7514dac2f254ffe2863af3b93 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 18 Oct 2023 13:43:52 -0700
Subject: [PATCH] Allow Privacy Cell to be included in system backups. 
 https://redmine.stoutner.com/issues/1001

---
 app/src/main/AndroidManifest.xml                 |  7 ++-----
 app/src/main/assets/es/permissions.html          | 16 ++++++++--------
 .../services/RealtimeMonitoringService.kt        |  8 ++++----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d495aff..7a0c5ca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,17 +44,14 @@
     <!-- Support Chromebooks that don't have a touch screen. -->
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 
-    <!-- App data is automatically backed up to Google cloud servers unless `android:allowBackup="false"` and `android:fullBackupContent="false"` is set.
-        `tools:ignore="DataExtractionRules` removes the warning that backups can still transfer data device to device. -->
+    <!-- `tools:ignore="UnusedAttribute` removes the warning that `android:localeConfig` only applies to API >= 33. -->
     <application
         android:label="@string/privacy_cell"
         android:icon="@mipmap/privacy_cell"
-        android:allowBackup="false"
-        android:fullBackupContent="false"
         android:supportsRtl="true"
         android:theme="@style/Theme.PrivacyCell"
         android:localeConfig="@xml/locales_config"
-        tools:ignore="DataExtractionRules,UnusedAttribute" >
+        tools:ignore="UnusedAttribute" >
 
         <!-- Privacy Cell Activity.  The label uses the short name so that it isn't truncated under the icon in the launcher on most phones.
             `android:launchMode="singleTask"` makes the app launch in a new task instead of inside the task of the program that sends it an intent.
diff --git a/app/src/main/assets/es/permissions.html b/app/src/main/assets/es/permissions.html
index df91bef..eabd8e0 100644
--- a/app/src/main/assets/es/permissions.html
+++ b/app/src/main/assets/es/permissions.html
@@ -35,21 +35,21 @@
         <p><a href="https://developer.android.com/reference/android/Manifest.permission.html#READ_PHONE_STATE">android.permission.<wbr>READ_<wbr>PHONE_<wbr>STATE</a></p>
         <p>Requerido para determinar qué protocolos se están usando por la red del teléfono celular.</p>
 
-        <h3>Show Notifications</h3>
+        <h3>Mostrar notificaciones</h3>
         <p><a href="https://developer.android.com/reference/android/Manifest.permission.html#POST_NOTIFICATIONS">android.permission.<wbr>POST_<wbr>NOTIFICATIONS</a></p>
-        <p>Allows Privacy Cell to display a realtime monitoring notification icon in the status bar.</p>
+        <p>Permite a Privacy Cell mostrar un icono de notificación de supervisión en tiempo real en la barrra de estado.</p>
 
-        <h3>Run foreground service</h3>
+        <h3>Ejecutar servicio en primer plano</h3>
         <p><a href="https://developer.android.com/reference/android/Manifest.permission#FOREGROUND_SERVICE">android.permission.<wbr>FOREGROUND_<wbr>SERVICE</a></p>
-        <p>Allows Privacy Cell to update the realtime monitoring notification icon when the app is not in the foreground.</p>
+        <p>Permite a Privacy Cell actualizar el icono de notificación de supervisión cuando la aplicación no está en primer plano.</p>
 
         <p><a href="https://developer.android.com/reference/android/Manifest.permission#FOREGROUND_SERVICE_SPECIAL_USE">android.permission.<wbr>FOREGROUND_<wbr>SERVICE_<wbr>SPECIAL_<wbr>USE</a></p>
-        <p>Specifies the type of foreground service.
-            Special Use is for services that don't fit into any of the <a href="https://developer.android.com/about/versions/14/changes/fgs-types-required">standard categories</a>.</p>
+        <p>Especifica el tipo de servicio en primer plano.
+            El uso especial es para servicios que no encajan en ninguna de las <a href="https://developer.android.com/about/versions/14/changes/fgs-types-required">categorías estándar</a>.</p>
 
-        <h3>Run at startup</h3>
+        <h3>Ejecutar al inicio</h3>
         <p><a href="https://developer.android.com/reference/android/Manifest.permission#RECEIVE_BOOT_COMPLETED">android.permission.<wbr>RECEIVE_<wbr>BOOT_<wbr>COMPLETED</a></p>
-        <p>Allows Privacy Cell to enable the realtime monitoring service when the phone boots.</p>
+        <p>Permite a Privacy Cell activar el servicio de monitorización en tiempo real al arrancar el teléfono.</p>
 
         <h3><a href="https://developer.android.com/about/versions/13/features#runtime-receivers">com.stoutner.privacycell.<wbr>DYNAMIC_<wbr>RECEIVER_<wbr>NOT_<wbr>EXPORTED_<wbr>PERMISSION</a></h3>
         <p>Se añade automáticamente a todas las aplicaciones con API >= 33 (Android 13) para impedir que otras aplicaciones se conecten a receptores dinámicos sin permiso explícito.</p>
diff --git a/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt b/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt
index 19e1a3e..9c1b052 100644
--- a/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt
+++ b/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt
@@ -148,7 +148,7 @@ class RealtimeMonitoringService : Service() {
             // Set the color.
             notificationBuilder.setColor(getColor(R.color.red_notification_icon))
 
-            // Prevent swiping to dismiss the notification.
+            // Prevent swiping to dismiss the notification.  This no longer works (except on the lock screen) in API >= 34.
             notificationBuilder.setOngoing(true)
 
             // Start the foreground notification.
@@ -254,7 +254,7 @@ class RealtimeMonitoringService : Service() {
                 // Set the color.
                 antiquatedNetworkNotificationBuilder.setColor(getColor(R.color.red_notification_icon))
 
-                // Prevent swiping to dismiss the notification.
+                // Prevent swiping to dismiss the notification.  This no longer works (except on the lock screen) in API >= 34.
                 antiquatedNetworkNotificationBuilder.setOngoing(true)
 
                 // Update the notification.
@@ -281,7 +281,7 @@ class RealtimeMonitoringService : Service() {
                 // Set the color.
                 insecureNetworkNotificationBuilder.setColor(getColor(R.color.yellow_notification_icon))
 
-                // Prevent swiping to dismiss the notification.
+                // Prevent swiping to dismiss the notification.  This no longer works (except on the lock screen) in API >= 34.
                 insecureNetworkNotificationBuilder.setOngoing(true)
 
                 // Update the notification.
@@ -308,7 +308,7 @@ class RealtimeMonitoringService : Service() {
                 // Set the color.
                 secureNetworkNotificationBuilder.setColor(getColor(R.color.blue_icon))
 
-                // Prevent swiping to dismiss the notification.
+                // Prevent swiping to dismiss the notification.  This no longer works (except on the lock screen) in API >= 34.
                 secureNetworkNotificationBuilder.setOngoing(true)
 
                 // Update the notification.
-- 
2.43.0