Fixed newly introduced bugs

app/src/main/java/ch/dissem/apps/abit/MainActivity.kt

@@ -220,6 +220,7 @@ class MainActivity : AppCompatActivity(), ListSelectionListener<Serializable> {
 
         val drawerItems = ArrayList<IDrawerItem<*, *>>()
         drawerItems.add(PrimaryDrawerItem()
+            .withIdentifier(LABEL_ARCHIVE.id as Long)
             .withName(R.string.archive)
             .withTag(LABEL_ARCHIVE)
             .withIcon(CommunityMaterial.Icon.cmd_archive)
@@ -343,7 +344,7 @@ class MainActivity : AppCompatActivity(), ListSelectionListener<Serializable> {
         }
         Singleton.getMessageListener(this).resetNotification()
         currentLabel.addObserver(this) { label ->
-            if (label != null) {
+            if (label != null && label.id is Long) {
                 drawer.setSelection(label.id as Long)
             }
         }

app/src/main/java/ch/dissem/apps/abit/repository/AndroidLabelRepository.kt

@@ -85,7 +85,7 @@ class AndroidLabelRepository(private val sql: SqlHelper, private val context: Co
     internal fun findLabels(msgId: Any) = find("id IN (SELECT label_id FROM Message_Label WHERE message_id=$msgId)")
 
     companion object {
-        val LABEL_ARCHIVE = Label("archive", null, 0)
+        val LABEL_ARCHIVE = Label("archive", null, 0).apply { id = Long.MAX_VALUE }
 
         private const val TABLE_NAME = "Label"
         private const val COLUMN_ID = "id"

app/src/main/java/ch/dissem/apps/abit/service/Singleton.kt

@@ -50,6 +50,8 @@ object Singleton {
     private var swipeableMessageAdapter: WeakReference<SwipeableMessageAdapter>? = null
     val labeler = DefaultLabeler().apply {
         listener = { message, added, removed ->
+            MainActivity.apply {
+                runOnUiThread {
                     swipeableMessageAdapter?.get()?.let { swipeableMessageAdapter ->
                         currentLabel.value?.let { label ->
                             when {
@@ -78,8 +80,8 @@ object Singleton {
                             }
                         }
                     }
+                }
                 if (removed.any { it.type == Label.Type.UNREAD } || added.any { it.type == Label.Type.UNREAD }) {
-                MainActivity.apply {
                     updateUnread()
                 }
             }