From d757f8d8945659e72175463d73b7980c6a39773c Mon Sep 17 00:00:00 2001
From: Alex Akselrod <alex@akselrod.org>
Date: Thu, 2 Nov 2023 11:02:47 -0700
Subject: [PATCH] gate POST_NOTIFICATIONS request behind SDK version, improve
 UI

---
 .../main/java/eu/neilalexander/yggdrasil/MainActivity.kt | 9 ++++++++-
 app/src/main/res/values-ru/strings.xml                   | 1 +
 app/src/main/res/values/strings.xml                      | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt
index e0bdbf2..fdfe4cf 100644
--- a/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt
+++ b/app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt
@@ -41,6 +41,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun checkNotificationPermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            return
+        }
+
         PermissionX.init(this)
             .permissions(
                 Manifest.permission.POST_NOTIFICATIONS,
@@ -61,7 +65,10 @@ class MainActivity : AppCompatActivity() {
                     getString(R.string.cancel),
                 )
             }
-            .request { _, _, _ -> {}
+            .request { allGranted, _, _ -> {}
+                if (!allGranted) {
+                    Toast.makeText(this, R.string.ntfn_denied, Toast.LENGTH_LONG).show()
+                }
             }
     }
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2be6a2c..e4bf757 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -44,6 +44,7 @@
     <string name="main_enable_yggdrasil">Включить Yggdrasil</string>
     <string name="explain_ntfn_perms">Пожалуйста включите нотификации чтобы видеть статус подключения Yggdrasil</string>
     <string name="manual_ntfn_perms">Чтобы видеть статус подключения Yggdrasil, включите нотификации в настройках</string>
+    <string name="ntfn_denied">Нотификация статуса подключения Yggdrasil не будет показана</string>
     <string name="main_statistics">Статистика</string>
     <string name="main_not_available">Н/Д</string>
     <string name="main_ip">Адрес</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02898bb..8208a91 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,6 +44,7 @@
     <string name="main_enable_yggdrasil">Enable Yggdrasil</string>
     <string name="explain_ntfn_perms">Please enable notifications to easily see Yggdrasil connection status</string>
     <string name="manual_ntfn_perms">To see Yggdrasil connection status, enable notifications in app settings</string>
+    <string name="ntfn_denied">Yggdrasil connection status notification will not be shown</string>
     <string name="main_statistics">Statistics</string>
     <string name="main_not_available">N/A</string>
     <string name="main_ip">IP</string>