Updated 7 files, added 5 files and deleted 5 files (automated)

17 files changed, 54 insertions, 38 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 7e3594a..4517cdc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,11 +11,11 @@ android {
 
     defaultConfig {
         applicationId "dev.equestria.notifications"
-        minSdkVersion 27
+        minSdkVersion 28
         targetSdkVersion 33
 
-        versionCode 142
-        versionName "3.1.5"
+        versionCode 145
+        versionName "3.1.8"
         buildConfigField 'String', "NTFY_VERSION", '"1.16.0"'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
index 7a24022..bf13e98 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
@@ -112,8 +112,6 @@ class NotificationService(val context: Context) {
             R.drawable.ic_category_alarm
         } else if (tags.contains("status")) {
             R.drawable.ic_category_status
-        } else if (tags.contains("genitalia")) {
-            R.drawable.ic_category_genitalia
         } else if (tags.contains("sport")) {
             R.drawable.ic_category_sport
         } else if (tags.contains("debug")) {
@@ -126,6 +124,8 @@ class NotificationService(val context: Context) {
             R.drawable.ic_category_reminder
         } else if (tags.contains("equilink")) {
             R.drawable.ic_category_equilink
+        } else if (tags.contains("derpibooru")) {
+            R.drawable.ic_category_derpibooru
         } else {
             R.drawable.ic_notification
         }
@@ -253,6 +253,9 @@ class NotificationService(val context: Context) {
     }
 
     private fun maybeAddOpenAction(builder: NotificationCompat.Builder, notification: Notification) {
+        // @ponypush - Disabled this because this should NOT be a default and non-configurable
+        return
+
         if (!canOpenAttachment(notification.attachment)) {
             return
         }
@@ -268,6 +271,9 @@ class NotificationService(val context: Context) {
     }
 
     private fun maybeAddBrowseAction(builder: NotificationCompat.Builder, notification: Notification) {
+        // @ponypush - Disabled this because this should NOT be a default and non-configurable
+        return
+
         if (notification.attachment?.contentUri != null) {
             val intent = Intent(android.app.DownloadManager.ACTION_VIEW_DOWNLOADS).apply {
                 addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
@@ -278,6 +284,9 @@ class NotificationService(val context: Context) {
     }
 
     private fun maybeAddDownloadAction(builder: NotificationCompat.Builder, notification: Notification) {
+        // @ponypush - Disabled this because this should NOT be a default and non-configurable
+        return
+
         if (notification.attachment?.contentUri == null && listOf(ATTACHMENT_PROGRESS_NONE, ATTACHMENT_PROGRESS_FAILED).contains(notification.attachment?.progress)) {
             val intent = Intent(context, UserActionBroadcastReceiver::class.java).apply {
                 putExtra(BROADCAST_EXTRA_TYPE, BROADCAST_TYPE_DOWNLOAD_START)
diff --git a/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt b/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
index e35e74b..32799de 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
@@ -108,10 +108,10 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
                 "travelling" -> context.getString(R.string.category_travelling)
                 "alarm" -> context.getString(R.string.category_alarm)
                 "status" -> context.getString(R.string.category_status)
-                "genitalia" -> context.getString(R.string.category_genitalia)
                 "chdebug" -> context.getString(R.string.category_debug)
                 "debug" -> context.getString(R.string.category_debug)
                 "reminder" -> context.getString(R.string.category_reminder)
+                "derpibooru" -> context.getString(R.string.category_derpibooru)
                 else -> context.getString(R.string.category_default, item)
             }
         }
diff --git a/app/src/main/java/io/heckel/ntfy/util/Util.kt b/app/src/main/java/io/heckel/ntfy/util/Util.kt
index 1b9e4dc..0ed9d33 100644
--- a/app/src/main/java/io/heckel/ntfy/util/Util.kt
+++ b/app/src/main/java/io/heckel/ntfy/util/Util.kt
@@ -65,17 +65,21 @@ fun subscriptionTopicShortUrl(subscription: Subscription) : String {
 }
 
 fun getName(topic: String, fallback: String = "Unknown channel ($topic)") : String {
-    return when (topic) {
-        "main" -> "Main delivery channel"
-        "public-switches" -> "Switch notifications"
-        "public-switches-raindrops" -> "Switch notifications (Raindrops)"
-        "public-switches-cloudburst" -> "Switch notifications (Cloudburst)"
-        "pleasure" -> "Pleasure alerts"
-        "delta" -> "Delta administrator alerts"
-        "stargrove" -> "Stargrove notifications"
-        "motivation" -> "Motivational messages"
-        "test" -> "Test channel"
-        else -> fallback
+    if (topic.startsWith("derpibooru-")) {
+        return "Derpibooru notifications for " + topic.substring(11)
+    } else {
+        return when (topic) {
+            "main" -> "Main delivery channel"
+            "public-switches" -> "Switch notifications"
+            "public-switches-raindrops" -> "Switch notifications (Raindrops)"
+            "public-switches-cloudburst" -> "Switch notifications (Cloudburst)"
+            "pleasure" -> "Pleasure alerts"
+            "delta" -> "Delta administrator alerts"
+            "stargrove" -> "Stargrove notifications"
+            "motivation" -> "Motivational messages"
+            "test" -> "Test channel"
+            else -> fallback
+        }
     }
 }
 
diff --git a/app/src/main/res/drawable-anydpi/ic_category_derpibooru.xml b/app/src/main/res/drawable-anydpi/ic_category_derpibooru.xml
new file mode 100644
index 0000000..32214a4
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_category_derpibooru.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.92"
+      android:scaleY="0.92"
+      android:translateX="0.96"
+      android:translateY="0.96">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,9l1.25,-2.75l2.75,-1.25l-2.75,-1.25l-1.25,-2.75l-1.25,2.75l-2.75,1.25l2.75,1.25z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,15l-1.25,2.75l-2.75,1.25l2.75,1.25l1.25,2.75l1.25,-2.75l2.75,-1.25l-2.75,-1.25z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.5,9.5L9,4L6.5,9.5L1,12l5.5,2.5L9,20l2.5,-5.5L17,12L11.5,9.5zM9.99,12.99L9,15.17l-0.99,-2.18L5.83,12l2.18,-0.99L9,8.83l0.99,2.18L12.17,12L9.99,12.99z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_category_genitalia.xml b/app/src/main/res/drawable-anydpi/ic_category_genitalia.xml
deleted file mode 100644
index e0bcf2d..0000000
--- a/app/src/main/res/drawable-anydpi/ic_category_genitalia.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.92"
-      android:scaleY="0.92"
-      android:translateX="0.96"
-      android:translateY="0.96">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M8.55,12c-1.07,-0.71 -2.25,-1.27 -3.53,-1.61 1.28,0.34 2.46,0.9 3.53,1.61zM18.98,10.39c-1.29,0.34 -2.49,0.91 -3.57,1.64 1.08,-0.73 2.28,-1.3 3.57,-1.64z"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M15.49,9.63c-0.18,-2.79 -1.31,-5.51 -3.43,-7.63 -2.14,2.14 -3.32,4.86 -3.55,7.63 1.28,0.68 2.46,1.56 3.49,2.63 1.03,-1.06 2.21,-1.94 3.49,-2.63zM8.99,12.28c-0.14,-0.1 -0.3,-0.19 -0.45,-0.29 0.15,0.11 0.31,0.19 0.45,0.29zM15.41,12.03c-0.13,0.09 -0.27,0.16 -0.4,0.26 0.13,-0.1 0.27,-0.17 0.4,-0.26zM12,15.45C9.85,12.17 6.18,10 2,10c0,5.32 3.36,9.82 8.03,11.49 0.63,0.23 1.29,0.4 1.97,0.51 0.68,-0.12 1.33,-0.29 1.97,-0.51C18.64,19.82 22,15.32 22,10c-4.18,0 -7.85,2.17 -10,5.45z"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_category_derpibooru.png b/app/src/main/res/drawable-hdpi/ic_category_derpibooru.png
new file mode 100644
index 0000000..5902682
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_category_derpibooru.png
diff --git a/app/src/main/res/drawable-hdpi/ic_category_genitalia.png b/app/src/main/res/drawable-hdpi/ic_category_genitalia.png
deleted file mode 100644
index ce13a33..0000000
--- a/app/src/main/res/drawable-hdpi/ic_category_genitalia.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-mdpi/ic_category_derpibooru.png b/app/src/main/res/drawable-mdpi/ic_category_derpibooru.png
new file mode 100644
index 0000000..a7f6553
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_category_derpibooru.png
diff --git a/app/src/main/res/drawable-mdpi/ic_category_genitalia.png b/app/src/main/res/drawable-mdpi/ic_category_genitalia.png
deleted file mode 100644
index ab38af4..0000000
--- a/app/src/main/res/drawable-mdpi/ic_category_genitalia.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xhdpi/ic_category_derpibooru.png b/app/src/main/res/drawable-xhdpi/ic_category_derpibooru.png
new file mode 100644
index 0000000..18d1d71
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_category_derpibooru.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_category_genitalia.png b/app/src/main/res/drawable-xhdpi/ic_category_genitalia.png
deleted file mode 100644
index 5f4e910..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_category_genitalia.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xxhdpi/ic_category_derpibooru.png b/app/src/main/res/drawable-xxhdpi/ic_category_derpibooru.png
new file mode 100644
index 0000000..823756d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_category_derpibooru.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_category_genitalia.png b/app/src/main/res/drawable-xxhdpi/ic_category_genitalia.png
deleted file mode 100644
index cd5d15e..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_category_genitalia.png
+++ /dev/null
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c501210..21f31ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -383,10 +383,10 @@
     <string name="category_emergency">Emergency alerts</string>
     <string name="category_delta">Delta Kiosk requests</string>
     <string name="category_reminder">Activity reminders</string>
+    <string name="category_derpibooru">Derpibooru notifications</string>
     <string name="category_travelling">System travelling updates</string>
     <string name="category_alarm">Automated alarms</string>
     <string name="category_status">Server status updates</string>
-    <string name="category_genitalia">Self-pleasure alerts</string>
     <string name="category_debug">Debugging notifications</string>
     <string name="category_motivation">Motivational messages</string>
     <string name="category_schedule">Schedule events</string>
diff --git a/build.gradle b/build.gradle
index 42235a4..e4abc03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.14' // This is removed in the "fdroid" flavor
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fdffbb3..292ead7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip