From 6e6820891c95b0b4365332548ac89903d21f1d27 Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Thu, 20 Mar 2025 22:15:23 -0600
Subject: [PATCH 1/6] target android 34

---
 app/build.gradle                              | 26 +++++++++++++------
 app/src/main/AndroidManifest.xml              |  3 +--
 .../main/java/io/heckel/ntfy/db/Database.kt   |  6 ++---
 app/src/main/java/io/heckel/ntfy/ui/Colors.kt |  2 +-
 app/src/main/java/io/heckel/ntfy/util/Util.kt | 11 ++++----
 build.gradle                                  | 10 ++++---
 gradle/wrapper/gradle-wrapper.properties      |  4 +--
 7 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 90dc1edb..2990a460 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,18 +1,23 @@
+plugins {
+    id 'com.google.devtools.ksp'
+}
+
 repositories {
     mavenCentral()
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+//apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
 
 android {
-    compileSdkVersion 33
+    namespace "io.heckel.ntfy"
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "io.heckel.ntfy"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
 
         versionCode 33
         versionName "1.17.0"
@@ -25,6 +30,10 @@ android {
                 arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
             }
         }
+
+        buildFeatures {
+            buildConfig true
+        }
     }
 
     buildTypes {
@@ -54,12 +63,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs += [
             '-Xjvm-default=all-compatibility' // https://stackoverflow.com/a/71234042/1440785
         ]
@@ -103,9 +112,10 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10'
 
     // Room (SQLite)
-    def room_version = "2.5.1"
+    def room_version = "2.6.1"
+    implementation "androidx.room:room-runtime:$room_version"
+    ksp "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
 
     // OkHttp (HTTP library)
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0950b404..67246fe5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="io.heckel.ntfy">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Permissions -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/app/src/main/java/io/heckel/ntfy/db/Database.kt b/app/src/main/java/io/heckel/ntfy/db/Database.kt
index 5f397969..f7e3a2ad 100644
--- a/app/src/main/java/io/heckel/ntfy/db/Database.kt
+++ b/app/src/main/java/io/heckel/ntfy/db/Database.kt
@@ -120,7 +120,7 @@ data class Attachment(
     @ColumnInfo(name = "contentUri") val contentUri: String?, // After it's downloaded, the content:// location
     @ColumnInfo(name = "progress") val progress: Int, // Progress during download, -1 if not downloaded
 ) {
-    constructor(name: String, type: String?, size: Long?, expires: Long?, url: String) :
+    @Ignore constructor(name: String, type: String?, size: Long?, expires: Long?, url: String) :
             this(name, type, size, expires, url, null, ATTACHMENT_PROGRESS_NONE)
 }
 
@@ -135,7 +135,7 @@ data class Icon(
     @ColumnInfo(name = "url") val url: String, // URL (mandatory, see ntfy server)
     @ColumnInfo(name = "contentUri") val contentUri: String?, // After it's downloaded, the content:// location
 ) {
-    constructor(url:String) :
+    @Ignore constructor(url:String) :
             this(url, null)
 }
 
@@ -192,7 +192,7 @@ data class LogEntry(
     @ColumnInfo(name = "message") val message: String,
     @ColumnInfo(name = "exception") val exception: String?
 ) {
-    constructor(timestamp: Long, tag: String, level: Int, message: String, exception: String?) :
+    @Ignore constructor(timestamp: Long, tag: String, level: Int, message: String, exception: String?) :
             this(0, timestamp, tag, level, message, exception)
 }
 
diff --git a/app/src/main/java/io/heckel/ntfy/ui/Colors.kt b/app/src/main/java/io/heckel/ntfy/ui/Colors.kt
index ada14cbf..47e8e164 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/Colors.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/Colors.kt
@@ -7,7 +7,7 @@ import io.heckel.ntfy.util.isDarkThemeOn
 
 class Colors {
     companion object {
-        const val refreshProgressIndicator = R.color.teal
+        val refreshProgressIndicator = R.color.teal
 
         fun notificationIcon(context: Context): Int {
             return if (isDarkThemeOn(context)) R.color.teal_light else R.color.teal
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 2ffbb766..1db243fe 100644
--- a/app/src/main/java/io/heckel/ntfy/util/Util.kt
+++ b/app/src/main/java/io/heckel/ntfy/util/Util.kt
@@ -393,13 +393,14 @@ class ContentUriRequestBody(
     }
 }
 
+// TODO: make this work in Android 34+
 // Hack: Make end icon for drop down smaller, see https://stackoverflow.com/a/57098715/1440785
 fun View.makeEndIconSmaller(resources: Resources) {
-    val dimension = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics)
-    val endIconImageView = findViewById<ImageView>(R.id.text_input_end_icon)
-    endIconImageView.minimumHeight = dimension.toInt()
-    endIconImageView.minimumWidth = dimension.toInt()
-    requestLayout()
+//    val dimension = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics)
+//    val endIconImageView = findViewById<ImageView>(R.id.text_input_end_icon)
+//    endIconImageView.minimumHeight = dimension.toInt()
+//    endIconImageView.minimumWidth = dimension.toInt()
+//    requestLayout()
 }
 
 // Shows the ripple effect on the view, if it is ripple-able, see https://stackoverflow.com/a/56314062/1440785
diff --git a/build.gradle b/build.gradle
index fd508003..8cc4348b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.8.20'
+    ext.kotlin_version = '2.0.21'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.15' // This is removed in the "fdroid" flavor
 
@@ -14,6 +14,10 @@ buildscript {
     }
 }
 
+plugins {
+    id 'com.google.devtools.ksp' version '2.0.21-1.0.27'
+}
+
 allprojects {
     repositories {
         google()
@@ -24,4 +28,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index edb3793b..dcbbf23b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 22 10:13:03 PDT 2020
+#Sat Feb 22 14:52:01 MST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip

From 6f907a28cd521a111179e11934173fc815fb1102 Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Thu, 20 Mar 2025 22:17:07 -0600
Subject: [PATCH 2/6] run SubscriberService as special foreground service

---
 app/src/main/AndroidManifest.xml                         | 9 ++++++++-
 .../java/io/heckel/ntfy/service/SubscriberService.kt     | 7 ++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 67246fe5..bee873d0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     <!-- Permissions -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/> <!-- For instant delivery foregrounds service -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/> <!-- For instant delivery foregrounds service on SDK >= 34 -->
     <uses-permission android:name="android.permission.WAKE_LOCK"/> <!-- To keep foreground service awake; soon not needed anymore -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <!-- To restart service on reboot -->
     <uses-permission android:name="android.permission.VIBRATE"/> <!-- Incoming notifications should be able to vibrate the phone -->
@@ -94,7 +95,13 @@
         </activity>
 
         <!-- Subscriber foreground service for hosts other than ntfy.sh -->
-        <service android:name=".service.SubscriberService"/>
+        <service
+            android:name=".service.SubscriberService"
+            android:foregroundServiceType="specialUse">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="This is the main feature of this application. The foreground notification displays the connectivity status to the configurable remote server and the service notifies the user when a new message has been published on the remote server." />
+        </service>
 
         <!-- Subscriber service restart on reboot -->
         <receiver
diff --git a/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt b/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
index 192cfc9f..adf94b48 100644
--- a/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
@@ -4,6 +4,7 @@ import android.app.*
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
@@ -98,7 +99,11 @@ class SubscriberService : Service() {
         notificationManager = createNotificationChannel()
         serviceNotification = createNotification(title, text)
 
-        startForeground(NOTIFICATION_SERVICE_ID, serviceNotification)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            startForeground(NOTIFICATION_SERVICE_ID, serviceNotification!!, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
+        } else {
+            startForeground(NOTIFICATION_SERVICE_ID, serviceNotification)
+        }
     }
 
     override fun onDestroy() {

From 5ecd84855f0f9e2ccd5b3cb271386f7ff9c86818 Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Thu, 20 Mar 2025 22:17:33 -0600
Subject: [PATCH 3/6] request schedule_exact_alarm permissions

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../main/java/io/heckel/ntfy/db/Repository.kt | 14 ++++
 .../io/heckel/ntfy/service/WsConnection.kt    | 22 +++++-
 .../java/io/heckel/ntfy/ui/MainActivity.kt    | 55 ++++++++++++++-
 .../io/heckel/ntfy/ui/SettingsActivity.kt     | 27 ++++++++
 app/src/main/res/layout/activity_main.xml     | 69 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  9 +++
 app/src/main/res/values/values.xml            |  1 +
 app/src/main/res/xml/main_preferences.xml     |  3 +
 9 files changed, 198 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bee873d0..cb991fa1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -110,6 +110,7 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED"/>
             </intent-filter>
         </receiver>
 
diff --git a/app/src/main/java/io/heckel/ntfy/db/Repository.kt b/app/src/main/java/io/heckel/ntfy/db/Repository.kt
index 71b03092..15f76db7 100644
--- a/app/src/main/java/io/heckel/ntfy/db/Repository.kt
+++ b/app/src/main/java/io/heckel/ntfy/db/Repository.kt
@@ -342,6 +342,16 @@ class Repository(private val sharedPrefs: SharedPreferences, private val databas
             .apply()
     }
 
+    fun getWebSocketReconnectRemindTime(): Long {
+        return sharedPrefs.getLong(SHARED_PREFS_WEBSOCKET_RECONNECT_REMIND_TIME, WEBSOCKET_RECONNECT_REMIND_TIME_ALWAYS)
+    }
+
+    fun setWebSocketReconnectRemindTime(timeMillis: Long) {
+        sharedPrefs.edit()
+            .putLong(SHARED_PREFS_WEBSOCKET_RECONNECT_REMIND_TIME, timeMillis)
+            .apply()
+    }
+
     fun getDefaultBaseUrl(): String? {
         return sharedPrefs.getString(SHARED_PREFS_DEFAULT_BASE_URL, null) ?:
             sharedPrefs.getString(SHARED_PREFS_UNIFIED_PUSH_BASE_URL, null) // Fall back to UP URL, removed when default is set!
@@ -492,6 +502,7 @@ class Repository(private val sharedPrefs: SharedPreferences, private val databas
         const val SHARED_PREFS_RECORD_LOGS_ENABLED = "RecordLogs"
         const val SHARED_PREFS_BATTERY_OPTIMIZATIONS_REMIND_TIME = "BatteryOptimizationsRemindTime"
         const val SHARED_PREFS_WEBSOCKET_REMIND_TIME = "JsonStreamRemindTime" // "Use WebSocket" banner (used to be JSON stream deprecation banner)
+        const val SHARED_PREFS_WEBSOCKET_RECONNECT_REMIND_TIME = "WebSocketReconnectRemindTime"
         const val SHARED_PREFS_UNIFIED_PUSH_BASE_URL = "UnifiedPushBaseURL" // Legacy key required for migration to DefaultBaseURL
         const val SHARED_PREFS_DEFAULT_BASE_URL = "DefaultBaseURL"
         const val SHARED_PREFS_LAST_TOPICS = "LastTopics"
@@ -532,6 +543,9 @@ class Repository(private val sharedPrefs: SharedPreferences, private val databas
         const val WEBSOCKET_REMIND_TIME_ALWAYS = 1L
         const val WEBSOCKET_REMIND_TIME_NEVER = Long.MAX_VALUE
 
+        const val WEBSOCKET_RECONNECT_REMIND_TIME_ALWAYS = 1L
+        const val WEBSOCKET_RECONNECT_REMIND_TIME_NEVER = Long.MAX_VALUE
+
         private const val TAG = "NtfyRepository"
         private var instance: Repository? = null
 
diff --git a/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt b/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt
index 080e8482..20059d5c 100644
--- a/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt
@@ -114,7 +114,27 @@ class WsConnection(
             Log.d(TAG,"$shortUrl (gid=$globalId): Scheduling a restart in $seconds seconds (via alarm manager)")
             val reconnectTime = Calendar.getInstance()
             reconnectTime.add(Calendar.SECOND, seconds)
-            alarmManager.setExact(AlarmManager.RTC_WAKEUP, reconnectTime.timeInMillis, RECONNECT_TAG, { start() }, null)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                if (alarmManager.canScheduleExactAlarms()) {
+                    alarmManager.setExact(
+                        AlarmManager.RTC_WAKEUP,
+                        reconnectTime.timeInMillis,
+                        RECONNECT_TAG,
+                        { start() },
+                        null
+                    )
+                } else {
+                    Log.d(TAG, "SCHEDULE_EXACT_ALARM permission denied: Failed to reschedule websocket connection")
+                }
+            } else {
+                alarmManager.setExact(
+                    AlarmManager.RTC_WAKEUP,
+                    reconnectTime.timeInMillis,
+                    RECONNECT_TAG,
+                    { start() },
+                    null
+                )
+            }
         } else {
             Log.d(TAG, "$shortUrl (gid=$globalId): Scheduling a restart in $seconds seconds (via handler)")
             val handler = Handler(Looper.getMainLooper())
diff --git a/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
index e131f32c..5ac2f7ad 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
@@ -3,6 +3,7 @@ package io.heckel.ntfy.ui
 import android.Manifest
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
+import android.app.AlarmManager
 import android.app.AlertDialog
 import android.content.ActivityNotFoundException
 import android.content.Intent
@@ -11,6 +12,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import android.provider.Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM
 import android.text.method.LinkMovementMethod
 import android.view.ActionMode
 import android.view.Menu
@@ -125,9 +127,10 @@ class MainActivity : AppCompatActivity(), ActionMode.Callback, AddFragment.Subsc
                     Log.addScrubTerm(s.topic)
                 }
 
-                // Update banner + WebSocket banner
+                // Update battery banner + WebSocket banner + websocket reconnect banner
                 showHideBatteryBanner(subscriptions)
                 showHideWebSocketBanner(subscriptions)
+                showHideWebSocketReconnectBanner(subscriptions)
             }
         }
 
@@ -194,6 +197,38 @@ class MainActivity : AppCompatActivity(), ActionMode.Callback, AddFragment.Subsc
             repository.setConnectionProtocol(Repository.CONNECTION_PROTOCOL_WS)
             SubscriberServiceManager(this).restart()
             wsBanner.visibility = View.GONE
+
+            // maybe show WebSocketReconnectBanner
+            viewModel.list().observe(this) {
+                it?.let { subscriptions ->
+                    showHideWebSocketReconnectBanner(subscriptions)
+                }
+            }
+        }
+
+        // WebSocket Reconnect banner
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val wsReconnectBanner = findViewById<View>(R.id.main_banner_websocket_reconnect)
+            val wsReconnectText = findViewById<TextView>(R.id.main_banner_websocket_reconnect_text)
+            val wsReconnectDismissButton =
+                findViewById<Button>(R.id.main_banner_websocket_reconnect_dontaskagain)
+            val wsReconnectRemindButton =
+                findViewById<Button>(R.id.main_banner_websocket_reconnect_remind_later)
+            val wsReconnectEnableButton =
+                findViewById<Button>(R.id.main_banner_websocket_reconnect_enable)
+            wsReconnectText.movementMethod =
+                LinkMovementMethod.getInstance() // Make links clickable
+            wsReconnectDismissButton.setOnClickListener {
+                wsReconnectBanner.visibility = View.GONE
+                repository.setWebSocketReconnectRemindTime(Repository.WEBSOCKET_RECONNECT_REMIND_TIME_NEVER)
+            }
+            wsReconnectRemindButton.setOnClickListener {
+                wsReconnectBanner.visibility = View.GONE
+                repository.setWebSocketReconnectRemindTime(System.currentTimeMillis() + ONE_DAY_MILLIS)
+            }
+            wsReconnectEnableButton.setOnClickListener {
+                startActivity(Intent(ACTION_REQUEST_SCHEDULE_EXACT_ALARM))
+            }
         }
 
         // Create notification channels right away, so we can configure them immediately after installing the app
@@ -248,6 +283,24 @@ class MainActivity : AppCompatActivity(), ActionMode.Callback, AddFragment.Subsc
         wsBanner.visibility = if (showBanner) View.VISIBLE else View.GONE
     }
 
+    private fun showHideWebSocketReconnectBanner(subscriptions: List<Subscription>) {
+        val wsReconnectBanner = findViewById<View>(R.id.main_banner_websocket_reconnect)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val hasSelfHostedSubscriptions = subscriptions.count { it.baseUrl != appBaseUrl } > 0
+            val usingWebSockets =
+                repository.getConnectionProtocol() == Repository.CONNECTION_PROTOCOL_WS
+            val wsReconnectRemindTimeReached =
+                repository.getWebSocketReconnectRemindTime() < System.currentTimeMillis()
+            val canScheduleExactAlarms =
+                (getSystemService(ALARM_SERVICE) as AlarmManager).canScheduleExactAlarms()
+            val showBanner = hasSelfHostedSubscriptions && wsReconnectRemindTimeReached && usingWebSockets && !canScheduleExactAlarms
+            Log.d(TAG, "hasSelfHostedSubscriptions: ${hasSelfHostedSubscriptions}, wsReconnectRemindTimeReached: ${wsReconnectRemindTimeReached}, usingWebSockets: ${usingWebSockets}, canScheduleExactAlarms: ${canScheduleExactAlarms}")
+            wsReconnectBanner.visibility = if (showBanner) View.VISIBLE else View.GONE
+        } else {
+            wsReconnectBanner.visibility = View.GONE
+        }
+    }
+
     private fun schedulePeriodicPollWorker() {
         val workerVersion = repository.getPollWorkerVersion()
         val workPolicy = if (workerVersion == PollWorker.VERSION) {
diff --git a/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt
index f4ef5d86..a498e12f 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt
@@ -1,6 +1,7 @@
 package io.heckel.ntfy.ui
 
 import android.Manifest
+import android.app.AlarmManager
 import android.app.AlertDialog
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -10,6 +11,7 @@ import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import android.provider.Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM
 import android.text.TextUtils
 import android.widget.Button
 import android.widget.Toast
@@ -119,6 +121,11 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
         return true
     }
 
+    override fun onResume() {
+        super.onResume()
+        settingsFragment.updateExactAlarmsPref()
+    }
+
     class SettingsFragment : PreferenceFragmentCompat() {
         private lateinit var repository: Repository
         private lateinit var serviceManager: SubscriberServiceManager
@@ -545,6 +552,9 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
                 }
             }
 
+            // CanScheduleExactAlarms
+            updateExactAlarmsPref()
+
             // Version
             val versionPrefId = context?.getString(R.string.settings_about_version_key) ?: return
             val versionPref: Preference? = findPreference(versionPrefId)
@@ -678,6 +688,23 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
             }
         }
 
+        fun updateExactAlarmsPref() {
+            val exactAlarmsPrefId = context?.getString(R.string.settings_advanced_exact_alarms_key) ?: return
+            val exactAlarmsPref: Preference? = findPreference(exactAlarmsPrefId)
+            val canScheduleExactAlarms = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                (activity?.getSystemService(ALARM_SERVICE) as AlarmManager).canScheduleExactAlarms()
+            } else {
+                true
+            }
+            exactAlarmsPref?.summary = if (canScheduleExactAlarms) getString(R.string.settings_advanced_exact_alarms_true) else getString(R.string.settings_advanced_exact_alarms_false)
+            exactAlarmsPref?.onPreferenceClickListener = OnPreferenceClickListener {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && !canScheduleExactAlarms) {
+                    startActivity(Intent(ACTION_REQUEST_SCHEDULE_EXACT_ALARM))
+                }
+                true
+            }
+        }
+
         @Keep
         data class NopasteResponse(val url: String)
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0bb4bd6d..d532db64 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -148,6 +148,73 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
 
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:shapeAppearance="?shapeAppearanceLargeComponent" app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/main_banner_websocket"
+        android:id="@+id/main_banner_websocket_reconnect" android:visibility="visible">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/main_banner_websocket_reconnect_constraint" android:elevation="5dp">
+
+            <ImageView
+                android:layout_width="28dp"
+                android:layout_height="28dp" app:srcCompat="@drawable/ic_announcement_orange_24dp"
+                android:id="@+id/main_banner_websocket_reconnect_image"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/main_banner_websocket_reconnect_text"
+                app:layout_constraintEnd_toStartOf="@id/main_banner_websocket_reconnect_text"
+                app:layout_constraintBottom_toBottomOf="@+id/main_banner_websocket_reconnect_text"
+                android:layout_marginStart="15dp"/>
+            <TextView
+                android:id="@+id/main_banner_websocket_reconnect_text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@string/main_banner_websocket_reconnect_text"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginEnd="15dp" android:layout_marginTop="15dp"
+                app:layout_constraintStart_toEndOf="@+id/main_banner_websocket_reconnect_image"
+                android:layout_marginStart="10dp"
+                />
+
+            <androidx.constraintlayout.helper.widget.Flow
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:constraint_referenced_ids="main_banner_websocket_reconnect_remind_later,main_banner_websocket_reconnect_dontaskagain,main_banner_websocket_reconnect_enable" app:layout_constraintTop_toBottomOf="@id/main_banner_websocket_reconnect_text" app:flow_horizontalAlign="end" app:flow_wrapMode="chain" app:flow_horizontalStyle="packed" android:layout_marginEnd="15dp" android:id="@+id/flow_reconnect" app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="15dp" app:flow_horizontalBias="1"
+                app:flow_verticalGap="0dp" app:flow_horizontalGap="0dp"/>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/main_banner_websocket_reconnect_remind_later"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/main_banner_websocket_reconnect_button_remind_later"
+                tools:layout_editor_absoluteX="86dp" tools:layout_editor_absoluteY="83dp"/>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/main_banner_websocket_reconnect_dontaskagain"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/main_banner_websocket_reconnect_button_dismiss"
+                tools:layout_editor_absoluteX="260dp" tools:layout_editor_absoluteY="83dp"/>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/main_banner_websocket_reconnect_enable"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/main_banner_websocket_reconnect_button_enable_now"
+                tools:layout_editor_absoluteX="253dp" tools:layout_editor_absoluteY="131dp"/>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/main_subscriptions_list_container"
             android:layout_width="match_parent"
@@ -155,7 +222,7 @@
             android:visibility="visible"
             app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/main_banner_websocket">
+            app:layout_constraintTop_toBottomOf="@id/main_banner_websocket_reconnect">
         <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/main_subscriptions_list"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7759901..9bd77c00 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,6 +82,12 @@
     <string name="main_banner_websocket_button_dismiss">Dismiss</string>
     <string name="main_banner_websocket_button_enable_now">Enable now</string>
 
+    <!-- Main activity: WebSocket Reconnect banner -->
+    <string name="main_banner_websocket_reconnect_text">To ensure WebSockets reconnect in the background, grant the "Alarm &amp; Reminders" permission to ntfy</string>
+    <string name="main_banner_websocket_reconnect_button_remind_later">Ask later</string>
+    <string name="main_banner_websocket_reconnect_button_dismiss">Dismiss</string>
+    <string name="main_banner_websocket_reconnect_button_enable_now">Grant now</string>
+
     <!-- Add dialog -->
     <string name="add_dialog_title">Subscribe to topic</string>
     <string name="add_dialog_description_below">
@@ -347,6 +353,9 @@
     <string name="settings_advanced_connection_protocol_summary_ws">Use WebSockets to connect to the server. This is the recommended method, but may require additional config in your proxy.</string>
     <string name="settings_advanced_connection_protocol_entry_jsonhttp">JSON stream over HTTP</string>
     <string name="settings_advanced_connection_protocol_entry_ws">WebSockets</string>
+    <string name="settings_advanced_exact_alarms_title">Exact Alarms</string>
+    <string name="settings_advanced_exact_alarms_true">ntfy can schedule exact alarms (used to reconnect WebSockets in the background)</string>
+    <string name="settings_advanced_exact_alarms_false">ntfy CANNOT schedule exact alarms. Click to grant the permission now</string>
     <string name="settings_about_header">About</string>
     <string name="settings_about_version_title">Version</string>
     <string name="settings_about_version_format">ntfy %1$s (%2$s)</string>
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index f94a598b..b6f5f7f5 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -30,6 +30,7 @@
     <string name="settings_advanced_export_logs_key" translatable="false">ExportLogs</string>
     <string name="settings_advanced_clear_logs_key" translatable="false">ClearLogs</string>
     <string name="settings_advanced_connection_protocol_key" translatable="false">ConnectionProtocol</string>
+    <string name="settings_advanced_exact_alarms_key" translatable="false">ExactAlarms</string>
     <string name="settings_about_version_key" translatable="false">Version</string>
 
     <!-- Detail settings constants -->
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 0be2442a..0ad3cec1 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -72,6 +72,9 @@
                 app:entries="@array/settings_advanced_connection_protocol_entries"
                 app:entryValues="@array/settings_advanced_connection_protocol_values"
                 app:defaultValue="jsonhttp"/>
+        <Preference
+            app:key="@string/settings_advanced_exact_alarms_key"
+            app:title="@string/settings_advanced_exact_alarms_title"/>
         <SwitchPreference
                 app:key="@string/settings_advanced_broadcast_key"
                 app:title="@string/settings_advanced_broadcast_title"

From e2e963b90c38da172ac487df22c0e44e2dd742ad Mon Sep 17 00:00:00 2001
From: Philipp Heckel <phil@heckel.io>
Date: Sun, 17 Aug 2025 19:59:09 -0400
Subject: [PATCH 4/6] Fix build

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2990a460..cb0f66a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -137,5 +137,5 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     // Image viewer
-    implementation 'com.github.stfalcon-studio:StfalconImageViewer:v1.0.1'
+    implementation 'com.github.stfalcon-studio:StfalconImageViewer:1.0.1'
 }

From 87af509fc50aeacb0f9b6137a870c7bc36cc96ab Mon Sep 17 00:00:00 2001
From: Philipp Heckel <phil@heckel.io>
Date: Sun, 17 Aug 2025 20:05:33 -0400
Subject: [PATCH 5/6] Android 34 + Markdown

---
 app/build.gradle                              |  13 +
 .../io.heckel.ntfy.db.Database/13.json        |  28 +-
 app/src/debug/res/values/values.xml           |   4 +
 .../java/io/heckel/ntfy/backup/Backuper.kt    |   3 +
 .../main/java/io/heckel/ntfy/db/Database.kt   |   5 +
 .../io/heckel/ntfy/msg/BroadcastService.kt    |   1 +
 .../main/java/io/heckel/ntfy/msg/Message.kt   |   2 +
 .../io/heckel/ntfy/msg/NotificationParser.kt  |   1 +
 .../io/heckel/ntfy/msg/NotificationService.kt |  16 +-
 .../java/io/heckel/ntfy/ui/DetailAdapter.kt   |  35 ++-
 .../io/heckel/ntfy/util/MarkwonFactory.kt     | 100 +++++++
 app/src/main/java/io/heckel/ntfy/util/Util.kt |   2 +-
 app/src/main/res/values-af/strings.xml        |  37 +++
 app/src/main/res/values-ar/strings.xml        |  18 +-
 app/src/main/res/values-bn/strings.xml        |   1 +
 app/src/main/res/values-et/strings.xml        |  21 ++
 app/src/main/res/values-iw/strings.xml        |  49 +++-
 app/src/main/res/values-ms/strings.xml        |   2 +
 app/src/main/res/values-pt-rBR/strings.xml    | 202 ++++++-------
 app/src/main/res/values-ru/strings.xml        |   2 +-
 app/src/main/res/values-xh/strings.xml        |   9 +
 .../heckel/ntfy/firebase/FirebaseService.kt   |   2 +
 assets/logo_with_text.svg                     | 265 ++++++++++++++++++
 .../android/pt-BR/full_description.txt        |   8 +-
 .../android/pt-BR/short_description.txt       |   2 +-
 fastlane/metadata/android/pt-BR/title.txt     |   2 +-
 26 files changed, 693 insertions(+), 137 deletions(-)
 create mode 100644 app/src/debug/res/values/values.xml
 create mode 100644 app/src/main/java/io/heckel/ntfy/util/MarkwonFactory.kt
 create mode 100644 app/src/main/res/values-af/strings.xml
 create mode 100644 app/src/main/res/values-et/strings.xml
 create mode 100644 app/src/main/res/values-ms/strings.xml
 create mode 100644 app/src/main/res/values-xh/strings.xml
 create mode 100644 assets/logo_with_text.svg

diff --git a/app/build.gradle b/app/build.gradle
index cb0f66a7..dc645883 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,6 +45,8 @@ android {
         debug {
             minifyEnabled false
             debuggable true
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
         }
     }
 
@@ -138,4 +140,15 @@ dependencies {
 
     // Image viewer
     implementation 'com.github.stfalcon-studio:StfalconImageViewer:1.0.1'
+
+    // Better click handling for links
+    implementation 'me.saket:better-link-movement-method:2.2.0'
+
+    // Markdown
+    implementation 'io.noties.markwon:core:4.6.2'
+    implementation 'io.noties.markwon:image-picasso:4.6.2'
+    implementation 'io.noties.markwon:image:4.6.2'
+    implementation 'io.noties.markwon:linkify:4.6.2'
+    implementation 'io.noties.markwon:ext-tables:4.6.2'
+    implementation 'io.noties.markwon:ext-strikethrough:4.6.2'
 }
diff --git a/app/schemas/io.heckel.ntfy.db.Database/13.json b/app/schemas/io.heckel.ntfy.db.Database/13.json
index 3a89d0f0..19315381 100644
--- a/app/schemas/io.heckel.ntfy.db.Database/13.json
+++ b/app/schemas/io.heckel.ntfy.db.Database/13.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 13,
-    "identityHash": "44fc291d937fdf02b9bc2d0abb10d2e0",
+    "identityHash": "208f16743f21d9c374f1314878eb93cb",
     "entities": [
       {
         "tableName": "Subscription",
@@ -94,10 +94,10 @@
           }
         ],
         "primaryKey": {
+          "autoGenerate": false,
           "columnNames": [
             "id"
-          ],
-          "autoGenerate": false
+          ]
         },
         "indices": [
           {
@@ -124,7 +124,7 @@
       },
       {
         "tableName": "Notification",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `title` TEXT NOT NULL, `message` TEXT NOT NULL, `encoding` TEXT NOT NULL, `notificationId` INTEGER NOT NULL, `priority` INTEGER NOT NULL DEFAULT 3, `tags` TEXT NOT NULL, `click` TEXT NOT NULL, `actions` TEXT, `deleted` INTEGER NOT NULL, `icon_url` TEXT, `icon_contentUri` TEXT, `attachment_name` TEXT, `attachment_type` TEXT, `attachment_size` INTEGER, `attachment_expires` INTEGER, `attachment_url` TEXT, `attachment_contentUri` TEXT, `attachment_progress` INTEGER, PRIMARY KEY(`id`, `subscriptionId`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `title` TEXT NOT NULL, `message` TEXT NOT NULL, `contentType` TEXT NOT NULL, `encoding` TEXT NOT NULL, `notificationId` INTEGER NOT NULL, `priority` INTEGER NOT NULL DEFAULT 3, `tags` TEXT NOT NULL, `click` TEXT NOT NULL, `actions` TEXT, `deleted` INTEGER NOT NULL, `icon_url` TEXT, `icon_contentUri` TEXT, `attachment_name` TEXT, `attachment_type` TEXT, `attachment_size` INTEGER, `attachment_expires` INTEGER, `attachment_url` TEXT, `attachment_contentUri` TEXT, `attachment_progress` INTEGER, PRIMARY KEY(`id`, `subscriptionId`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -156,6 +156,12 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "contentType",
+            "columnName": "contentType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
           {
             "fieldPath": "encoding",
             "columnName": "encoding",
@@ -255,11 +261,11 @@
           }
         ],
         "primaryKey": {
+          "autoGenerate": false,
           "columnNames": [
             "id",
             "subscriptionId"
-          ],
-          "autoGenerate": false
+          ]
         },
         "indices": [],
         "foreignKeys": []
@@ -288,10 +294,10 @@
           }
         ],
         "primaryKey": {
+          "autoGenerate": false,
           "columnNames": [
             "baseUrl"
-          ],
-          "autoGenerate": false
+          ]
         },
         "indices": [],
         "foreignKeys": []
@@ -338,10 +344,10 @@
           }
         ],
         "primaryKey": {
+          "autoGenerate": true,
           "columnNames": [
             "id"
-          ],
-          "autoGenerate": true
+          ]
         },
         "indices": [],
         "foreignKeys": []
@@ -350,7 +356,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '44fc291d937fdf02b9bc2d0abb10d2e0')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '208f16743f21d9c374f1314878eb93cb')"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/src/debug/res/values/values.xml b/app/src/debug/res/values/values.xml
new file mode 100644
index 00000000..674f6be3
--- /dev/null
+++ b/app/src/debug/res/values/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">ntfy (debug)</string>
+</resources>
diff --git a/app/src/main/java/io/heckel/ntfy/backup/Backuper.kt b/app/src/main/java/io/heckel/ntfy/backup/Backuper.kt
index 89460c4b..a939fbe0 100644
--- a/app/src/main/java/io/heckel/ntfy/backup/Backuper.kt
+++ b/app/src/main/java/io/heckel/ntfy/backup/Backuper.kt
@@ -183,6 +183,7 @@ class Backuper(val context: Context) {
                     timestamp = n.timestamp,
                     title = n.title,
                     message = n.message,
+                    contentType = n.contentType,
                     encoding = n.encoding,
                     notificationId = 0,
                     priority = n.priority,
@@ -312,6 +313,7 @@ class Backuper(val context: Context) {
                 timestamp = n.timestamp,
                 title = n.title,
                 message = n.message,
+                contentType = n.contentType,
                 encoding = n.encoding,
                 priority = n.priority,
                 tags = n.tags,
@@ -386,6 +388,7 @@ data class Notification(
     val timestamp: Long,
     val title: String,
     val message: String,
+    val contentType: String, // "" or "text/markdown" (empty assumes "text/plain")
     val encoding: String, // "base64" or ""
     val priority: Int, // 1=min, 3=default, 5=max
     val tags: String,
diff --git a/app/src/main/java/io/heckel/ntfy/db/Database.kt b/app/src/main/java/io/heckel/ntfy/db/Database.kt
index f7e3a2ad..d64d8321 100644
--- a/app/src/main/java/io/heckel/ntfy/db/Database.kt
+++ b/app/src/main/java/io/heckel/ntfy/db/Database.kt
@@ -99,6 +99,7 @@ data class Notification(
     @ColumnInfo(name = "timestamp") val timestamp: Long, // Unix timestamp
     @ColumnInfo(name = "title") val title: String,
     @ColumnInfo(name = "message") val message: String,
+    @ColumnInfo(name = "contentType") val contentType: String, // "" or "text/markdown" (empty assume text/plain)
     @ColumnInfo(name = "encoding") val encoding: String, // "base64" or ""
     @ColumnInfo(name = "notificationId") val notificationId: Int, // Android notification popup ID
     @ColumnInfo(name = "priority", defaultValue = "3") val priority: Int, // 1=min, 3=default, 5=max
@@ -110,6 +111,10 @@ data class Notification(
     @ColumnInfo(name = "deleted") val deleted: Boolean,
 )
 
+fun Notification.isMarkdown(): Boolean {
+    return contentType == "text/markdown"
+}
+
 @Entity
 data class Attachment(
     @ColumnInfo(name = "name") val name: String, // Filename
diff --git a/app/src/main/java/io/heckel/ntfy/msg/BroadcastService.kt b/app/src/main/java/io/heckel/ntfy/msg/BroadcastService.kt
index 6ad65b26..fb7f6d47 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/BroadcastService.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/BroadcastService.kt
@@ -28,6 +28,7 @@ class BroadcastService(private val ctx: Context) {
         intent.putExtra("message", decodeMessage(notification))
         intent.putExtra("message_bytes", decodeBytesMessage(notification))
         intent.putExtra("message_encoding", notification.encoding)
+        intent.putExtra("content_type", notification.contentType)
         intent.putExtra("tags", notification.tags)
         intent.putExtra("tags_map", joinTagsMap(splitTags(notification.tags)))
         intent.putExtra("priority", notification.priority)
diff --git a/app/src/main/java/io/heckel/ntfy/msg/Message.kt b/app/src/main/java/io/heckel/ntfy/msg/Message.kt
index 8de0ab85..b34965f2 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/Message.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/Message.kt
@@ -1,6 +1,7 @@
 package io.heckel.ntfy.msg
 
 import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
 
 /* This annotation ensures that proguard still works in production builds,
  * see https://stackoverflow.com/a/62753300/1440785 */
@@ -17,6 +18,7 @@ data class Message(
     val actions: List<MessageAction>?,
     val title: String?,
     val message: String,
+    @SerializedName("content_type") val contentType: String?,
     val encoding: String?,
     val attachment: MessageAttachment?,
 )
diff --git a/app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt b/app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt
index 81a60dba..5af07418 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt
@@ -57,6 +57,7 @@ class NotificationParser {
             timestamp = message.time,
             title = message.title ?: "",
             message = message.message,
+            contentType = message.contentType ?: "",
             encoding = message.encoding ?: "",
             priority = toPriority(message.priority),
             tags = joinTags(message.tags),
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 eec1e59b..48067073 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
@@ -11,6 +11,8 @@ import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.text.SpannedString
+import android.text.style.CharacterStyle
 import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
@@ -26,6 +28,7 @@ import java.util.*
 class NotificationService(val context: Context) {
     private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
     private val repository = Repository.getInstance(context)
+    private val markwon = MarkwonFactory.createForNotification(context)
 
     fun display(subscription: Subscription, notification: Notification) {
         Log.d(TAG, "Displaying notification $notification")
@@ -147,7 +150,7 @@ class NotificationService(val context: Context) {
             try {
                 val attachmentBitmap = contentUri.readBitmapFromUri(context)
                 builder
-                    .setContentText(maybeAppendActionErrors(formatMessage(notification), notification))
+                    .setContentText(maybeAppendActionErrors(maybeMarkdown(formatMessage(notification), notification), notification))
                     .setLargeIcon(attachmentBitmap)
                     .setStyle(NotificationCompat.BigPictureStyle()
                         .bigPicture(attachmentBitmap)
@@ -167,8 +170,8 @@ class NotificationService(val context: Context) {
         }
     }
 
-    private fun formatMessageMaybeWithAttachmentInfos(notification: Notification): String {
-        val message = formatMessage(notification)
+    private fun formatMessageMaybeWithAttachmentInfos(notification: Notification): CharSequence {
+        val message = maybeMarkdown(formatMessage(notification), notification)
         val attachment = notification.attachment ?: return message
         val attachmentInfos = if (attachment.size != null) {
             "${attachment.name}, ${formatBytes(attachment.size)}"
@@ -514,6 +517,13 @@ class NotificationService(val context: Context) {
         }
     }
 
+    private fun maybeMarkdown(message: String, notification: Notification): CharSequence {
+        if (notification.contentType == "text/markdown") {
+            return markwon.toMarkdown(message)
+        }
+        return message
+    }
+
     companion object {
         const val ACTION_VIEW = "view"
         const val ACTION_HTTP = "http"
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 0b568038..0643b88e 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/DetailAdapter.kt
@@ -9,6 +9,8 @@ import android.net.Uri
 import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
+import android.text.method.LinkMovementMethod
+import android.text.util.Linkify
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -33,20 +35,23 @@ import io.heckel.ntfy.msg.DownloadType
 import io.heckel.ntfy.msg.NotificationService
 import io.heckel.ntfy.msg.NotificationService.Companion.ACTION_VIEW
 import io.heckel.ntfy.util.*
+import io.noties.markwon.Markwon
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import me.saket.bettermovementmethod.BetterLinkMovementMethod
 
 class DetailAdapter(private val activity: Activity, private val lifecycleScope: CoroutineScope, private val repository: Repository, private val onClick: (Notification) -> Unit, private val onLongClick: (Notification) -> Unit) :
     ListAdapter<Notification, DetailAdapter.DetailViewHolder>(TopicDiffCallback) {
+    private val markwon: Markwon = MarkwonFactory.createForMessage(activity)
     val selected = mutableSetOf<String>() // Notification IDs
 
     /* Creates and inflates view and return TopicViewHolder. */
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DetailViewHolder {
         val view = LayoutInflater.from(parent.context)
             .inflate(R.layout.fragment_detail_item, parent, false)
-        return DetailViewHolder(activity, lifecycleScope, repository, view, selected, onClick, onLongClick)
+        return DetailViewHolder(activity, lifecycleScope, repository, markwon, view, selected, onClick, onLongClick)
     }
 
     /* Gets current topic and uses it to bind view. */
@@ -73,7 +78,16 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
     }
 
     /* ViewHolder for Topic, takes in the inflated view and the onClick behavior. */
-    class DetailViewHolder(private val activity: Activity, private val lifecycleScope: CoroutineScope, private val repository: Repository, itemView: View, private val selected: Set<String>, val onClick: (Notification) -> Unit, val onLongClick: (Notification) -> Unit) :
+    class DetailViewHolder(
+        private val activity: Activity,
+        private val lifecycleScope: CoroutineScope,
+        private val repository: Repository,
+        private val markwon: Markwon,
+        itemView: View,
+        private val selected: Set<String>,
+        val onClick: (Notification) -> Unit,
+        val onLongClick: (Notification) -> Unit
+    ) :
         RecyclerView.ViewHolder(itemView) {
         private var notification: Notification? = null
         private val layout: View = itemView.findViewById(R.id.detail_item_layout)
@@ -98,9 +112,17 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
 
             val context = itemView.context
             val unmatchedTags = unmatchedTags(splitTags(notification.tags))
+            val message = maybeAppendActionErrors(formatMessage(notification), notification)
 
             dateView.text = formatDateShort(notification.timestamp)
-            messageView.text = maybeAppendActionErrors(formatMessage(notification), notification)
+            if (notification.isMarkdown()) {
+                messageView.autoLinkMask = 0
+                markwon.setMarkdown(messageView, message.toString())
+            } else {
+                messageView.autoLinkMask = Linkify.WEB_URLS
+                messageView.text = message
+            }
+            messageView.movementMethod = BetterLinkMovementMethod.getInstance()
             messageView.setOnClickListener {
                 // Click & Long-click listeners on the text as well, because "autoLink=web" makes them
                 // clickable, and so we cannot rely on the underlying card to perform the action.
@@ -143,6 +165,13 @@ class DetailAdapter(private val activity: Activity, private val lifecycleScope:
             maybeRenderActions(context, notification)
         }
 
+        private fun maybeMarkdown(message: String, notification: Notification): CharSequence {
+             if (notification.isMarkdown()) {
+                return markwon.toMarkdown(message)
+            }
+            return message
+        }
+
         private fun renderPriority(context: Context, notification: Notification) {
             when (notification.priority) {
                 PRIORITY_MIN -> {
diff --git a/app/src/main/java/io/heckel/ntfy/util/MarkwonFactory.kt b/app/src/main/java/io/heckel/ntfy/util/MarkwonFactory.kt
new file mode 100644
index 00000000..a4ee0c34
--- /dev/null
+++ b/app/src/main/java/io/heckel/ntfy/util/MarkwonFactory.kt
@@ -0,0 +1,100 @@
+package io.heckel.ntfy.util
+
+import android.content.Context
+import android.graphics.Paint
+import android.graphics.Typeface
+import android.text.style.*
+import android.text.util.Linkify
+import androidx.core.content.ContextCompat
+import io.heckel.ntfy.R
+import io.noties.markwon.*
+import io.noties.markwon.core.CorePlugin
+import io.noties.markwon.core.CoreProps
+import io.noties.markwon.core.MarkwonTheme
+import io.noties.markwon.ext.strikethrough.StrikethroughPlugin
+import io.noties.markwon.image.ImagesPlugin
+import io.noties.markwon.linkify.LinkifyPlugin
+import io.noties.markwon.movement.MovementMethodPlugin
+import me.saket.bettermovementmethod.BetterLinkMovementMethod
+import org.commonmark.ext.gfm.tables.TableCell
+import org.commonmark.ext.gfm.tables.TablesExtension
+import org.commonmark.node.*
+import org.commonmark.parser.Parser
+
+internal object MarkwonFactory {
+    fun createForMessage(context: Context): Markwon {
+        val headingSizes = floatArrayOf(1.7f, 1.5f, 1.2f, 1f, .8f, .7f)
+        val bulletGapWidth = (8 * context.resources.displayMetrics.density + 0.5f).toInt()
+
+        return Markwon.builder(context)
+            .usePlugin(CorePlugin.create())
+            .usePlugin(MovementMethodPlugin.create(BetterLinkMovementMethod.getInstance()))
+            .usePlugin(ImagesPlugin.create())
+            .usePlugin(LinkifyPlugin.create(Linkify.WEB_URLS))
+            .usePlugin(StrikethroughPlugin.create())
+            .usePlugin(object : AbstractMarkwonPlugin() {
+                override fun configureTheme(builder: MarkwonTheme.Builder) {
+                    builder
+                        .linkColor(ContextCompat.getColor(context, R.color.teal))
+                        .isLinkUnderlined(true)
+                }
+
+                override fun configureConfiguration(builder: MarkwonConfiguration.Builder) {
+                    builder
+                        .linkResolver(LinkResolverDef())
+                }
+
+                override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) {
+                    builder
+                        .setFactory(Heading::class.java) { _, props: RenderProps? ->
+                            arrayOf(
+                                RelativeSizeSpan(headingSizes[CoreProps.HEADING_LEVEL.require(props!!) - 1]),
+                                StyleSpan(Typeface.BOLD)
+                            )
+                        }
+                        .setFactory(Emphasis::class.java) { _, _ -> StyleSpan(Typeface.ITALIC) }
+                        .setFactory(StrongEmphasis::class.java) { _, _ -> StyleSpan(Typeface.BOLD) }
+                        .setFactory(ListItem::class.java) { _, _ -> BulletSpan(bulletGapWidth) }
+                }
+
+            })
+            .build()
+    }
+
+    fun createForNotification(context: Context): Markwon {
+        val headingSizes = floatArrayOf(2f, 1.5f, 1.17f, 1f, .83f, .67f)
+        val bulletGapWidth = (8 * context.resources.displayMetrics.density + 0.5f).toInt()
+
+        return Markwon.builder(context)
+            .usePlugin(CorePlugin.create())
+            .usePlugin(ImagesPlugin.create())
+            .usePlugin(StrikethroughPlugin.create())
+            .usePlugin(object : AbstractMarkwonPlugin() {
+                override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) {
+                    builder
+                        .setFactory(Heading::class.java) { _, props: RenderProps? ->
+                            arrayOf(
+                                RelativeSizeSpan(headingSizes[CoreProps.HEADING_LEVEL.require(props!!) - 1]),
+                                StyleSpan(Typeface.BOLD)
+                            )
+                        }
+                        .setFactory(Emphasis::class.java) { _, _ -> StyleSpan(Typeface.ITALIC) }
+                        .setFactory(StrongEmphasis::class.java) { _, _ -> StyleSpan(Typeface.BOLD) }
+                        .setFactory(ListItem::class.java) { _, _ -> BulletSpan(bulletGapWidth) }
+                        .setFactory(Link::class.java) { _, _ -> null }
+                }
+
+                override fun configureParser(builder: Parser.Builder) {
+                    builder.extensions(setOf(TablesExtension.create()))
+                }
+
+                override fun configureVisitor(builder: MarkwonVisitor.Builder) {
+                    builder.on(TableCell::class.java) { visitor: MarkwonVisitor, node: TableCell? ->
+                        visitor.visitChildren(node!!)
+                        visitor.builder().append(' ')
+                    }
+                }
+            })
+            .build()
+    }
+}
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 1db243fe..a658a7fe 100644
--- a/app/src/main/java/io/heckel/ntfy/util/Util.kt
+++ b/app/src/main/java/io/heckel/ntfy/util/Util.kt
@@ -212,7 +212,7 @@ fun formatActionLabel(action: Action): String {
     }
 }
 
-fun maybeAppendActionErrors(message: String, notification: Notification): String {
+fun maybeAppendActionErrors(message: CharSequence, notification: Notification): CharSequence {
     val actionErrors = notification.actions
         .orEmpty()
         .mapNotNull { action -> action.error }
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
new file mode 100644
index 00000000..d9e7cee3
--- /dev/null
+++ b/app/src/main/res/values-af/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="channel_notifications_low_name">Lae prioriteit</string>
+    <string name="channel_notifications_default_name">Standaard prioriteit</string>
+    <string name="channel_notifications_high_name">Hoog prioriteit</string>
+    <string name="channel_notifications_max_name">Hoogste prioriteit</string>
+    <string name="channel_notifications_group_default_name">Verstek</string>
+    <string name="channel_subscriber_notification_title">Luister na inkomende kennisgewings</string>
+    <string name="channel_subscriber_notification_instant_text">Geskryf vir onmiddellike aflewering onderwerpe</string>
+    <string name="channel_subscriber_notification_instant_text_one">Geskryf vir een onderwerp vir onmiddellike aflewering</string>
+    <string name="channel_subscriber_notification_instant_text_three">Geskryf vir drie onderwerpe vir onmiddellike aflewering</string>
+    <string name="channel_subscriber_notification_instant_text_four">Geskryf vir vier onderwerpe vir onmiddellike aflewering</string>
+    <string name="settings_advanced_export_logs_entry_copy_original">Kopieer na knipbord</string>
+    <string name="settings_about_header">Oor</string>
+    <string name="settings_advanced_export_logs_scrub_dialog_button_ok">OK</string>
+    <string name="channel_notifications_min_name">Min prioriteit</string>
+    <string name="user_dialog_password_hint_add">Vagwoord</string>
+    <string name="user_dialog_button_add">Voeg gebruiker by</string>
+    <string name="user_dialog_button_cancel">Kanselleer</string>
+    <string name="user_dialog_button_delete">Verwyder gebruiker</string>
+    <string name="user_dialog_button_save">Bewaar</string>
+    <string name="detail_settings_about_header">Oor</string>
+    <string name="detail_settings_about_topic_url_title">Onderwerp URL</string>
+    <string name="detail_settings_about_topic_url_copied_to_clipboard_message">Gekopieer na knipbord</string>
+    <string name="user_dialog_title_edit">Wysig gebruiker</string>
+    <string name="user_dialog_description_add">Jy kan hier \'n gebruiker byvoeg. Alle onderwerpe vir die gegewe bediener sal hierdie gebruiker gebruik.</string>
+    <string name="user_dialog_description_edit">Jy kan die gebruikersnaam/wagwoord vir die gekose gebruiker wysig, of dit verwyder.</string>
+    <string name="channel_subscriber_notification_instant_text_two">Geskryf vir twee onderwerpe vir onmiddellike aflewering</string>
+    <string name="user_dialog_password_hint_edit">Wagwoord (onveranderd indien leeg gelaat)</string>
+    <string name="channel_subscriber_service_name">Subskripsiediens</string>
+    <string name="user_dialog_username_hint">Gebruikersnaam</string>
+    <string name="user_dialog_title_add">Gebruiker byvoeg</string>
+    <string name="detail_settings_appearance_display_name_title">Vertoonnaam</string>
+    <string name="settings_about_version_title">Weergawe</string>
+    <string name="settings_advanced_connection_protocol_entry_ws">WebSockets</string>
+    <string name="settings_advanced_export_logs_entry_copy_scrubbed">Kopieer na knipbord (gesensuur)</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 02c0e061..51a9b95a 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -48,7 +48,7 @@
     <string name="channel_subscriber_notification_noinstant_text_five">مشترك في خمسة مواضيع</string>
     <string name="main_menu_settings_title">الإعدادات</string>
     <string name="channel_subscriber_notification_noinstant_text_one">مشترك في موضوع واحد</string>
-    <string name="main_menu_rate_title">قيم البرنامج ⭐</string>
+    <string name="main_menu_rate_title">قيّم التطبيق ⭐</string>
     <string name="channel_subscriber_notification_instant_text_two">تم الاشتراك في 2 موضوع فوري</string>
     <string name="refresh_message_result">تم استلام %1$d اشعار(ات)</string>
     <string name="channel_subscriber_notification_noinstant_text_more">مشترك في %1$d موضوع</string>
@@ -60,7 +60,7 @@
     <string name="main_menu_notifications_disabled_until">الاشعارات مكتومة حتي %1$s</string>
     <string name="channel_subscriber_notification_instant_text_more">تم الاشتراك في %1$d مواضيع فورية</string>
     <string name="main_menu_report_bug_title">التبليغ عن خطأ</string>
-    <string name="main_action_bar_title">المواضيع المسجلة</string>
+    <string name="main_action_bar_title">الموضوعات المشترك فيها</string>
     <string name="main_action_mode_menu_unsubscribe">الغاء الاشتراك</string>
     <string name="main_menu_docs_title">اقرا المراجع</string>
     <string name="refresh_message_no_results">كل شئ محدث لاخر تحديث</string>
@@ -68,4 +68,18 @@
     <string name="channel_subscriber_notification_instant_text_four">تم الاشتراك في 4 مواضيع فورية</string>
     <string name="main_menu_donate_title">تبرع 💸</string>
     <string name="settings_title">اﻹعدادات</string>
+    <string name="refresh_message_error">تعذر تحديث %1$d اشتراكات
+\n
+\n%2$s</string>
+    <string name="refresh_message_error_one">تعذر تحديث الاشتراك: %1$s</string>
+    <string name="main_action_mode_delete_dialog_cancel">إلغاء</string>
+    <string name="main_item_status_text_one">إشعار %1$d</string>
+    <string name="main_item_status_text_not_one">%1$d إشعارات</string>
+    <string name="main_item_status_reconnecting">جارٍ إعادة الاتصال …</string>
+    <string name="main_item_status_unified_push">%1$s (UnifiedPush)</string>
+    <string name="main_item_date_yesterday">البارحة</string>
+    <string name="main_action_mode_delete_dialog_message">إلغاء الاشتراك من الموضوعات المحددة وحذف جميع الإشعارات نهائيًا؟</string>
+    <string name="main_action_mode_delete_dialog_permanently_delete">حذف نهائيًا</string>
+    <string name="main_add_button_description">إضافة اشتراك</string>
+    <string name="main_no_subscriptions_text">يبدو أنه ليس لديك أي اشتراكات حتى الآن.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index ab565a0e..270da1d4 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -8,4 +8,5 @@
     <string name="channel_notifications_high_name">বেশি গুরুত্ব</string>
     <string name="channel_subscriber_notification_title">আগত নোটিফিকেশন এর জন্য অপেক্ষা করা হচ্ছে</string>
     <string name="channel_subscriber_notification_instant_text">তাত্ক্ষণিক পাওয়া বিষয়গুলোতে যোগ দেওয়া হয়েছে</string>
+    <string name="user_dialog_button_add">ব্যবহারকারী যোগ করুন</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
new file mode 100644
index 00000000..81be57f2
--- /dev/null
+++ b/app/src/main/res/values-et/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="main_menu_settings_title">Seadistused</string>
+    <string name="refresh_message_no_results">Kõik on uuendatud</string>
+    <string name="refresh_message_result">%1$d teavitus(t) vastu võetud</string>
+    <string name="main_menu_report_bug_title">Teata vigadest</string>
+    <string name="main_menu_docs_title">Loe dokumentatsiooni</string>
+    <string name="main_menu_rate_title">Hinda rakendust ⭐</string>
+    <string name="main_menu_donate_title">Toeta arendajat 💸</string>
+    <string name="main_action_mode_delete_dialog_permanently_delete">Kustuta jäädavalt</string>
+    <string name="main_item_status_text_not_one">%1$d teavitust</string>
+    <string name="main_item_status_unified_push">%1$s (UnifiedPush)</string>
+    <string name="main_item_date_yesterday">eile</string>
+    <string name="main_add_button_description">Lisa tellimus</string>
+    <string name="main_no_subscriptions_text">Tundub, et sul pole veel ühtegi tellimust.</string>
+    <string name="main_how_to_link">Üksikasjalikud juhendid leiduvad meie saidis ntfy.sh ja dokumentatsioonis.</string>
+    <string name="main_unified_push_toast">Seda tellimust haldab %1$s UnifiedPushi vahendusel</string>
+    <string name="main_action_mode_menu_unsubscribe">Lõpeta tellimus</string>
+    <string name="main_action_mode_delete_dialog_cancel">Katkesta</string>
+    <string name="main_item_status_text_one">%1$d teavitus</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 11dce309..319921e0 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -40,14 +40,14 @@
     <string name="main_how_to_intro">לחיצה על + תאפשר ליצור או להירשם לנושא. לאחר מכן התראות תגענה למכשיר שלך בעת שליחת הודעות עם PUT או POST.</string>
     <string name="main_how_to_link">הוראות מפורטות זמינות ב־ntfy.sh, ובתיעוד.</string>
     <string name="main_menu_donate_title">תרומה 💸</string>
-    <string name="channel_subscriber_notification_instant_text_two">מנוי לשני נושאים במשלוח מהיר</string>
-    <string name="channel_subscriber_notification_instant_text_three">מנוי לשלושה נושאים במשלוח מהיר</string>
-    <string name="channel_subscriber_notification_instant_text">מנוי לנושאים במשלוח מהיר</string>
-    <string name="channel_subscriber_notification_instant_text_one">מנוי לנושא אחד במשלוח מהיר</string>
-    <string name="channel_subscriber_notification_instant_text_four">מנוי לארבעה נושאים במשלוח מהיר</string>
-    <string name="channel_subscriber_notification_instant_text_five">מנוי לחמישה נושאים במשלוח מהיר</string>
-    <string name="channel_subscriber_notification_instant_text_six">מנוי לשישה נושאים במשלוח מהיר</string>
-    <string name="channel_subscriber_notification_instant_text_more">מנוי ל־%1$d נושאים במשלוח מהיר</string>
+    <string name="channel_subscriber_notification_instant_text_two">מנוי לשני נושאים במסירה מיידית</string>
+    <string name="channel_subscriber_notification_instant_text_three">מנוי לשלושה נושאים במסירה מיידית</string>
+    <string name="channel_subscriber_notification_instant_text">מנוי לנושאים במסירה מיידית</string>
+    <string name="channel_subscriber_notification_instant_text_one">מנוי לנושא אחד במסירה מיידית</string>
+    <string name="channel_subscriber_notification_instant_text_four">מנוי לארבעה נושאים במסירה מיידית</string>
+    <string name="channel_subscriber_notification_instant_text_five">מנוי לחמישה נושאים במסירה מיידית</string>
+    <string name="channel_subscriber_notification_instant_text_six">מנוי לשישה נושאים במסירה מיידית</string>
+    <string name="channel_subscriber_notification_instant_text_more">מנוי ל־%1$d נושאים במסירה מיידית</string>
     <string name="channel_subscriber_notification_noinstant_text">מנוי לנושאים</string>
     <string name="channel_subscriber_notification_noinstant_text_one">מנוי לנושא אחד</string>
     <string name="channel_subscriber_notification_noinstant_text_two">מנוי לשני נושאים</string>
@@ -60,7 +60,7 @@
     <string name="main_banner_websocket_button_enable_now">להפעיל כעת</string>
     <string name="add_dialog_topic_name_hint">שם הנושא, למשל: shimons_alerts</string>
     <string name="add_dialog_use_another_server">להשתמש בשרת אחר</string>
-    <string name="add_dialog_instant_delivery">משלוח מיידי במצב תנומה</string>
+    <string name="add_dialog_instant_delivery">מסירה מיידית במצב תנומה</string>
     <string name="main_banner_websocket_button_dismiss">התעלמות</string>
     <string name="add_dialog_title">הרשמה לנושא</string>
     <string name="main_item_status_unified_push">%1$s (UnifiedPush)</string>
@@ -312,4 +312,35 @@
 \n%3$s</string>
     <string name="detail_item_cannot_open_apk">אי אפשר להתקין עוד יישומונים. יש להוריד דרך הדפדפן במקום. בתקלה #531 מופיעים פרטים נוספים.</string>
     <string name="detail_settings_global_setting_suffix">נעשה שימוש בהגדרות גלובליות</string>
+    <string name="settings_notifications_insistent_max_priority_summary_enabled">העדיפות המרבית שבה הודעות יתריעו במחזוריות עד שתגורשנה</string>
+    <string name="add_dialog_foreground_description">מסירה מיידית תמיד פעילה למארחים למעט %1$s.</string>
+    <string name="detail_settings_notifications_instant_summary_off">התראות נמסרות דרך Firebase. המסירה עלולה להתעכב אך צריכת הסוללה תפחת.</string>
+    <string name="detail_instant_delivery_enabled">מסירה מיידית פעילה</string>
+    <string name="detail_instant_delivery_disabled">מסירה מיידית כבויה</string>
+    <string name="settings_general_default_base_url_message">נא למלא את כתובת היסוד של השרת שלך כדי להשתמש בשרת משלך כברירת מחדל להרשמה לנושאים חדשים ו/או לשיתוף לנושאים.</string>
+    <string name="detail_menu_enable_instant">הפעלת מסירה מיידית</string>
+    <string name="detail_menu_disable_instant">כיבוי מסירה מיידית</string>
+    <string name="settings_advanced_record_logs_summary_enabled">מתבצע תיעוד (עד 10,000 רשומות) למכשיר…</string>
+    <string name="detail_settings_notifications_instant_title">מסירה מיידית</string>
+    <string name="detail_settings_notifications_instant_summary_on">הודעות נמסרות מיידית. דורש שירות חזית וצורך יותר סוללה.</string>
+    <string name="settings_advanced_clear_logs_summary">מחיקת יומנים שתועדו בעבר ולהתחיל מחדש</string>
+    <string name="settings_advanced_record_logs_summary_disabled">הפעלת תיעוד כדי לאפשר לך לשתף יומנים לאחר מכן לניתוח תקלות.</string>
+    <string name="settings_advanced_export_logs_summary">העתקת יומנים ללוח הגזירים או העלאתם ל־nopaste.net (בבעלות יוצר ntfy). אפשר לצנזר שמות מארחים ונושאים, התראות לא תצונזרנה אף פעם.</string>
+    <string name="settings_advanced_unifiedpush_summary_disabled">ntfy לא יתנהג כמו מפיץ UnifiedPush</string>
+    <string name="settings_notifications_insistent_max_priority_summary_disabled">עדיפות מרבית להתראות חד־פעמיות</string>
+    <string name="detail_settings_global_setting_title">להשתמש בהגדרות הכלליות</string>
+    <string name="settings_advanced_record_logs_title">יומני רשומות</string>
+    <string name="settings_advanced_export_logs_scrub_dialog_text">הנושאים/המארחים האלה הוחלפו בשמות של פירות, כך שאפשר לשנות את היומן הזה בלי חשש:
+\n
+\n%1$s
+\n
+\nהסיסמאות מעורבבות אבל לא מופיעות כאן.</string>
+    <string name="settings_advanced_connection_protocol_summary_ws">להשתמש ב־WebSockets כדי להתחבר לשרת. זאת השיטה המומלצת אבל עלולה לדרוש הגדרות נוספות במתווך שלך.</string>
+    <string name="detail_settings_notifications_open_channels_summary">עקיפת „לא להפריע”, צלילים וכו׳</string>
+    <string name="settings_advanced_export_logs_scrub_dialog_empty">לא השתנו נושאים/שמות מארחים. אולי אין לך מינויים?</string>
+    <string name="settings_advanced_connection_protocol_summary_jsonhttp">להשתמש בתזרים JSON על גבי HTTP כדי להתחבר לשרת. השיטה הזאת נבדקה תחת אש אבל עלולה לצרוך יותר חשמל מהסוללה.</string>
+    <string name="detail_settings_notifications_dedicated_channels_title">הגדרות התראה מותאמות אישית</string>
+    <string name="detail_settings_notifications_dedicated_channels_summary_off">נעשה שימוש בהגדרות ברירת המחדל (צלילים, עקיפת „לא להפריע” וכו׳)</string>
+    <string name="detail_settings_notifications_dedicated_channels_summary_on">נעשה שימוש בהגדרות מותאמות אישית למינוי הזה</string>
+    <string name="detail_settings_appearance_display_name_message">הגדרת שם תצוגה מותאם אישית למינוי הזה. להשאיר ריק לברירת המחדל (%1$s).</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
new file mode 100644
index 00000000..a6b3daec
--- /dev/null
+++ b/app/src/main/res/values-ms/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7386aeca..4f545226 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -6,19 +6,19 @@
     <string name="notification_dialog_show_all">Mostrar todas notificações</string>
     <string name="channel_subscriber_notification_instant_text_three">Inscrito em três tópicos de entrega instantânea</string>
     <string name="channel_subscriber_notification_instant_text_four">Inscrito em quatro tópicos de entrega instantânea</string>
-    <string name="channel_notifications_default_name">Notificações (prioridade padrão)</string>
-    <string name="channel_notifications_min_name">Notificações (prioridade mínima)</string>
+    <string name="channel_notifications_default_name">Prioridade padrão</string>
+    <string name="channel_notifications_min_name">Prioridade mínima</string>
     <string name="main_menu_notifications_enabled">Notificações ativadas</string>
     <string name="main_menu_settings_title">Configurações</string>
     <string name="channel_subscriber_notification_noinstant_text">Inscrito em tópicos</string>
     <string name="channel_subscriber_notification_noinstant_text_three">Inscrito em três tópicos</string>
     <string name="main_menu_report_bug_title">Relatar um problema</string>
-    <string name="main_item_status_reconnecting">Reconectando …</string>
-    <string name="channel_notifications_high_name">Notificações (prioridade alta)</string>
-    <string name="channel_notifications_max_name">Notificações (prioridade máxima)</string>
-    <string name="channel_subscriber_service_name">Serviço de Assinatura</string>
-    <string name="channel_subscriber_notification_title">Aguardando notificações</string>
-    <string name="channel_subscriber_notification_instant_text">Inscrito em temas de entrega instantânea</string>
+    <string name="main_item_status_reconnecting">reconectando …</string>
+    <string name="channel_notifications_high_name">Prioridade alta</string>
+    <string name="channel_notifications_max_name">Prioridade máxima</string>
+    <string name="channel_subscriber_service_name">Serviço de Inscrição</string>
+    <string name="channel_subscriber_notification_title">Aguardando por novas notificações</string>
+    <string name="channel_subscriber_notification_instant_text">Inscrito em tópicos de entrega instantânea</string>
     <string name="channel_subscriber_notification_instant_text_one">Inscrito em um tópico de entrega instantânea</string>
     <string name="channel_subscriber_notification_instant_text_more">Inscrito em %1$d tópicos de entrega instantânea</string>
     <string name="channel_subscriber_notification_noinstant_text_two">Inscrito em dois tópicos</string>
@@ -29,45 +29,45 @@
     <string name="refresh_message_error">Não foi possível atualizar %1$d subscrições
 \n
 \n%2$s</string>
-    <string name="main_action_bar_title">Temas inscritos</string>
+    <string name="main_action_bar_title">Tópicos inscritos</string>
     <string name="main_menu_notifications_disabled_until">Notificações silenciadas até %1$s</string>
-    <string name="main_menu_rate_title">Avalie o aplicativo ⭐</string>
-    <string name="main_action_mode_delete_dialog_message">Cancelar inscrição dos tópicos selecionados e remover permanentemente todas notificações\?</string>
-    <string name="main_action_mode_delete_dialog_permanently_delete">Remover permanentemente</string>
+    <string name="main_menu_rate_title">Avalie o app ⭐</string>
+    <string name="main_action_mode_delete_dialog_message">Desinscrever dos tópicos selecionados e excluir permanentemente todas notificações?</string>
+    <string name="main_action_mode_delete_dialog_permanently_delete">Excluir permanentemente</string>
     <string name="main_action_mode_delete_dialog_cancel">Cancelar</string>
     <string name="main_item_date_yesterday">ontem</string>
-    <string name="main_add_button_description">Adicionar Subscrição</string>
-    <string name="main_no_subscriptions_text">Parece que você não tem nenhuma inscrição ainda.</string>
-    <string name="main_how_to_link">Instruções detalhadas disponíveis em ntfy.sh, e na documentação.</string>
-    <string name="main_banner_battery_text">O modo Economia de Energia deve estar desligado para evitar problemas de entrega de notificação no aplicativo.</string>
-    <string name="main_item_status_unified_push">%1$s(UnifiedPush)</string>
+    <string name="main_add_button_description">Adicionar inscrição</string>
+    <string name="main_no_subscriptions_text">Parece que você ainda não tem nenhuma inscrição.</string>
+    <string name="main_how_to_link">Instruções detalhadas estão disponíveis em ntfy.sh, e na documentação.</string>
+    <string name="main_banner_battery_text">A otimização de bateria deve ser desativada para este app para evitar problemas com a entrega de notificações.</string>
+    <string name="main_item_status_unified_push">%1$s (UnifiedPush)</string>
     <string name="main_banner_websocket_button_remind_later">Perguntar depois</string>
     <string name="main_banner_websocket_button_dismiss">Dispensar</string>
-    <string name="add_dialog_title">Inscrever-se no tópico</string>
-    <string name="add_dialog_description_below">Os tópicos podem não ser protegidos por senha, escolha um nome difícil de adivinhar. Uma vez inscrito, você pode usar as notificações PUT/POST.</string>
+    <string name="add_dialog_title">Inscrever-se em tópico</string>
+    <string name="add_dialog_description_below">Os tópicos podem não ser protegidos por senha, então escolha um nome difícil de adivinhar. Após se inscrever, você poderá enviar notificações via PUT/POST.</string>
     <string name="add_dialog_topic_name_hint">Nome do tópico, ex: alertas_jose</string>
     <string name="add_dialog_use_another_server">Usar outro servidor</string>
-    <string name="add_dialog_use_another_server_description">Insira as URLs do servidor abaixo para inscrever-se nos tópicos de outros servidores.</string>
-    <string name="add_dialog_foreground_description">Entrega instantânea está sempre ligada para hosts, exceto %1$s.</string>
+    <string name="add_dialog_use_another_server_description">Insira abaixo as URLs do serviço para inscrever-se em tópicos de outros servidores.</string>
+    <string name="add_dialog_foreground_description">Entrega instantânea está sempre ligada para hosts, exceto por %1$s.</string>
     <string name="add_dialog_button_back">Voltar</string>
     <string name="add_dialog_error_connection_failed">Conexão falhou: %1$s</string>
     <string name="add_dialog_login_title">Login necessário</string>
     <string name="add_dialog_login_username_hint">Nome de usuário</string>
     <string name="add_dialog_login_error_not_authorized">Login falhou. Usuário %1$s não autorizado.</string>
     <string name="add_dialog_login_new_user">Novo usuário</string>
-    <string name="detail_no_notifications_text">Você não recebeu nenhuma notificação desse tópico ainda.</string>
-    <string name="detail_how_to_example">Exemplo (usando curl): <br/><tt>$ curl -d \"Oi\" %1$s</tt></string>
-    <string name="detail_clear_dialog_message">Apagar todas as notificações desse tópico\?</string>
-    <string name="detail_clear_dialog_permanently_delete">Apagar permanentemente</string>
-    <string name="detail_delete_dialog_message">Cancelar inscrição desse tema e apagar todas as notificações recebidas\?</string>
+    <string name="detail_no_notifications_text">Você ainda não recebeu nenhuma notificação desse tópico.</string>
+    <string name="detail_how_to_example">Exemplo (usando curl):<br/><tt>$ curl -d \"Oi\" %1$s</tt></string>
+    <string name="detail_clear_dialog_message">Excluir todas as notificações desse tópico?</string>
+    <string name="detail_clear_dialog_permanently_delete">Excluir permanentemente</string>
+    <string name="detail_delete_dialog_message">Desinscrever desse tópico e excluir todas as notificações recebidas?</string>
     <string name="detail_delete_dialog_cancel">Cancelar</string>
     <string name="detail_test_title">Teste: Você pode definir um título se quiser.</string>
-    <string name="detail_test_message">Essa é uma notificação de teste do aplicativo para Android ntfy. Nível de prioridade %1$d. Se você enviar outra, pode parecer diferente.</string>
+    <string name="detail_test_message">Essa é uma notificação de teste do app ntfy para Android. Tem uma prioridade de %1$d. Se você enviar outra, pode parecer diferente.</string>
     <string name="detail_test_message_error">Não foi possível enviar mensagem: %1$s</string>
     <string name="detail_test_message_error_unauthorized_user">Não foi possível enviar mensagem: Usuário \"%1$s\" não autorizado.</string>
     <string name="detail_test_message_error_too_large">Não foi possível enviar mensagem: O anexo é muito grande.</string>
     <string name="detail_item_menu_open">Abrir arquivo</string>
-    <string name="detail_item_menu_delete">Apagar arquivo</string>
+    <string name="detail_item_menu_delete">Excluir arquivo</string>
     <string name="detail_item_menu_cancel">Cancelar download</string>
     <string name="detail_item_menu_save_file">Salvar arquivo</string>
     <string name="detail_item_menu_copy_url">Copiar URL</string>
@@ -78,35 +78,35 @@
     <string name="detail_item_cannot_download">Não foi possível abrir ou baixar o anexo. O link expirou e nenhum arquivo local foi encontrado.</string>
     <string name="detail_item_cannot_open_url">Não foi possível abrir a URL: %1$s</string>
     <string name="detail_item_cannot_save">Não foi possível salvar o anexo: %1$s</string>
-    <string name="detail_item_cannot_delete">Não foi possível remover o anexo: %1$s</string>
+    <string name="detail_item_cannot_delete">Não foi possível excluir o anexo: %1$s</string>
     <string name="detail_item_download_failed">Não foi possível baixar o anexo: %1$s</string>
     <string name="detail_item_download_info_not_downloaded">não baixado</string>
     <string name="detail_item_download_info_not_downloaded_expired">não baixado, link expirou</string>
     <string name="detail_item_download_info_not_downloaded_expires_x">não baixado, expira em %1$s</string>
-    <string name="detail_item_download_info_deleted_expired">apagado, link expirou</string>
+    <string name="detail_item_download_info_deleted_expired">excluído, link expirou</string>
     <string name="detail_item_download_info_download_failed_expired">download falhou, link expirou</string>
     <string name="detail_menu_notifications_disabled_forever">Notificações silenciadas</string>
     <string name="detail_menu_notifications_disabled_until">Notificações silenciadas até %1$s</string>
     <string name="detail_menu_enable_instant">Habilitar entrega instantânea</string>
     <string name="detail_menu_clear">Limpar todas notificações</string>
     <string name="detail_menu_settings">Configurações de inscrição</string>
-    <string name="detail_menu_unsubscribe">Cancelar inscrição</string>
+    <string name="detail_menu_unsubscribe">Desinscrever</string>
     <string name="detail_action_mode_menu_copy">Copiar</string>
-    <string name="detail_action_mode_menu_delete">Apagar</string>
-    <string name="detail_action_mode_delete_dialog_message">Apagar as notificações selecionadas permanentemente\?</string>
-    <string name="detail_action_mode_delete_dialog_permanently_delete">Apagar permanentemente</string>
+    <string name="detail_action_mode_menu_delete">Excluir</string>
+    <string name="detail_action_mode_delete_dialog_message">Excluir as notificações selecionadas permanentemente?</string>
+    <string name="detail_action_mode_delete_dialog_permanently_delete">Excluir permanentemente</string>
     <string name="detail_action_mode_delete_dialog_cancel">Cancelar</string>
-    <string name="detail_settings_title">Configurações de inscrição</string>
+    <string name="detail_settings_title">Configurações da inscrição</string>
     <string name="share_title">Compartilhar</string>
     <string name="share_menu_send">Compartilhar</string>
     <string name="share_content_title">Pré-visualização da mensagem</string>
-    <string name="share_content_text_hint">Adicionar conteúdo para compartilhar</string>
+    <string name="share_content_text_hint">Adicione conteúdo à compartilhar aqui</string>
     <string name="share_content_image_text">Uma imagem foi compartilhada com você</string>
     <string name="share_content_image_error">Não foi possível ler a imagem: %1$s</string>
     <string name="share_content_file_text">Um arquivo foi compartilhado com você</string>
     <string name="share_content_file_error">Não foi possível ler as informações do arquivo: %1$s</string>
     <string name="share_topic_title">Compartilhar para</string>
-    <string name="share_suggested_topics">Temas sugeridos</string>
+    <string name="share_suggested_topics">Tópicos sugeridos</string>
     <string name="share_successful">Mensagem publicada</string>
     <string name="notification_dialog_cancel">Cancelar</string>
     <string name="notification_dialog_save">Salvar</string>
@@ -114,7 +114,7 @@
     <string name="notification_dialog_30min">30 minutos</string>
     <string name="notification_dialog_1h">1 hora</string>
     <string name="notification_dialog_2h">2 horas</string>
-    <string name="notification_dialog_forever">Até retomadas</string>
+    <string name="notification_dialog_forever">Até serem retomadas</string>
     <string name="notification_popup_action_open">Abrir</string>
     <string name="notification_popup_action_browse">Navegar</string>
     <string name="notification_popup_action_download">Baixar</string>
@@ -127,19 +127,19 @@
     <string name="settings_notifications_muted_until_forever">Notificações silenciadas até serem retomadas</string>
     <string name="settings_notifications_min_priority_title">Prioridade mínima</string>
     <string name="settings_notifications_min_priority_summary_any">Mostrando todas notificações</string>
-    <string name="settings_notifications_min_priority_summary_x_or_higher">Mostrando notificações se a prioridade for %1$d (%2$s) ou maior</string>
-    <string name="settings_notifications_min_priority_low">Baixa prioridade ou maior</string>
+    <string name="settings_notifications_min_priority_summary_x_or_higher">Mostrar notificações se a prioridade for %1$d (%2$s) ou maior</string>
+    <string name="settings_notifications_min_priority_low">Prioridade baixa ou maior</string>
     <string name="settings_notifications_min_priority_default">Prioridade padrão ou maior</string>
     <string name="settings_notifications_auto_download_title">Baixar anexos</string>
-    <string name="settings_notifications_auto_download_summary_smaller_than_x">Baixar automaticamente anexos até %1$s</string>
-    <string name="settings_notifications_auto_download_never">Nunca baixar automaticamente nada</string>
+    <string name="settings_notifications_auto_download_summary_smaller_than_x">Baixar automaticamente anexos de até %1$s</string>
+    <string name="settings_notifications_auto_download_never">Nunca baixar nada automaticamente</string>
     <string name="settings_notifications_auto_download_always">Baixar tudo automaticamente</string>
     <string name="settings_notifications_auto_download_100k">Somente abaixo de 100 kB</string>
     <string name="settings_notifications_auto_download_5m">Somente abaixo de 5 MB</string>
     <string name="settings_notifications_auto_download_50m">Somente abaixo de 50 MB</string>
-    <string name="settings_notifications_auto_delete_title">Apagar notificações</string>
-    <string name="settings_notifications_auto_delete_summary_never">Nunca apagar notificações automaticamente</string>
-    <string name="settings_notifications_auto_delete_summary_one_day">Apagar notificações automaticamente após um dia</string>
+    <string name="settings_notifications_auto_delete_title">Excluir notificações</string>
+    <string name="settings_notifications_auto_delete_summary_never">Nunca excluir notificações automaticamente</string>
+    <string name="settings_notifications_auto_delete_summary_one_day">Excluir notificações automaticamente após um dia</string>
     <string name="settings_notifications_auto_delete_never">Nunca</string>
     <string name="settings_notifications_auto_delete_one_week">Após uma semana</string>
     <string name="settings_notifications_auto_delete_one_month">Após um mês</string>
@@ -147,66 +147,66 @@
     <string name="settings_general_default_base_url_title">Servidor padrão</string>
     <string name="settings_general_default_base_url_default_summary">%1$s (padrão)</string>
     <string name="settings_general_users_title">Gerenciar usuários</string>
-    <string name="settings_general_users_summary">Adicionar/remover usuários de temas protegidos</string>
+    <string name="settings_general_users_summary">Adicionar/remover usuários de tópicos protegidos</string>
     <string name="settings_general_users_prefs_title">Usuários</string>
-    <string name="settings_general_users_prefs_user_used_by_one">Usado pelo tema %1$s</string>
+    <string name="settings_general_users_prefs_user_used_by_one">Usado pelo tópico %1$s</string>
     <string name="settings_general_users_prefs_user_add_title">Adicionar novo usuário</string>
-    <string name="settings_general_users_prefs_user_add_summary">Criar novo usuário para um novo servidor</string>
+    <string name="settings_general_users_prefs_user_add_summary">Criar um novo usuário para um novo servidor</string>
     <string name="settings_general_dark_mode_title">Modo escuro</string>
     <string name="settings_general_dark_mode_summary_light">Modo claro ativado</string>
     <string name="settings_general_dark_mode_summary_dark">Modo escuro ativado. Você é um vampiro\?</string>
     <string name="settings_general_dark_mode_entry_system">Usar o padrão do sistema</string>
     <string name="settings_general_dark_mode_entry_light">Modo claro</string>
     <string name="settings_backup_restore_header">Backup &amp; Restauração</string>
-    <string name="settings_backup_restore_backup_title">Backup para o arquivo</string>
+    <string name="settings_backup_restore_backup_title">Fazer backup para arquivo</string>
     <string name="settings_backup_restore_backup_summary">Exportar configurações, notificações e usuários</string>
     <string name="settings_backup_restore_backup_entry_everything_no_users">Tudo, exceto usuários</string>
     <string name="settings_backup_restore_backup_entry_settings_only">Somente configurações</string>
     <string name="settings_backup_restore_backup_successful">Backup criado</string>
     <string name="settings_backup_restore_backup_failed">Backup falhou: %1$s</string>
-    <string name="settings_backup_restore_restore_title">Restaurar de um arquivo</string>
+    <string name="settings_backup_restore_restore_title">Restaurar de arquivo</string>
     <string name="settings_backup_restore_restore_summary">Importar configurações, notificações e usuários</string>
     <string name="settings_backup_restore_restore_failed">Restauração falhou: %1$s</string>
     <string name="settings_advanced_broadcast_title">Transmitir mensagens</string>
     <string name="settings_advanced_record_logs_title">Registrar logs</string>
-    <string name="settings_advanced_record_logs_summary_disabled">Ative os registros para você poder compartilhar logs para diagnosticar problemas depois.</string>
+    <string name="settings_advanced_record_logs_summary_disabled">Ative o registro dos logs para que você possa compartilhar logs para diagnosticar problemas depois.</string>
     <string name="settings_advanced_export_logs_entry_upload_original">Fazer upload e copiar link</string>
     <string name="settings_advanced_export_logs_entry_upload_scrubbed">Fazer upload e copiar link (censurado)</string>
     <string name="settings_advanced_export_logs_copied_logs">Logs copiados para a área de transferência</string>
     <string name="settings_advanced_export_logs_uploading">Fazendo upload do log …</string>
     <string name="settings_advanced_export_logs_copied_url">Logs enviados e URL copiada</string>
     <string name="settings_advanced_export_logs_error_uploading">Não foi possível fazer upload dos logs: %1$s</string>
-    <string name="settings_advanced_export_logs_scrub_dialog_text">Esses temas/hostnames foram substituídos por nomes de frutas, você pode compartilhá-los sem preocupação
+    <string name="settings_advanced_export_logs_scrub_dialog_text">Esses tópicos/nomes de host foram substituídos por nomes de frutas, você pode compartilhá-los sem preocupação
 \n
 \n%1$s
 \n
 \nSenhas foram limpas, mas não estão listadas aqui.</string>
     <string name="settings_advanced_clear_logs_title">Limpar logs</string>
-    <string name="settings_advanced_clear_logs_summary">Apagar logs registrados anteriormente e recomeçar</string>
+    <string name="settings_advanced_clear_logs_summary">Excluir logs registrados anteriormente, e recomeçar</string>
     <string name="settings_advanced_connection_protocol_title">Protocolo de conexão</string>
     <string name="settings_advanced_connection_protocol_summary_ws">Usar WebSockets para se conectar ao servidor. Este é o método recomendado, mas pode exigir configurações adicionais no seu proxy.</string>
     <string name="settings_advanced_connection_protocol_entry_jsonhttp">Stream JSON sobre HTTP</string>
-    <string name="settings_advanced_connection_protocol_entry_ws">Web Sockets</string>
+    <string name="settings_advanced_connection_protocol_entry_ws">WebSockets</string>
     <string name="settings_about_header">Sobre</string>
     <string name="settings_about_version_title">Versão</string>
     <string name="settings_about_version_format">ntfy %1$s (%2$s)</string>
     <string name="settings_about_version_copied_to_clipboard_message">Copiado para a área de transferência</string>
     <string name="user_dialog_title_add">Adicionar usuário</string>
     <string name="user_dialog_title_edit">Editar usuário</string>
-    <string name="user_dialog_description_edit">Você pode editar nome de usuário/senha para o usuário selecionado ou apagá-lo.</string>
-    <string name="user_dialog_base_url_hint">URL do servidor</string>
+    <string name="user_dialog_description_edit">Você pode editar nome de usuário/senha para o usuário selecionado ou excluí-lo.</string>
+    <string name="user_dialog_base_url_hint">URL do Serviço</string>
     <string name="user_dialog_button_add">Adicionar usuário</string>
     <string name="user_dialog_button_cancel">Cancelar</string>
-    <string name="user_dialog_button_delete">Apagar usuário</string>
-    <string name="channel_notifications_low_name">Notificações (prioridade baixa)</string>
+    <string name="user_dialog_button_delete">Excluir usuário</string>
+    <string name="channel_notifications_low_name">Prioridade baixa</string>
     <string name="channel_subscriber_notification_instant_text_two">Inscrito em dois tópicos de entrega instantânea</string>
     <string name="user_dialog_button_save">Salvar</string>
     <string name="main_item_status_text_one">%1$d notificação</string>
     <string name="channel_subscriber_notification_noinstant_text_one">Inscrito em um tópico</string>
     <string name="main_menu_notifications_disabled_forever">Notificações silenciadas</string>
-    <string name="refresh_message_error_one">Não foi possível atualizar a inscrição: %1$s</string>
+    <string name="refresh_message_error_one">Não foi possível atualizar inscrição: %1$s</string>
     <string name="main_menu_docs_title">Leia a documentação</string>
-    <string name="main_action_mode_menu_unsubscribe">Cancelar inscrição</string>
+    <string name="main_action_mode_menu_unsubscribe">Desinscrever</string>
     <string name="main_unified_push_toast">Essa inscrição é gerenciada por %1$s via UnifiedPush</string>
     <string name="main_item_status_text_not_one">%1$d notificações</string>
     <string name="main_how_to_intro">Clique no + para criar ou inscrever-se em um tópico. Em seguida você receberá notificações no seu dispositivo ao enviar mensagens via PUT ou POST.</string>
@@ -220,36 +220,36 @@
     <string name="add_dialog_button_login">Entrar</string>
     <string name="add_dialog_login_password_hint">Senha</string>
     <string name="add_dialog_login_description">Este tópico requer login. Insira um nome de usuário e senha.</string>
-    <string name="detail_item_snack_deleted">Notificação removida</string>
-    <string name="detail_how_to_intro">Para enviar notificações para esse tópico, basta usar os métodos PUT ou POST na URL do tema.</string>
-    <string name="detail_how_to_link">Instruções detalhadas disponíveis em ntfy.sh e na documentação.</string>
+    <string name="detail_item_snack_deleted">Notificação excluída</string>
+    <string name="detail_how_to_intro">Para enviar notificações para esse tópico, basta usar os métodos PUT ou POST na URL do tópico.</string>
+    <string name="detail_how_to_link">Instruções detalhadas disponíveis em ntfy.sh, e na documentação.</string>
     <string name="detail_clear_dialog_cancel">Cancelar</string>
-    <string name="detail_delete_dialog_permanently_delete">Apagar permanentemente</string>
-    <string name="detail_item_download_info_deleted_expires_x">apagado, link expira em %1$s</string>
+    <string name="detail_delete_dialog_permanently_delete">Excluir permanentemente</string>
+    <string name="detail_item_download_info_deleted_expires_x">excluído, link expira em %1$s</string>
     <string name="detail_item_download_info_download_failed_expires_x">download falhou, link expira em %1$s</string>
     <string name="detail_test_message_error_unauthorized_anon">Não foi possível enviar mensagem: Publicação anônima não permitida.</string>
     <string name="detail_copied_to_clipboard_message">Copiado para área de transferência</string>
-    <string name="detail_item_tags">Categorias: %1$s</string>
+    <string name="detail_item_tags">Etiquetas: %1$s</string>
     <string name="detail_item_cannot_open">Não foi possível abrir o anexo: %1$s</string>
     <string name="detail_menu_notifications_enabled">Notificações ativadas</string>
     <string name="detail_instant_delivery_enabled">Entrega instantânea ativada</string>
     <string name="detail_instant_delivery_disabled">Entrega instantânea desativada</string>
     <string name="detail_item_snack_undo">Desfazer</string>
     <string name="detail_item_menu_download">Baixar arquivo</string>
-    <string name="detail_item_cannot_open_not_found">Não foi possível abrir o anexo: O arquivo pode ter sido apagado ou nenhum aplicativo instalado pode abri-lo.</string>
+    <string name="detail_item_cannot_open_not_found">Não foi possível abrir o anexo: O arquivo pode ter sido excluído ou nenhum app instalado pode abri-lo.</string>
     <string name="detail_item_download_info_downloading_x_percent">%1$d%% baixado</string>
-    <string name="detail_item_download_info_deleted">apagado</string>
+    <string name="detail_item_download_info_deleted">excluído</string>
     <string name="detail_item_download_info_download_failed">download falhou</string>
     <string name="settings_advanced_export_logs_entry_copy_scrubbed">Copiar para área de transferência (censurado)</string>
     <string name="settings_advanced_export_logs_title">Copiar/enviar logs</string>
-    <string name="settings_advanced_export_logs_summary">Copiar logs para a área de transferência ou enviar para nopaste.net (propriedade do autor do ntfy). Hostnames e temas podem ser censurados, notificações nunca serão.</string>
-    <string name="settings_advanced_export_logs_scrub_dialog_empty">Nenhum tema/hostname foram censurados. Talvez você não tenha inscrições\?</string>
-    <string name="settings_advanced_clear_logs_deleted_toast">Logs apagados</string>
+    <string name="settings_advanced_export_logs_summary">Copie os logs para a área de transferência ou envie para nopaste.net (propriedade do autor do ntfy). Nomes de host e temas podem ser censurados, notificações nunca serão.</string>
+    <string name="settings_advanced_export_logs_scrub_dialog_empty">Nenhum tópico/nome de host foi censurado. Talvez você não tenha inscrições?</string>
+    <string name="settings_advanced_clear_logs_deleted_toast">Logs excluídos</string>
     <string name="settings_advanced_export_logs_entry_copy_original">Copiar para área de transferência</string>
-    <string name="settings_advanced_connection_protocol_summary_jsonhttp">Usar um stream JSON via HTTP para conectar ao servidor. Esse método já funciona bem mas pode consumir mais bateria.</string>
-    <string name="user_dialog_description_add">Você pode adicionar um usuário aqui. Todos os temas para esse servidor usarão esse usuário.</string>
+    <string name="settings_advanced_connection_protocol_summary_jsonhttp">Usar um stream JSON via HTTP para conectar ao servidor. Esse método já é bem testado, mas pode consumir mais bateria.</string>
+    <string name="user_dialog_description_add">Você pode adicionar um usuário aqui. Todos os tópicos para esse servidor usarão esse usuário.</string>
     <string name="user_dialog_username_hint">Nome de usuário</string>
-    <string name="user_dialog_password_hint_edit">Senha (não será modificado se deixado em branco)</string>
+    <string name="user_dialog_password_hint_edit">Senha (não será modificada se deixada em branco)</string>
     <string name="settings_advanced_export_logs_scrub_dialog_button_ok">OK</string>
     <string name="notification_dialog_title">Silenciar notificações</string>
     <string name="notification_dialog_enabled_toast_message">Notificações retomadas</string>
@@ -263,11 +263,11 @@
     <string name="notification_popup_file_download_failed">%1$s
 \nArquivo: %2$s, download falhou</string>
     <string name="settings_notifications_muted_until_show_all">Mostrando todas notificações</string>
-    <string name="settings_notifications_min_priority_summary_max">Mostrando notificações se a prioridade for 5 (máximo)</string>
+    <string name="settings_notifications_min_priority_summary_max">Mostrar notificações se a prioridade for 5 (máximo)</string>
     <string name="settings_notifications_muted_until_title">Silenciar notificações</string>
     <string name="settings_notifications_min_priority_min">Qualquer prioridade</string>
     <string name="settings_notifications_min_priority_high">Prioridade alta ou maior</string>
-    <string name="settings_notifications_min_priority_max">Somente prioridade máxima</string>
+    <string name="settings_notifications_min_priority_max">Somente de prioridade máxima</string>
     <string name="settings_notifications_auto_download_summary_always">Baixar automaticamente todos anexos</string>
     <string name="settings_notifications_auto_download_summary_never">Nunca baixar automaticamente anexos</string>
     <string name="settings_notifications_auto_download_500k">Somente abaixo de 500 kB</string>
@@ -275,24 +275,24 @@
     <string name="settings_notifications_auto_download_1m">Somente abaixo de 1 MB</string>
     <string name="settings_notifications_auto_download_10m">Somente abaixo de 10 MB</string>
     <string name="settings_notifications_auto_delete_three_days">Após 3 dias</string>
-    <string name="settings_general_users_prefs_user_used_by_many">Usado pelos temas %1$s</string>
+    <string name="settings_general_users_prefs_user_used_by_many">Usado pelos tópicos %1$s</string>
     <string name="settings_notifications_auto_delete_one_day">Após um dia</string>
     <string name="settings_general_users_prefs_user_add">Adicionar usuários</string>
-    <string name="settings_notifications_auto_delete_summary_three_days">Apagar notificações automaticamente após 3 dias</string>
-    <string name="settings_notifications_auto_delete_summary_one_week">Apagar notificações automaticamente após uma semana</string>
-    <string name="settings_notifications_auto_delete_summary_three_months">Apagar notificações automaticamente após 3 meses</string>
-    <string name="settings_notifications_auto_delete_summary_one_month">Apagar notificações automaticamente após um mês</string>
+    <string name="settings_notifications_auto_delete_summary_three_days">Excluir notificações automaticamente após 3 dias</string>
+    <string name="settings_notifications_auto_delete_summary_one_week">Excluir notificações automaticamente após uma semana</string>
+    <string name="settings_notifications_auto_delete_summary_three_months">Excluir notificações automaticamente após 3 meses</string>
+    <string name="settings_notifications_auto_delete_summary_one_month">Excluir notificações automaticamente após um mês</string>
     <string name="user_dialog_password_hint_add">Senha</string>
-    <string name="settings_general_default_base_url_message">Insira a URL raiz de seu servidor, para usar seu próprio servidor como padrão ao inscrever-se em novos temas e/ou compartilhar aos temas.</string>
-    <string name="settings_general_users_prefs_user_not_used">Não usado por nenhum tema</string>
+    <string name="settings_general_default_base_url_message">Insira a URL raiz do seu servidor para usar seu próprio servidor como padrão ao inscrever-se em novos tópicos e/ou compartilhar aos tópicos.</string>
+    <string name="settings_general_users_prefs_user_not_used">Não usado por nenhum tópico</string>
     <string name="settings_backup_restore_restore_successful">Restauração bem-sucedida</string>
     <string name="settings_general_dark_mode_summary_system">Usando o padrão do sistema</string>
     <string name="settings_general_dark_mode_entry_dark">Modo escuro</string>
     <string name="settings_backup_restore_backup_entry_everything">Tudo</string>
-    <string name="settings_advanced_broadcast_summary_enabled">Aplicativos podem receber notificações como transmissões</string>
+    <string name="settings_advanced_broadcast_summary_enabled">Apps podem receber notificações como transmissões</string>
     <string name="settings_advanced_header">Avançado</string>
-    <string name="settings_advanced_broadcast_summary_disabled">Aplicativos não podem receber notificações como transmissão</string>
-    <string name="settings_advanced_record_logs_summary_enabled">Registrando (até 1000 registros) para o dispositivo …</string>
+    <string name="settings_advanced_broadcast_summary_disabled">Apps não podem receber notificações como transmissão</string>
+    <string name="settings_advanced_record_logs_summary_enabled">Registrando (até 1.000 registros) para o dispositivo …</string>
     <string name="detail_deep_link_subscribed_toast_message">Inscrito no tópico %1$s</string>
     <string name="settings_notifications_priority_high">alta</string>
     <string name="notification_popup_user_action_failed">%1$s falhou: %2$s</string>
@@ -304,40 +304,40 @@
     <string name="settings_notifications_channel_prefs_summary">Modo Não Perturbe, sons, etc.</string>
     <string name="detail_settings_notifications_instant_title">Entrega instantânea</string>
     <string name="detail_settings_notifications_instant_summary_on">Notificações são entregues instantaneamente. Requer um serviço em primeiro plano e consome mais bateria.</string>
-    <string name="detail_settings_notifications_instant_summary_off">Notificações são entregues usando Firebase. A entrega pode demorar, mas consome menos bateria.</string>
+    <string name="detail_settings_notifications_instant_summary_off">Notificações são entregues usando o Firebase. A entrega pode demorar, mas consome menos bateria.</string>
     <string name="detail_settings_appearance_header">Aparência</string>
     <string name="detail_settings_appearance_icon_set_title">Ícone de inscrição</string>
-    <string name="detail_settings_appearance_icon_set_summary">Definir um ícone a ser exibido nas notificações</string>
+    <string name="detail_settings_appearance_icon_set_summary">Defina um ícone para ser exibido nas notificações</string>
     <string name="detail_settings_appearance_icon_remove_title">Ícone de inscrição (toque para remover)</string>
     <string name="detail_settings_appearance_icon_remove_summary">Ícone exibido em notificações para este tópico</string>
     <string name="detail_settings_global_setting_title">Usar configurações globais</string>
     <string name="channel_subscriber_notification_instant_text_five">Inscrito em cinco tópicos de entrega instantânea</string>
     <string name="channel_subscriber_notification_noinstant_text_six">Inscrito em seis tópicos</string>
-    <string name="detail_settings_appearance_icon_error_saving">Não foi possível salvar o ícone: %1$s</string>
+    <string name="detail_settings_appearance_icon_error_saving">Não foi possível salvar ícone: %1$s</string>
     <string name="channel_subscriber_notification_instant_text_six">Inscrito em seis tópicos de entrega instantânea</string>
     <string name="channel_subscriber_notification_noinstant_text_five">Inscrito em cinco tópicos</string>
     <string name="detail_settings_global_setting_suffix">usando configurações globais</string>
     <string name="detail_settings_appearance_display_name_title">Nome de exibição</string>
     <string name="detail_settings_appearance_display_name_default_summary">%1$s (padrão)</string>
-    <string name="detail_settings_appearance_display_name_message">Defina um nome personalizado para esta inscrição. Deixe em branco para padrão (%1$s).</string>
-    <string name="main_banner_websocket_text">Mudar para WebSockets é o modo recomendado de conectar ao seu servidor, e pode melhorar a vida da bateria, mas pode necessitar de <a href="https://ntfy.sh/docs/config/#nginxapache2caddy">configurações adicionais no seu proxy</a>. Isso pode ser habilitado nas Configurações.</string>
+    <string name="detail_settings_appearance_display_name_message">Defina um nome personalizado para esta inscrição. Deixe em branco para o padrão (%1$s).</string>
+    <string name="main_banner_websocket_text">WebSockets são o modo recomendado de conectar ao seu servidor, e pode melhorar a vida da bateria, mas pode necessitar de <a href="https://ntfy.sh/docs/config/#nginxapache2caddy">configurações adicionais na sua proxy</a>. Isso pode ser alterado nas Configurações.</string>
     <string name="detail_settings_about_header">Sobre</string>
     <string name="detail_settings_about_topic_url_title">URL do tópico</string>
-    <string name="detail_settings_about_topic_url_copied_to_clipboard_message">Copiado para área de transferência</string>
-    <string name="add_dialog_base_urls_dropdown_choose">Escolha o URL do serviço</string>
-    <string name="add_dialog_base_urls_dropdown_clear">Limpar o URL do serviço</string>
+    <string name="detail_settings_about_topic_url_copied_to_clipboard_message">Copiado para a área de transferência</string>
+    <string name="add_dialog_base_urls_dropdown_choose">Escolher URL do serviço</string>
+    <string name="add_dialog_base_urls_dropdown_clear">Limpar URL do serviço</string>
     <string name="main_banner_websocket_button_enable_now">Habilitar agora</string>
     <string name="channel_notifications_group_default_name">Padrão</string>
     <string name="main_menu_donate_title">Doar 💸</string>
     <string name="settings_notifications_insistent_max_priority_summary_disabled">Notificações de prioridade máxima alertam apenas uma vez</string>
-    <string name="detail_settings_notifications_open_channels_title">Definir configurações de notificação</string>
-    <string name="detail_settings_notifications_open_channels_summary">Sobrepor Não Perturbe (DND), sons, etc.</string>
-    <string name="settings_advanced_unifiedpush_summary_disabled">ntfy não atuará como distribuidor UnifiedPush</string>
-    <string name="detail_settings_notifications_dedicated_channels_title">Configurações de notificação personalizadas</string>
+    <string name="detail_settings_notifications_open_channels_title">Configurar configurações de notificação</string>
+    <string name="detail_settings_notifications_open_channels_summary">Não Perturbe (DND), sons, etc.</string>
+    <string name="settings_advanced_unifiedpush_summary_disabled">ntfy não atuará como um distribuidor UnifiedPush</string>
+    <string name="detail_settings_notifications_dedicated_channels_title">Configurações customizadas de notificação</string>
     <string name="detail_settings_notifications_insistent_max_priority_list_item_disabled">Alertar apenas uma vez</string>
-    <string name="detail_settings_notifications_dedicated_channels_summary_on">Usando configurações personalizadas para esta assinatura</string>
-    <string name="detail_settings_notifications_dedicated_channels_summary_off">Usando configurações padrão (sons, substituição de Não perturbe, etc.)</string>
-    <string name="detail_item_cannot_open_apk">Apps não podem mais ser instalados, baixe pelo navegador. Veja a issue #531 para detalhes.</string>
+    <string name="detail_settings_notifications_dedicated_channels_summary_on">Usando configurações personalizadas para esta inscrição</string>
+    <string name="detail_settings_notifications_dedicated_channels_summary_off">Usando configurações padrão (sons, Não Perturbe, etc.)</string>
+    <string name="detail_item_cannot_open_apk">Apps não podem mais ser instalados. Em vez disso, baixe pelo navegador. Veja o issue #531 para detalhes.</string>
     <string name="settings_notifications_insistent_max_priority_title">Continue alertando para a prioridade mais alta</string>
     <string name="settings_notifications_insistent_max_priority_summary_enabled">Notificações de prioridade máxima alertam continuamente até serem dispensadas</string>
     <string name="settings_advanced_unifiedpush_title">Habilitar UnifiedPush</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2494f01b..e2754f1a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -33,7 +33,7 @@
     <string name="detail_menu_disable_instant">Выключить моментальную доставку</string>
     <string name="detail_menu_test">Отправить тестовое уведомление</string>
     <string name="detail_menu_copy_url">Скопировать URL-адрес темы</string>
-    <string name="detail_menu_clear">Отчистить все уведомления</string>
+    <string name="detail_menu_clear">Очистить все уведомления</string>
     <string name="detail_menu_settings">Настройки подписок</string>
     <string name="detail_menu_unsubscribe">Отписаться</string>
     <string name="detail_action_mode_menu_copy">Скопировать</string>
diff --git a/app/src/main/res/values-xh/strings.xml b/app/src/main/res/values-xh/strings.xml
new file mode 100644
index 00000000..bf971332
--- /dev/null
+++ b/app/src/main/res/values-xh/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="add_dialog_login_username_hint">Igama lomsebenzisi</string>
+    <string name="add_dialog_button_back">Emva</string>
+    <string name="add_dialog_button_login">Ngema</string>
+    <string name="main_banner_websocket_button_dismiss">Gxotha</string>
+    <string name="add_dialog_button_cancel">Rhoxisa</string>
+    <string name="add_dialog_button_subscribe">Bhalisa</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/play/java/io/heckel/ntfy/firebase/FirebaseService.kt b/app/src/play/java/io/heckel/ntfy/firebase/FirebaseService.kt
index 830b92d4..4459df72 100644
--- a/app/src/play/java/io/heckel/ntfy/firebase/FirebaseService.kt
+++ b/app/src/play/java/io/heckel/ntfy/firebase/FirebaseService.kt
@@ -92,6 +92,7 @@ class FirebaseService : FirebaseMessagingService() {
         val click = data["click"]
         val iconUrl = data["icon"]
         val actions = data["actions"] // JSON array as string, sigh ...
+        val contentType = data["content_type"]
         val encoding = data["encoding"]
         val attachmentName = data["attachment_name"] ?: "attachment.bin"
         val attachmentType = data["attachment_type"]
@@ -132,6 +133,7 @@ class FirebaseService : FirebaseMessagingService() {
                 timestamp = timestamp,
                 title = title ?: "",
                 message = message,
+                contentType = contentType ?: "",
                 encoding = encoding ?: "",
                 priority = toPriority(priority),
                 tags = tags ?: "",
diff --git a/assets/logo_with_text.svg b/assets/logo_with_text.svg
new file mode 100644
index 00000000..b0e41466
--- /dev/null
+++ b/assets/logo_with_text.svg
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="50mm"
+   height="50mm"
+   viewBox="0 0 50 50"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="logo_with_text.svg"
+   inkscape:export-filename="/home/pheckel/Code/ntfy-android/assets/appstore_ios.png"
+   inkscape:export-xdpi="520.19202"
+   inkscape:export-ydpi="520.19202"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4714">
+      <stop
+         style="stop-color:#348878;stop-opacity:1"
+         offset="0"
+         id="stop4710" />
+      <stop
+         style="stop-color:#52bca6;stop-opacity:1"
+         offset="1"
+         id="stop4712" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient28858-5">
+      <stop
+         style="stop-color:#348878;stop-opacity:1"
+         offset="0"
+         id="stop28854-3" />
+      <stop
+         style="stop-color:#56bda8;stop-opacity:1"
+         offset="1"
+         id="stop28856-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient28858-5"
+       id="linearGradient3255"
+       x1="160.72209"
+       y1="128.53317"
+       x2="168.41153"
+       y2="134.32626"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.741513,0,0,1.741513,-224.24539,-136.36679)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4714"
+       id="linearGradient4633"
+       x1="0.034492966"
+       y1="-0.0003150744"
+       x2="50.319355"
+       y2="50.284546"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.46182346,0,0,0.46182346,-0.01592966,-1.6956565e-4)" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter3958"
+       x="-0.076083149"
+       y="-0.091641662"
+       width="1.1759423"
+       height="1.2114791">
+      <feFlood
+         flood-opacity="0.192157"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood3948" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite3950" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="4"
+         result="blur"
+         id="feGaussianBlur3952" />
+      <feOffset
+         dx="3"
+         dy="2.95367"
+         result="offset"
+         id="feOffset3954" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite3956" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.4713302"
+     inkscape:cx="74.139011"
+     inkscape:cy="89.123366"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:measure-start="0,0"
+     inkscape:measure-end="0,0"
+     inkscape:snap-text-baseline="true"
+     inkscape:window-width="1846"
+     inkscape:window-height="1016"
+     inkscape:window-x="74"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:pagecheckerboard="0">
+    <sodipodi:guide
+       position="10.173514,67.718331"
+       orientation="1,0"
+       id="guide1770" />
+    <sodipodi:guide
+       position="39.965574,62.077508"
+       orientation="1,0"
+       id="guide1772" />
+    <sodipodi:guide
+       position="10.173514,39.789015"
+       orientation="0,-1"
+       id="guide1774" />
+    <sodipodi:guide
+       position="-2.3077334,9.9462015"
+       orientation="0,-1"
+       id="guide1776" />
+    <sodipodi:guide
+       position="14.990626,36.198285"
+       orientation="1,0"
+       id="guide4020" />
+    <sodipodi:guide
+       position="34.930725,39.789015"
+       orientation="1,0"
+       id="guide4022" />
+    <sodipodi:guide
+       position="12.7026,32.00465"
+       orientation="0,-1"
+       id="guide4024" />
+    <sodipodi:guide
+       position="11.377711,17.981227"
+       orientation="0,-1"
+       id="guide4026" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="background"
+     style="display:inline">
+    <rect
+       style="fill:url(#linearGradient4633);fill-opacity:1;stroke:none;stroke-width:0.133067;stroke-linejoin:bevel"
+       id="rect4545"
+       width="23.222729"
+       height="23.222729"
+       x="0"
+       y="-0.0003150744" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="drop shadow"
+     style="display:inline">
+    <path
+       id="path3646"
+       style="color:#000000;display:inline;fill:#ffffff;stroke:none;stroke-width:1.93113;-inkscape-stroke:none;filter:url(#filter3958)"
+       d="m 50.400391,46.882812 c -9.16879,0 -17.023438,7.2146 -17.023438,16.386719 v 0.0078 l 0.08984,71.369139 -2.302735,16.99219 31.3125,-8.31836 h 77.841802 c 9.16877,0 17.02344,-7.22425 17.02344,-16.39648 V 63.269531 c 0,-9.169496 -7.85031,-16.382463 -17.01563,-16.386719 h -0.008 z m 0,11.566407 h 89.917969 0.008 c 3.22151,0.0033 5.44922,2.346918 5.44922,4.820312 v 63.654299 c 0,2.47551 -2.23164,4.82031 -5.45703,4.82031 H 60.779297 l -15.908203,4.80664 0.162109,-0.9375 -0.08789,-72.343749 c 0,-2.475337 2.229739,-4.820312 5.455078,-4.820312 z"
+       transform="matrix(0.12288694,0,0,0.12288694,0,-1.6873665e-4)" />
+  </g>
+  <g
+     inkscape:label="foreground"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-51.147327,-81.515579)"
+     style="display:inline">
+    <path
+       style="color:#000000;fill:url(#linearGradient3255);stroke:none;stroke-width:1.15908;-inkscape-stroke:none"
+       d="M 68.356939,87.921737 H 57.543468 c -0.743432,0 -1.351677,0.574055 -1.351677,1.275675 l 0.01033,8.639597 -0.201904,1.163784 2.894292,-0.873723 h 9.46176 c 0.743433,0 1.351694,-0.574052 1.351694,-1.275689 v -7.653969 c 0,-0.70162 -0.608261,-1.275675 -1.351694,-1.275675 z"
+       id="path7368" />
+    <path
+       id="path2498"
+       style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.237311;-inkscape-stroke:none"
+       d="m 57.340877,87.276696 c -1.126725,0 -2.091958,0.88658 -2.091958,2.013713 v 9.59e-4 l 0.01104,8.770335 -0.282976,2.088117 3.847897,-1.022216 h 9.565741 c 1.126722,0 2.091958,-0.887766 2.091958,-2.014914 v -7.822281 c 0,-1.126811 -0.9647,-2.01319 -2.090998,-2.013713 h -9.83e-4 z m 0,1.42136 h 11.049744 9.83e-4 c 0.395882,4.06e-4 0.669638,0.288406 0.669638,0.592353 v 7.822282 c 0,0.304208 -0.274239,0.592354 -0.670598,0.592354 h -9.774335 l -1.954911,0.590673 0.01992,-0.115207 -0.0108,-8.890102 c 0,-0.304186 0.274006,-0.592353 0.670359,-0.592353 z" />
+    <g
+       id="path1011-6-2"
+       transform="matrix(0.67515919,0,0,0.80264534,16.256543,1.6511734)"
+       style="font-size:8.48274px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;stroke:none;stroke-width:0.525121">
+      <path
+         style="color:#000000;-inkscape-font-specification:'JetBrains Mono, Bold';fill:#ffffff;stroke:none;-inkscape-stroke:none"
+         d="m 62.57046,116.77004 v -1.31201 l 3.280018,-1.45904 q 0.158346,-0.0679 0.305381,-0.1018 0.158346,-0.0452 0.282761,-0.0679 0.135725,-0.0113 0.271449,-0.0226 v -0.0905 q -0.135724,-0.0113 -0.271449,-0.0452 -0.124415,-0.0226 -0.282761,-0.0566 -0.147035,-0.0452 -0.305381,-0.1131 l -3.280018,-1.45904 v -1.32332 l 5.067063,2.31863 v 1.4138 z"
+         id="path7553" />
+      <path
+         style="color:#000000;-inkscape-font-specification:'JetBrains Mono, Bold';fill:#ffffff;stroke:none;-inkscape-stroke:none"
+         d="m 62.308594,110.31055 v 1.90234 l 3.4375,1.5293 c 0.0073,0.003 0.0142,0.005 0.02148,0.008 -0.0073,0.003 -0.0142,0.005 -0.02148,0.008 l -3.4375,1.5293 v 1.89258 l 0.371093,-0.16992 5.220704,-2.39063 v -1.75 z m 0.52539,0.8164 4.541016,2.08008 v 1.07617 l -4.541016,2.07813 v -0.73242 l 3.119141,-1.38868 0.0039,-0.002 c 0.09141,-0.0389 0.178343,-0.0676 0.257813,-0.0859 h 0.0059 l 0.0078,-0.002 c 0.09483,-0.0271 0.176055,-0.0474 0.246093,-0.0606 l 0.498047,-0.041 v -0.57422 l -0.240234,-0.0195 c -0.07606,-0.006 -0.153294,-0.0198 -0.230469,-0.0391 l -0.0078,-0.002 -0.0078,-0.002 c -0.07608,-0.0138 -0.16556,-0.0318 -0.263672,-0.0527 -0.08398,-0.0262 -0.172736,-0.058 -0.265625,-0.0977 l -0.0039,-0.002 -3.119141,-1.38868 z"
+         id="path7555" />
+    </g>
+    <g
+       id="g1224"
+       transform="matrix(0.67315851,0,0,0.77291871,16.72925,3.9953612)"
+       style="font-size:8.48274px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;stroke:none;stroke-width:0.525121">
+      <path
+         style="color:#000000;-inkscape-font-specification:'JetBrains Mono, Bold';fill:#ffffff;stroke:none;-inkscape-stroke:none"
+         d="m 69.17132,117.75404 h 5.428996 v 1.27808 H 69.17132 Z"
+         id="path1220" />
+      <path
+         style="color:#000000;-inkscape-font-specification:'JetBrains Mono, Bold';fill:#ffffff;stroke:none;-inkscape-stroke:none"
+         d="m 68.908203,117.49219 v 0.26172 1.54101 h 5.955078 v -1.80273 z m 0.525391,0.52344 h 4.904297 v 0.7539 h -4.904297 z"
+         id="path1222" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="75.847778"
+       y="94.99572"
+       id="text7539"><tspan
+         sodipodi:role="line"
+         id="tspan7537"
+         style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Inter;-inkscape-font-specification:'Inter Heavy';stroke-width:0.264583"
+         x="75.847778"
+         y="94.99572">ntfy.sh</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="round icon preview"
+     style="display:none">
+    <path
+       id="path18850-8-1"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:0.255654"
+       d="M 50.337488,80.973198 V 131.61213 H 101.65302 V 80.973198 Z m 25.676545,1.442307 h 0.555989 a 24.369387,24.369387 0 0 1 23.860308,21.232925 v 6.09963 a 24.369387,24.369387 0 0 1 -21.288308,21.19336 h 21.288308 v 0.0138 H 51.963792 v -0.0158 H 73.428179 A 24.369387,24.369387 0 0 1 51.963792,107.97535 v -2.49089 A 24.369387,24.369387 0 0 1 76.014033,82.415508 Z"
+       transform="translate(-51.147326,-81.51558)" />
+  </g>
+</svg>
diff --git a/fastlane/metadata/android/pt-BR/full_description.txt b/fastlane/metadata/android/pt-BR/full_description.txt
index 140fdde8..3ba02dec 100644
--- a/fastlane/metadata/android/pt-BR/full_description.txt
+++ b/fastlane/metadata/android/pt-BR/full_description.txt
@@ -1,10 +1,10 @@
-Envie notificações para o seu telefone a partir de qualquer script Bash ou PowerShell, ou a partir da sua própria aplicação utilizando requisições PUT/POST, por exemplo, através de curl no Linux ou Invoke-WebRequest.
+Envie notificações para o seu celular a partir de qualquer script Bash ou PowerShell, ou a partir da sua própria aplicação utilizando solicitações PUT/POST, por exemplo, através do curl no Linux ou Invoke-WebRequest.
 
-ntfy é um cliente Android para https://ntfy.sh, um serviço de pub-subs gratuito e de código aberto baseado em HTTP. Você pode se inscrever em tópicos nesta aplicação, e depois publicar mensagens através de uma simples API HTTP.
+ntfy é um cliente Android para https://ntfy.sh, um serviço de pub-sub baseado em HTTP gratuito e de código aberto. Você pode se inscrever em tópicos neste app, e então publicar mensagens através de uma simples API HTTP.
 
 Usos:
 * Receber notificações quando um processo de longa duração for finalizado
-* Pingar o seu telefone quando uma cópia de segurança falhou
+* Alertar no seu celular quando um backup falhou
 * Alertar quando alguém fizer login no seu servidor
 
 Exemplo:
@@ -14,4 +14,4 @@ $ curl -d "O seu backup acabou" ntfy.sh/mytopic
 Encontre mais exemplos e instruções de utilização aqui:
 * Website: https://ntfy.sh
 * GitHub (servidor): https://github.com/binwiederhier/ntfy
-* GitHub (aplicação Android): https://github.com/binwiederhier/ntfy-android
+* GitHub (app Android): https://github.com/binwiederhier/ntfy-android
diff --git a/fastlane/metadata/android/pt-BR/short_description.txt b/fastlane/metadata/android/pt-BR/short_description.txt
index 7bc6babe..b3da4031 100644
--- a/fastlane/metadata/android/pt-BR/short_description.txt
+++ b/fastlane/metadata/android/pt-BR/short_description.txt
@@ -1 +1 @@
-Enviar notificações ao telefone via qualquer script usando requisições PUT/POST
+Envie notificações ao seu celular de qualquer script via solicitações PUT/POST
diff --git a/fastlane/metadata/android/pt-BR/title.txt b/fastlane/metadata/android/pt-BR/title.txt
index d33c7529..eca89a34 100644
--- a/fastlane/metadata/android/pt-BR/title.txt
+++ b/fastlane/metadata/android/pt-BR/title.txt
@@ -1 +1 @@
-ntfy - PUT/POST to your phone
+ntfy - PUT/POST ao seu disp.

From ecb64cf0dc3fce640f910c0cf8c0c4ad3367b48d Mon Sep 17 00:00:00 2001
From: Philipp Heckel <phil@heckel.io>
Date: Sun, 17 Aug 2025 20:43:24 -0400
Subject: [PATCH 6/6] Undo Rate-Topics

---
 app/build.gradle                              |  1 -
 .../java/io/heckel/ntfy/msg/ApiService.kt     |  8 ++-----
 .../java/io/heckel/ntfy/service/Connection.kt |  3 +--
 .../io/heckel/ntfy/service/JsonConnection.kt  |  4 +---
 .../heckel/ntfy/service/SubscriberService.kt  |  4 ++--
 .../io/heckel/ntfy/service/WsConnection.kt    |  4 +---
 .../java/io/heckel/ntfy/ui/MainActivity.kt    | 23 +++++++------------
 .../metadata/android/en-US/changelog/33.txt   |  1 -
 8 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dc645883..2a3308fa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,6 @@ repositories {
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-//apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
 
 android {
diff --git a/app/src/main/java/io/heckel/ntfy/msg/ApiService.kt b/app/src/main/java/io/heckel/ntfy/msg/ApiService.kt
index 2692c849..54c48ea9 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/ApiService.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/ApiService.kt
@@ -108,7 +108,6 @@ class ApiService {
     fun subscribe(
         baseUrl: String,
         topics: String,
-        unifiedPushTopics: String,
         since: String?,
         user: User?,
         notify: (topic: String, Notification) -> Unit,
@@ -117,7 +116,7 @@ class ApiService {
         val sinceVal = since ?: "all"
         val url = topicUrlJson(baseUrl, topics, sinceVal)
         Log.d(TAG, "Opening subscription connection to $url")
-        val request = requestBuilder(url, user, unifiedPushTopics).build()
+        val request = requestBuilder(url, user).build()
         val call = subscriberClient.newCall(request)
         call.enqueue(object : Callback {
             override fun onResponse(call: Call, response: Response) {
@@ -179,16 +178,13 @@ class ApiService {
         const val EVENT_KEEPALIVE = "keepalive"
         const val EVENT_POLL_REQUEST = "poll_request"
 
-        fun requestBuilder(url: String, user: User?, unifiedPushTopics: String? = null): Request.Builder {
+        fun requestBuilder(url: String, user: User?): Request.Builder {
             val builder = Request.Builder()
                 .url(url)
                 .addHeader("User-Agent", USER_AGENT)
             if (user != null) {
                 builder.addHeader("Authorization", Credentials.basic(user.username, user.password, UTF_8))
             }
-            if (unifiedPushTopics != null) {
-                builder.addHeader("Rate-Topics", unifiedPushTopics)
-            }
             return builder
         }
     }
diff --git a/app/src/main/java/io/heckel/ntfy/service/Connection.kt b/app/src/main/java/io/heckel/ntfy/service/Connection.kt
index dc151e50..71a98be4 100644
--- a/app/src/main/java/io/heckel/ntfy/service/Connection.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/Connection.kt
@@ -8,6 +8,5 @@ interface Connection {
 
 data class ConnectionId(
     val baseUrl: String,
-    val topicsToSubscriptionIds: Map<String, Long>,
-    val topicIsUnifiedPush: Map<String, Boolean>
+    val topicsToSubscriptionIds: Map<String, Long>
 )
diff --git a/app/src/main/java/io/heckel/ntfy/service/JsonConnection.kt b/app/src/main/java/io/heckel/ntfy/service/JsonConnection.kt
index 39fa0088..8bca6883 100644
--- a/app/src/main/java/io/heckel/ntfy/service/JsonConnection.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/JsonConnection.kt
@@ -21,10 +21,8 @@ class JsonConnection(
 ) : Connection {
     private val baseUrl = connectionId.baseUrl
     private val topicsToSubscriptionIds = connectionId.topicsToSubscriptionIds
-    private val topicIsUnifiedPush = connectionId.topicIsUnifiedPush
     private val subscriptionIds = topicsToSubscriptionIds.values
     private val topicsStr = topicsToSubscriptionIds.keys.joinToString(separator = ",")
-    private val unifiedPushTopicsStr = topicIsUnifiedPush.filter { entry -> entry.value }.keys.joinToString(separator = ",")
     private val url = topicUrl(baseUrl, topicsStr)
 
     private var since: String? = sinceId
@@ -58,7 +56,7 @@ class JsonConnection(
                 // Call /json subscribe endpoint and loop until the call fails, is canceled,
                 // or the job or service are cancelled/stopped
                 try {
-                    call = api.subscribe(baseUrl, topicsStr, unifiedPushTopicsStr, since, user, notify, fail)
+                    call = api.subscribe(baseUrl, topicsStr, since, user, notify, fail)
                     while (!failed.get() && !call.isCanceled() && isActive && serviceActive()) {
                         stateChangeListener(subscriptionIds, ConnectionState.CONNECTED)
                         Log.d(TAG,"[$url] Connection is active (failed=$failed, callCanceled=${call.isCanceled()}, jobActive=$isActive, serviceStarted=${serviceActive()}")
diff --git a/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt b/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
index adf94b48..60fbb477 100644
--- a/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt
@@ -177,8 +177,8 @@ class SubscriberService : Service() {
             .filter { s -> s.instant }
         val activeConnectionIds = connections.keys().toList().toSet()
         val desiredConnectionIds = instantSubscriptions // Set<ConnectionId>
-            .groupBy { s -> ConnectionId(s.baseUrl, emptyMap(), emptyMap()) }
-            .map { entry -> entry.key.copy(topicsToSubscriptionIds = entry.value.associate { s -> s.topic to s.id }, topicIsUnifiedPush = entry.value.associate { s -> s.topic to (s.upConnectorToken != null) }) }
+            .groupBy { s -> ConnectionId(s.baseUrl, emptyMap()) }
+            .map { entry -> entry.key.copy(topicsToSubscriptionIds = entry.value.associate { s -> s.topic to s.id }) }
             .toSet()
         val newConnectionIds = desiredConnectionIds.subtract(activeConnectionIds)
         val obsoleteConnectionIds = activeConnectionIds.subtract(desiredConnectionIds)
diff --git a/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt b/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt
index 20059d5c..3b34081b 100644
--- a/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt
+++ b/app/src/main/java/io/heckel/ntfy/service/WsConnection.kt
@@ -56,10 +56,8 @@ class WsConnection(
     private val since = AtomicReference<String?>(sinceId)
     private val baseUrl = connectionId.baseUrl
     private val topicsToSubscriptionIds = connectionId.topicsToSubscriptionIds
-    private val topicIsUnifiedPush = connectionId.topicIsUnifiedPush
     private val subscriptionIds = topicsToSubscriptionIds.values
     private val topicsStr = topicsToSubscriptionIds.keys.joinToString(separator = ",")
-    private val unifiedPushTopicsStr = topicIsUnifiedPush.filter { entry -> entry.value }.keys.joinToString(separator = ",")
     private val shortUrl = topicShortUrl(baseUrl, topicsStr)
 
     init {
@@ -80,7 +78,7 @@ class WsConnection(
         val sinceId = since.get()
         val sinceVal = sinceId ?: "all"
         val urlWithSince = topicUrlWs(baseUrl, topicsStr, sinceVal)
-        val request = requestBuilder(urlWithSince, user, unifiedPushTopicsStr).build()
+        val request = requestBuilder(urlWithSince, user).build()
         Log.d(TAG, "$shortUrl (gid=$globalId): Opening $urlWithSince with listener ID $nextListenerId ...")
         webSocket = client.newWebSocket(request, Listener(nextListenerId))
     }
diff --git a/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
index 5ac2f7ad..1c4b0f52 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/MainActivity.kt
@@ -198,7 +198,7 @@ class MainActivity : AppCompatActivity(), ActionMode.Callback, AddFragment.Subsc
             SubscriberServiceManager(this).restart()
             wsBanner.visibility = View.GONE
 
-            // maybe show WebSocketReconnectBanner
+            // Maybe show WebSocketReconnectBanner
             viewModel.list().observe(this) {
                 it?.let { subscriptions ->
                     showHideWebSocketReconnectBanner(subscriptions)
@@ -210,14 +210,10 @@ class MainActivity : AppCompatActivity(), ActionMode.Callback, AddFragment.Subsc
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             val wsReconnectBanner = findViewById<View>(R.id.main_banner_websocket_reconnect)
             val wsReconnectText = findViewById<TextView>(R.id.main_banner_websocket_reconnect_text)
-            val wsReconnectDismissButton =
-                findViewById<Button>(R.id.main_banner_websocket_reconnect_dontaskagain)
-            val wsReconnectRemindButton =
-                findViewById<Button>(R.id.main_banner_websocket_reconnect_remind_later)
-            val wsReconnectEnableButton =
-                findViewById<Button>(R.id.main_banner_websocket_reconnect_enable)
-            wsReconnectText.movementMethod =
-                LinkMovementMethod.getInstance() // Make links clickable
+            val wsReconnectDismissButton = findViewById<Button>(R.id.main_banner_websocket_reconnect_dontaskagain)
+            val wsReconnectRemindButton = findViewById<Button>(R.id.main_banner_websocket_reconnect_remind_later)
+            val wsReconnectEnableButton = findViewById<Button>(R.id.main_banner_websocket_reconnect_enable)
+            wsReconnectText.movementMethod = LinkMovementMethod.getInstance() // Make links clickable
             wsReconnectDismissButton.setOnClickListener {
                 wsReconnectBanner.visibility = View.GONE
                 repository.setWebSocketReconnectRemindTime(Repository.WEBSOCKET_RECONNECT_REMIND_TIME_NEVER)
@@ -287,12 +283,9 @@ class MainActivity : AppCompatActivity(), ActionMode.Callback, AddFragment.Subsc
         val wsReconnectBanner = findViewById<View>(R.id.main_banner_websocket_reconnect)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             val hasSelfHostedSubscriptions = subscriptions.count { it.baseUrl != appBaseUrl } > 0
-            val usingWebSockets =
-                repository.getConnectionProtocol() == Repository.CONNECTION_PROTOCOL_WS
-            val wsReconnectRemindTimeReached =
-                repository.getWebSocketReconnectRemindTime() < System.currentTimeMillis()
-            val canScheduleExactAlarms =
-                (getSystemService(ALARM_SERVICE) as AlarmManager).canScheduleExactAlarms()
+            val usingWebSockets = repository.getConnectionProtocol() == Repository.CONNECTION_PROTOCOL_WS
+            val wsReconnectRemindTimeReached = repository.getWebSocketReconnectRemindTime() < System.currentTimeMillis()
+            val canScheduleExactAlarms = (getSystemService(ALARM_SERVICE) as AlarmManager).canScheduleExactAlarms()
             val showBanner = hasSelfHostedSubscriptions && wsReconnectRemindTimeReached && usingWebSockets && !canScheduleExactAlarms
             Log.d(TAG, "hasSelfHostedSubscriptions: ${hasSelfHostedSubscriptions}, wsReconnectRemindTimeReached: ${wsReconnectRemindTimeReached}, usingWebSockets: ${usingWebSockets}, canScheduleExactAlarms: ${canScheduleExactAlarms}")
             wsReconnectBanner.visibility = if (showBanner) View.VISIBLE else View.GONE
diff --git a/fastlane/metadata/android/en-US/changelog/33.txt b/fastlane/metadata/android/en-US/changelog/33.txt
index 5163ad79..c760d51a 100644
--- a/fastlane/metadata/android/en-US/changelog/33.txt
+++ b/fastlane/metadata/android/en-US/changelog/33.txt
@@ -2,7 +2,6 @@ Features:
 * You can now disable UnifiedPush so ntfy does not act as a UnifiedPush distributor (#646, thanks to @ollien for reporting, and to @wunter8 for implementing)
 
 Bug fixes + maintenance:
-* UnifiedPush subscriptions now include the Rate-Topics header to facilitate subscriber-based billing (#652, thanks to @wunter8)
 * Subscriptions without icons no longer appear to use another subscription's icon (#634, thanks to @topcaser for reporting, and @wunter8 for fixing)
 * Bumped all dependencies to the latest versions (no ticket)