From a4a66a1922a6918ce0c1baa801ab0bcdaf10a9c4 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Mon, 25 Apr 2022 10:18:26 -0400
Subject: [PATCH] Remove permission, add tiny comments

---
 app/src/main/AndroidManifest.xml                      | 1 -
 app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt | 2 ++
 app/src/main/res/values/strings.xml                   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d3b8396..4517cee 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/> <!-- Only required on SDK <= 28 -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/> <!-- To install packages downloaded through ntfy; craazyy! -->
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/> <!-- To reschedule the websocket retry -->
-    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/> <!-- To close the notification drawer, see UserActionWorker -->
 
     <application
             android:name=".app.Application"
diff --git a/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
index c7a1690..c1ab2b2 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
@@ -101,6 +101,7 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra
         val topic = url.pathSegments.first()
         title = topicShortUrl(baseUrl, topic)
 
+        // Subscribe to topic if it doesn't already exist
         lifecycleScope.launch(Dispatchers.IO) {
             var subscription = repository.getSubscription(baseUrl, topic)
             if (subscription == null) {
@@ -140,6 +141,7 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra
                 }
             }
 
+            // Add extras needed in loadView(); normally these are added in MainActivity
             intent.putExtra(MainActivity.EXTRA_SUBSCRIPTION_ID, subscription.id)
             intent.putExtra(MainActivity.EXTRA_SUBSCRIPTION_BASE_URL, subscription.baseUrl)
             intent.putExtra(MainActivity.EXTRA_SUBSCRIPTION_TOPIC, subscription.topic)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6c01467..66949ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -244,7 +244,7 @@
     <string name="settings_notifications_priority_high">high</string>
     <string name="settings_notifications_priority_max">max</string>
     <string name="settings_notifications_channel_prefs_title">Channel settings</string>
-    <string name="settings_notifications_channel_prefs_summary">Manage Do Not Disturb (DND) override, custom sounds, etc.</string>
+    <string name="settings_notifications_channel_prefs_summary">Do Not Disturb (DND) override, sounds, etc.</string>
     <string name="settings_notifications_auto_download_title">Download attachments</string>
     <string name="settings_notifications_auto_download_summary_always">Auto-download all attachments</string>
     <string name="settings_notifications_auto_download_summary_never">Never auto-download attachments</string>