From a86ea520060d7cf3f55c0daeb6a14b8566ca49bc Mon Sep 17 00:00:00 2001
From: ajp_anton <ajp_anton@git.ajpanton.se>
Date: Mon, 27 Jul 2026 22:54:06 +0000
Subject: [PATCH] Resolve concrete lint and backup configuration issues

---
 app/build.gradle.kts                                   |  2 +-
 app/src/main/AndroidManifest.xml                       | 10 ++++++++--
 .../se/ajpanton/notificationlog/ViewLogsFragment.kt    |  2 +-
 .../notificationlog/model/NotificationLogEntry.kt      |  1 -
 .../ajpanton/notificationlog/settings/AppLockStore.kt  |  3 ++-
 app/src/main/res/drawable/log_pill_background.xml      |  8 --------
 app/src/main/res/layout/fragment_settings.xml          |  3 ++-
 app/src/main/res/xml/backup_rules.xml                  |  4 ++++
 app/src/main/res/xml/data_extraction_rules.xml         |  9 +++++++++
 gradle/libs.versions.toml                              |  2 ++
 10 files changed, 29 insertions(+), 15 deletions(-)
 delete mode 100644 app/src/main/res/drawable/log_pill_background.xml
 create mode 100644 app/src/main/res/xml/backup_rules.xml
 create mode 100644 app/src/main/res/xml/data_extraction_rules.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 82f389c..8116950 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -89,7 +89,7 @@ dependencies {
     implementation(libs.material)
     implementation(libs.drawerlayout)
     implementation(libs.recyclerview)
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+    implementation(libs.swiperefreshlayout)
 
     testImplementation(libs.junit)
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2f48287..94258ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
 
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <!-- Required for the all-installed-apps filter; this app is not distributed through Google Play. -->
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
 
     <application
         android:name=".NotificationLogApplication"
         android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
diff --git a/app/src/main/java/se/ajpanton/notificationlog/ViewLogsFragment.kt b/app/src/main/java/se/ajpanton/notificationlog/ViewLogsFragment.kt
index a4c19f5..b3b0b74 100644
--- a/app/src/main/java/se/ajpanton/notificationlog/ViewLogsFragment.kt
+++ b/app/src/main/java/se/ajpanton/notificationlog/ViewLogsFragment.kt
@@ -185,7 +185,7 @@ class ViewLogsFragment : Fragment(R.layout.fragment_view_logs) {
                 maxLines = if (expanded) Int.MAX_VALUE else 1
                 ellipsize = if (expanded) null else TextUtils.TruncateAt.END
                 if (expanded) {
-                    breakStrategy = android.text.Layout.BREAK_STRATEGY_HIGH_QUALITY
+                    breakStrategy = android.graphics.text.LineBreaker.BREAK_STRATEGY_HIGH_QUALITY
                     hyphenationFrequency = android.text.Layout.HYPHENATION_FREQUENCY_NONE
                 }
                 textSize = value.textSize
diff --git a/app/src/main/java/se/ajpanton/notificationlog/model/NotificationLogEntry.kt b/app/src/main/java/se/ajpanton/notificationlog/model/NotificationLogEntry.kt
index 8951b8f..c79e30f 100644
--- a/app/src/main/java/se/ajpanton/notificationlog/model/NotificationLogEntry.kt
+++ b/app/src/main/java/se/ajpanton/notificationlog/model/NotificationLogEntry.kt
@@ -41,7 +41,6 @@ enum class NotificationAction {
     GROUP_SUMMARY_CANCELLED,
     GROUP_OPTIMIZED,
     UNAUTOBUNDLED,
-    BUNDLE_DISMISSED,
     CLEAR_DATA,
     ASSISTANT_CANCELLED,
     LOCKDOWN,
diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/AppLockStore.kt b/app/src/main/java/se/ajpanton/notificationlog/settings/AppLockStore.kt
index 39dd867..732f25f 100644
--- a/app/src/main/java/se/ajpanton/notificationlog/settings/AppLockStore.kt
+++ b/app/src/main/java/se/ajpanton/notificationlog/settings/AppLockStore.kt
@@ -1,10 +1,11 @@
 package se.ajpanton.notificationlog.settings
 
 import android.content.Context
+import androidx.core.content.edit
 
 class AppLockStore(context: Context) {
     private val prefs = context.getSharedPreferences("app-lock", Context.MODE_PRIVATE)
     var enabled: Boolean
         get() = prefs.getBoolean("enabled", false)
-        set(value) = prefs.edit().putBoolean("enabled", value).apply()
+        set(value) = prefs.edit { putBoolean("enabled", value) }
 }
diff --git a/app/src/main/res/drawable/log_pill_background.xml b/app/src/main/res/drawable/log_pill_background.xml
deleted file mode 100644
index 8e8b1fe..0000000
--- a/app/src/main/res/drawable/log_pill_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="?attr/colorSurfaceVariant" />
-    <stroke
-        android:width="1dp"
-        android:color="?attr/colorOutline" />
-    <corners android:radius="18dp" />
-</shape>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 9364c62..4840378 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:importantForAutofill="noExcludeDescendants">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 0000000..24bad93
--- /dev/null
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <exclude domain="root" path="." />
+</full-backup-content>
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 0000000..3c332df
--- /dev/null
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup disableIfNoEncryptionCapabilities="true">
+        <exclude domain="root" path="." />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" path="." />
+    </device-transfer>
+</data-extraction-rules>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a2c491c..108083e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@ fragmentKtx = "1.8.5"
 material = "1.10.0"
 drawerLayout = "1.2.0"
 recyclerView = "1.3.2"
+swipeRefreshLayout = "1.1.0"
 junit = "4.13.2"
 
 [libraries]
@@ -16,6 +17,7 @@ fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 drawerlayout = { group = "androidx.drawerlayout", name = "drawerlayout", version.ref = "drawerLayout" }
 recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerView" }
+swiperefreshlayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "swipeRefreshLayout" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 
 [plugins]