Fixes #44

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

@@ -126,7 +126,7 @@ class QuasselNotificationBackend @Inject constructor(
                                 Message_Type.Notice).toInt(),
                 0
               ) {
-                processMessages(session, *it.toTypedArray())
+                processMessages(session, false, *it.toTypedArray())
                 false
               }
           }
@@ -140,7 +140,7 @@ class QuasselNotificationBackend @Inject constructor(
                                 Message_Type.Notice).toInt(),
                 Message_Flag.of(Message_Flag.Highlight).toInt()
               ) {
-                processMessages(session, *it.toTypedArray())
+                processMessages(session, false, *it.toTypedArray())
                 false
               }
             }
@@ -150,6 +150,15 @@ class QuasselNotificationBackend @Inject constructor(
           }
         }
       }
+
+      // Cleanup
+      val removedBuffers = database.notifications().buffers().minus(buffers.map(BufferInfo::bufferId))
+      for (removedBuffer in removedBuffers) {
+        database.notifications().markRead(removedBuffer, MsgId.MAX_VALUE)
+      }
+
+      // Update notifications to have actions
+      showConnectedNotifications()
     }
   }
 
@@ -178,7 +187,7 @@ class QuasselNotificationBackend @Inject constructor(
   }
 
   @Synchronized
-  override fun processMessages(session: Session, vararg messages: Message) {
+  override fun processMessages(session: Session, show: Boolean, vararg messages: Message) {
     val now = Instant.now()
     val results = messages.filter {
       val level = it.bufferInfo.type.let {
@@ -229,18 +238,33 @@ class QuasselNotificationBackend @Inject constructor(
       )
     }
     database.notifications().save(*results.toTypedArray())
+    if (show) {
       executor.schedule(
         {
-        results.map(QuasselDatabase.NotificationData::bufferId).distinct()
-          .forEach(this::showNotification)
+          results.map(QuasselDatabase.NotificationData::bufferId).distinct().forEach { buffer ->
+            this.showNotification(buffer)
+          }
         },
         session.lag.value * 2,
         TimeUnit.MILLISECONDS
       )
     }
+  }
+
+  fun showConnectedNotifications() {
+    database.notifications().buffers().forEach { buffer ->
+      this.showNotification(buffer, true)
+    }
+  }
+
+  fun showDisconnectedNotifications() {
+    database.notifications().buffers().forEach { buffer ->
+      this.showNotification(buffer, false)
+    }
+  }
 
   @Synchronized
-  private fun showNotification(buffer: BufferId) {
+  private fun showNotification(buffer: BufferId, isConnected: Boolean = true) {
     val data = database.notifications().all(buffer)
     data.lastOrNull()?.let {
       // Only send a loud notification if it has any new messages
@@ -310,7 +334,7 @@ class QuasselNotificationBackend @Inject constructor(
         )
       }
       val notification = notificationHandler.notificationMessage(
-        notificationSettings, bufferInfo, notificationData, isLoud
+        notificationSettings, bufferInfo, notificationData, isLoud, isConnected
       )
       notificationHandler.notify(notification)
     } ?: notificationHandler.remove(buffer)

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

@@ -366,6 +366,7 @@ class QuasselService : DaggerLifecycleService(),
 
           if (it == ConnectionState.CLOSED) {
             scheduleReconnect()
+            notificationBackend.showDisconnectedNotifications()
           }
         }
       })

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

@@ -108,7 +108,8 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
   }
 
   fun notificationMessage(notificationSettings: NotificationSettings, bufferInfo: BufferInfo,
-                          notifications: List<NotificationMessage>, isLoud: Boolean): Handle {
+                          notifications: List<NotificationMessage>, isLoud: Boolean,
+                          isConnected: Boolean): Handle {
     val pendingIntentOpen = PendingIntent.getActivity(
       context.applicationContext,
       System.currentTimeMillis().toInt(),
@@ -198,7 +199,8 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
                     }
                   }
       )
-      .addAction(0, translatedLocale.getString(R.string.label_mark_read), markReadPendingIntent)
+      .letIf(isConnected) {
+        it.addAction(0, translatedLocale.getString(R.string.label_mark_read), markReadPendingIntent)
           .letIf(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             it.addAction(
               NotificationCompat.Action.Builder(
@@ -208,6 +210,7 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
               ).addRemoteInput(remoteInput).build()
             )
           }
+      }
       .setWhen(notifications.last().time.toEpochMilli())
       .apply {
         if (bufferInfo.type.hasFlag(Buffer_Type.QueryBuffer)) {

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/RpcHandler.kt

@@ -60,7 +60,7 @@ class RpcHandler(
   override fun displayMsg(message: Message) {
     session.bufferSyncer.bufferInfoUpdated(message.bufferInfo)
     backlogStorage.storeMessages(session, message)
-    notificationManager?.processMessages(session, message)
+    notificationManager?.processMessages(session, true, message)
   }
 
   override fun createIdentity(identity: Identity, additional: QVariantMap) =

lib/src/main/java/de/kuschku/libquassel/session/NotificationManager.kt

@@ -25,6 +25,6 @@ import de.kuschku.libquassel.protocol.MsgId
 
 interface NotificationManager {
   fun init(session: Session)
-  fun processMessages(session: Session, vararg messages: Message)
+  fun processMessages(session: Session, show: Boolean, vararg messages: Message)
   fun clear(buffer: BufferId, lastRead: MsgId = MsgId.MAX_VALUE)
 }

persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt

@@ -216,6 +216,9 @@ abstract class QuasselDatabase : RoomDatabase() {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     fun save(vararg entities: NotificationData)
 
+    @Query("SELECT DISTINCT bufferId FROM notification")
+    fun buffers(): List<BufferId>
+
     @Query("SELECT * FROM notification ORDER BY time ASC")
     fun all(): List<NotificationData>