app/build.gradle.kts

@@ -70,6 +70,7 @@ dependencies {
   // Only needed for ringtone preference
   implementation(libs.androidx.legacy)
   implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.splashscreen)
 
   implementation(libs.androidx.room.runtime)
   ksp(libs.androidx.room.compiler)

app/src/main/AndroidManifest.xml

@@ -41,12 +41,11 @@
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
     android:supportsRtl="true"
-    android:theme="@style/Theme.SplashTheme">
+    android:theme="@style/Theme.AppTheme.Starting">
 
     <activity
       android:name="de.kuschku.quasseldroid.ui.chat.ChatActivity"
       android:exported="true"
-      android:launchMode="singleTask"
       android:windowSoftInputMode="adjustResize">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />

app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt

@@ -40,6 +40,7 @@ import androidx.core.app.Person
 import androidx.core.app.RemoteInput
 import androidx.core.graphics.drawable.IconCompat
 import de.kuschku.libquassel.protocol.Buffer_Type
+import de.kuschku.libquassel.protocol.MsgId
 import de.kuschku.libquassel.util.flag.hasFlag
 import de.kuschku.quasseldroid.R
 import de.kuschku.quasseldroid.settings.NotificationSettings
@@ -55,6 +56,14 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
   private val notificationManagerCompat = NotificationManagerCompat.from(context)
   private var translatedLocale: Context = LocaleHelper.setLocale(context)
 
+  @JvmInline
+  private value class RequestCode(val messageId: MsgId) {
+    val open: Int get() = messageId.id.toInt() * 8 + 1
+    val reply: Int get() = messageId.id.toInt() * 8 + 2
+    val markRead: Int get() = messageId.id.toInt() * 8 + 3
+    val delete: Int get() = messageId.id.toInt() * 8 + 4
+  }
+
   fun updateTranslation() {
     translatedLocale = LocaleHelper.setLocale(context)
   }
@@ -118,9 +127,12 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
     selfInfo: SelfInfo, notifications: List<NotificationMessage>,
     isLoud: Boolean, isConnected: Boolean
   ): Handle {
+    val latestMessage = notifications.last().messageId
+    val requestCode = RequestCode(latestMessage)
+
     val pendingIntentOpen = PendingIntent.getActivity(
       context.applicationContext,
-      System.currentTimeMillis().toInt(),
+      requestCode.open,
       ChatActivity.intent(context.applicationContext, bufferId = buffer.id).apply {
         flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
       },
@@ -134,7 +146,7 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
 
     val replyPendingIntent = PendingIntent.getService(
       context.applicationContext,
-      System.currentTimeMillis().toInt(),
+      requestCode.reply,
       QuasselService.intent(
         context,
         bufferId = buffer.id
@@ -145,11 +157,11 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
 
     val markReadPendingIntent = PendingIntent.getService(
       context.applicationContext,
-      System.currentTimeMillis().toInt(),
+      requestCode.markRead,
       QuasselService.intent(
         context,
         bufferId = buffer.id,
-        markReadMessage = notifications.last().messageId
+        markReadMessage = latestMessage
       ),
       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) 0
       else PendingIntent.FLAG_MUTABLE
@@ -157,11 +169,11 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
 
     val deletePendingIntent = PendingIntent.getService(
       context.applicationContext,
-      System.currentTimeMillis().toInt(),
+      requestCode.delete,
       QuasselService.intent(
         context,
         bufferId = buffer.id,
-        hideMessage = notifications.last().messageId
+        hideMessage = latestMessage
       ),
       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) 0
       else PendingIntent.FLAG_MUTABLE

app/src/main/res/drawable/bg_splash.xml

-<?xml version="1.0" encoding="utf-8"?><!--
-  Quasseldroid - Quassel client for Android
-
-  Copyright (c) 2020 Janne Mareike Koschinski
-  Copyright (c) 2020 The Quassel Project
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU General Public License version 3 as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@color/colorPrimary" />
-  <item>
-    <bitmap
-      android:gravity="center"
-      android:src="@drawable/ic_splash" />
-  </item>
-</layer-list>

app/src/main/res/values/themes_base.xml

@@ -18,6 +18,11 @@
   -->
 
 <resources>
+  <style name="Theme.AppTheme.Starting" parent="Theme.SplashScreen">
+    <item name="windowSplashScreenBackground">@color/colorPrimary</item>
+    <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
+    <item name="postSplashScreenTheme">@style/Theme.AppTheme.NoActionBar</item>
+  </style>
 
   <style name="Theme.AppTheme" parent="Theme.MaterialComponents.Bridge">
     <item name="colorPrimary">@color/colorPrimary</item>
@@ -81,10 +86,6 @@
     <item name="colorBackground">#FAFAFA</item>
   </style>
 
-  <style name="Theme.SplashTheme" parent="Theme.AppTheme.Light.NoActionBar">
-    <item name="android:windowBackground">@drawable/bg_splash</item>
-  </style>
-
   <style name="Theme.ChatTheme" parent="Base.ChatTheme">
     <item name="actionBarTheme">@style/Widget.AppBarOverlay</item>
     <item name="formatBarTheme">@style/Widget.AppBarOverlay</item>

gradle/libs.versions.toml

@@ -36,6 +36,7 @@ androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "
 androidx-room-rxjava = { module = "androidx.room:room-rxjava2", version.ref = "androidx-room" }
 androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "androidx-room" }
 androidx-room-paging = { module = "androidx.room:room-paging", version = "2.6.1" }
+androidx-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" }
 androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.1.0" }
 androidx-test-core = { module = "androidx.arch.core:core-testing", version = "2.2.0" }
 androidx-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx-espresso" }