From 4d4137e590a01c0c7f3e3e953f2100d13e0344b4 Mon Sep 17 00:00:00 2001
From: Lukas Winkler <git@lw1.at>
Date: Wed, 22 Sep 2021 19:48:22 +0200
Subject: [PATCH] notification permissions

---
 app/src/main/AndroidManifest.xml                          | 1 +
 .../java/org/matomocamp/companion/api/MatomoCampApi.kt    | 2 ++
 .../matomocamp/companion/services/AlarmIntentService.kt   | 8 +++++++-
 app/src/main/res/values-de/strings.xml                    | 1 +
 app/src/main/res/values/strings.xml                       | 1 +
 app/src/main/res/xml-v26/settings.xml                     | 5 +++++
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5dcbbfd..f4546d0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 
     <!-- Permissions required for alarms -->
     <uses-permission
diff --git a/app/src/main/java/org/matomocamp/companion/api/MatomoCampApi.kt b/app/src/main/java/org/matomocamp/companion/api/MatomoCampApi.kt
index b6c8374..ad392ed 100644
--- a/app/src/main/java/org/matomocamp/companion/api/MatomoCampApi.kt
+++ b/app/src/main/java/org/matomocamp/companion/api/MatomoCampApi.kt
@@ -2,6 +2,7 @@ package org.matomocamp.companion.api
 
 import android.os.SystemClock
 import android.text.format.DateUtils
+import android.util.Log
 import androidx.annotation.MainThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -86,6 +87,7 @@ class MatomoCampApi @Inject constructor(
                 }
             }
         } catch (e: Exception) {
+            Log.e("MatomoCamp", "Download Error", e)
             DownloadScheduleResult.Error
         }
         _downloadScheduleState.value = LoadingState.Idle(SingleEvent(res))
diff --git a/app/src/main/java/org/matomocamp/companion/services/AlarmIntentService.kt b/app/src/main/java/org/matomocamp/companion/services/AlarmIntentService.kt
index a8ed62f..6bc5446 100644
--- a/app/src/main/java/org/matomocamp/companion/services/AlarmIntentService.kt
+++ b/app/src/main/java/org/matomocamp/companion/services/AlarmIntentService.kt
@@ -1,5 +1,6 @@
 package org.matomocamp.companion.services
 
+import android.annotation.SuppressLint
 import android.app.AlarmManager
 import android.app.Notification
 import android.app.NotificationChannel
@@ -59,11 +60,16 @@ class AlarmIntentService : JobIntentService() {
         getSystemService()!!
     }
 
+    @SuppressLint("UnspecifiedImmutableFlag")
     private fun getAlarmPendingIntent(eventId: Long): PendingIntent {
         val intent = Intent(this, AlarmReceiver::class.java)
                 .setAction(AlarmReceiver.ACTION_NOTIFY_EVENT)
                 .setData(eventId.toString().toUri())
-        return PendingIntent.getBroadcast(this, 0, intent, 0)
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE)
+        } else {
+            PendingIntent.getActivity(this, 0, intent, 0)
+        }
     }
 
     override fun onHandleWork(intent: Intent) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c476a03..67b954f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -97,4 +97,5 @@
     <string name="no_data">Keine Daten Verfügbar.</string>
     <string name="website">Webseite</string>
     <string name="open_in_webbrowser">Im Webbrowser öffnen</string>
+    <string name="notification_warning">Abhängig von der Android Version und Energieoptionen werden Benachrichtigungen möglicherweise nicht zuverlässig zugestellt.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index adb3936..cde0786 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -95,6 +95,7 @@
         <item>2</item>
     </string-array>
     <string name="settings_notifications">Notifications</string>
+    <string name="notification_warning">Depending on your Android version and Energy settings, notifications might not be reliably delivered.</string>
     <string name="settings_notifications_enabled_title">Enable notifications</string>
     <string name="settings_notifications_enabled_summary">If checked, this will notify you of upcoming bookmarked events</string>
     <string name="settings_notifications_channel_title">Customize</string>
diff --git a/app/src/main/res/xml-v26/settings.xml b/app/src/main/res/xml-v26/settings.xml
index 0666405..ff96eb7 100644
--- a/app/src/main/res/xml-v26/settings.xml
+++ b/app/src/main/res/xml-v26/settings.xml
@@ -25,6 +25,11 @@
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/settings_notifications">
+        <Preference
+            app:key="pref_static_field_key2"
+            app:selectable="false"
+            app:persistent="false"
+            app:summary="@string/notification_warning"/>
         <SwitchPreference
             app:defaultValue="true"
             app:icon="@drawable/ic_notifications_normal_24dp"