Added option to save labels

and other improvements and fixes used for exports and imports

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.1.3-2'
+    ext.kotlin_version = '1.1.4-2'
     repositories {
         mavenCentral()
     }

core/src/main/kotlin/ch/dissem/bitmessage/DefaultMessageListener.kt

@@ -23,6 +23,7 @@ import ch.dissem.bitmessage.entity.Plaintext.Status.PUBKEY_REQUESTED
 import ch.dissem.bitmessage.entity.payload.*
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector
 import ch.dissem.bitmessage.exception.DecryptionFailedException
+import ch.dissem.bitmessage.ports.AlreadyStoredException
 import ch.dissem.bitmessage.ports.Labeler
 import ch.dissem.bitmessage.ports.NetworkHandler
 import ch.dissem.bitmessage.utils.Strings.hex
@@ -65,7 +66,7 @@ open class DefaultMessageListener(
 
     protected fun receive(objectMessage: ObjectMessage, getPubkey: GetPubkey) {
         val identity = ctx.addressRepository.findIdentity(getPubkey.ripeTag)
-        if (identity != null && identity.privateKey != null && !identity.isChan) {
+        if (identity?.privateKey != null && !identity.isChan) {
             LOG.info("Got pubkey request for identity " + identity)
             // FIXME: only send pubkey if it wasn't sent in the last TTL.pubkey() days
             ctx.sendPubkey(identity, objectMessage.stream)
@@ -90,7 +91,6 @@ open class DefaultMessageListener(
             }
         } catch (_: DecryptionFailedException) {
         }
-
     }
 
     private fun updatePubkey(address: BitmessageAddress, pubkey: Pubkey) {
@@ -157,14 +157,18 @@ open class DefaultMessageListener(
 
         msg.inventoryVector = iv
         labeler.setLabels(msg)
-        ctx.messageRepository.save(msg)
+        try {
-        listener.receive(msg)
+            ctx.messageRepository.save(msg)
+            listener.receive(msg)
 
-        if (msg.type == Plaintext.Type.MSG && msg.to!!.has(Pubkey.Feature.DOES_ACK)) {
+            if (msg.type == Plaintext.Type.MSG && msg.to!!.has(Pubkey.Feature.DOES_ACK)) {
-            msg.ackMessage?.let {
+                msg.ackMessage?.let {
-                ctx.inventory.storeObject(it)
+                    ctx.inventory.storeObject(it)
-                ctx.networkHandler.offer(it.inventoryVector)
+                    ctx.networkHandler.offer(it.inventoryVector)
-            } ?: LOG.debug("ack message expected")
+                } ?: LOG.debug("ack message expected")
+            }
+        } catch (e: AlreadyStoredException) {
+            LOG.trace("Message was already received before.", e)
         }
     }
 

core/src/main/kotlin/ch/dissem/bitmessage/entity/valueobject/Label.kt

@@ -25,7 +25,8 @@ data class Label(
     /**
      * RGBA representation for the color.
      */
-    var color: Int = 0
+    var color: Int = 0,
+    var ord: Int = 1000
 ) : Serializable {
 
     var id: Any? = null

core/src/main/kotlin/ch/dissem/bitmessage/ports/AlreadyStoredException.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2017 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.ports
+
+/**
+ * Should be thrown if a received and decrypted message can't be stored because it has already been received and stored.
+ * (So it's not announced again to the client.)
+ */
+class AlreadyStoredException(message: String? = null, cause: Throwable? = null) : Exception(message, cause)

core/src/main/kotlin/ch/dissem/bitmessage/ports/MessageRepository.kt

@@ -28,6 +28,8 @@ interface MessageRepository {
 
     fun getLabels(vararg types: Label.Type): List<Label>
 
+    fun save(label: Label)
+
     fun countUnread(label: Label?): Int
 
     fun getAllMessages(): List<Plaintext>

core/src/test/kotlin/ch/dissem/bitmessage/BitmessageContextTest.kt

@@ -218,7 +218,7 @@ class BitmessageContextTest {
         verify(ctx.internals.proofOfWorkRepository, timeout(10000)).putObject(
             argThat { payload.type == ObjectType.MSG }, eq(1000L), eq(1000L))
         assertEquals(2, testPowRepo.added)
-        verify(ctx.messages, timeout(10000).atLeastOnce()).save(argThat { type == Type.MSG })
+        verify(ctx.messages, timeout(10000).atLeastOnce()).save(argThat<Plaintext> { type == Type.MSG })
     }
 
     @Test
@@ -228,7 +228,7 @@ class BitmessageContextTest {
             "Subject", "Message")
         verify(testPowRepo, timeout(10000).atLeastOnce())
             .putObject(argThat { payload.type == ObjectType.GET_PUBKEY }, eq(1000L), eq(1000L))
-        verify(ctx.messages, timeout(10000).atLeastOnce()).save(argThat { type == Type.MSG })
+        verify(ctx.messages, timeout(10000).atLeastOnce()).save(argThat<Plaintext> { type == Type.MSG })
     }
 
     @Test(expected = IllegalArgumentException::class)
@@ -245,7 +245,7 @@ class BitmessageContextTest {
         verify(ctx.internals.proofOfWorkRepository, timeout(1000).atLeastOnce())
             .putObject(argThat { payload.type == ObjectType.BROADCAST }, eq(1000L), eq(1000L))
         verify(testPowEngine).calculateNonce(any(), any(), any())
-        verify(ctx.messages, timeout(10000).atLeastOnce()).save(argThat { type == Type.BROADCAST })
+        verify(ctx.messages, timeout(10000).atLeastOnce()).save(argThat<Plaintext> { type == Type.BROADCAST })
     }
 
     @Test(expected = IllegalArgumentException::class)

core/src/test/kotlin/ch/dissem/bitmessage/DefaultMessageListenerTest.kt

@@ -108,7 +108,7 @@ class DefaultMessageListenerTest : TestBase() {
 
         listener.receive(objectMessage)
 
-        verify(ctx.messageRepository, atLeastOnce()).save(argThat { type == MSG })
+        verify(ctx.messageRepository, atLeastOnce()).save(argThat<Plaintext> { type == MSG })
     }
 
     @Test
@@ -131,6 +131,6 @@ class DefaultMessageListenerTest : TestBase() {
 
         listener.receive(objectMessage)
 
-        verify(ctx.messageRepository, atLeastOnce()).save(argThat { type == BROADCAST })
+        verify(ctx.messageRepository, atLeastOnce()).save(argThat<Plaintext> { type == BROADCAST })
     }
 }

exports/src/main/kotlin/ch/dissem/bitmessage/exports/MessageExport.kt

@@ -91,7 +91,7 @@ object MessageExport {
         }
     }
 
-    fun importLabels(input: JsonArray<Any?>): List<Label> {
+    fun importLabels(input: JsonArray<*>): List<Label> {
         return input.filterIsInstance(JsonObject::class.java).map { json ->
             Label(
                 label = json.string("label") ?: throw IllegalArgumentException("label expected"),

repositories/src/main/kotlin/ch/dissem/bitmessage/repository/JdbcMessageRepository.kt

@@ -20,22 +20,18 @@ import ch.dissem.bitmessage.entity.Plaintext
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector
 import ch.dissem.bitmessage.entity.valueobject.Label
 import ch.dissem.bitmessage.ports.AbstractMessageRepository
+import ch.dissem.bitmessage.ports.AlreadyStoredException
 import ch.dissem.bitmessage.ports.MessageRepository
 import ch.dissem.bitmessage.repository.JdbcHelper.Companion.writeBlob
 import org.slf4j.LoggerFactory
-import java.io.IOException
+import java.sql.*
-import java.sql.Connection
-import java.sql.ResultSet
-import java.sql.SQLException
-import java.sql.Statement
 import java.util.*
 
 class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRepository(), MessageRepository {
 
     override fun findLabels(where: String): List<Label> {
         try {
-            config.getConnection().use {
+            config.getConnection().use { connection ->
-                connection ->
                 return findLabels(connection, where)
             }
         } catch (e: SQLException) {
@@ -51,12 +47,61 @@ class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRep
         } else {
             Label.Type.valueOf(typeName)
         }
-        val label = Label(rs.getString("label"), type, rs.getInt("color"))
+        val label = Label(rs.getString("label"), type, rs.getInt("color"), rs.getInt("ord"))
         label.id = rs.getLong("id")
 
         return label
     }
 
+    override fun save(label: Label) {
+        config.getConnection().use { connection ->
+            if (label.id != null) {
+                connection.prepareStatement("UPDATE Label SET label=?, type=?, color=?, ord=? WHERE id=?").use { ps ->
+                    ps.setString(1, label.toString())
+                    ps.setString(2, label.type?.name)
+                    ps.setInt(3, label.color)
+                    ps.setInt(4, label.ord)
+                    ps.setInt(5, label.id as Int)
+                    ps.executeUpdate()
+                }
+            } else {
+                try {
+                    connection.autoCommit = false
+                    var exists = false
+                    connection.prepareStatement("SELECT COUNT(1) FROM Label WHERE label=?").use { ps ->
+                        ps.setString(1, label.toString())
+                        val rs = ps.executeQuery()
+                        if (rs.next()) {
+                            exists = rs.getInt(1) > 0
+                        }
+                    }
+
+                    if (exists) {
+                        connection.prepareStatement("UPDATE Label SET type=?, color=?, ord=? WHERE label=?").use { ps ->
+                            ps.setString(1, label.type?.name)
+                            ps.setInt(2, label.color)
+                            ps.setInt(3, label.ord)
+                            ps.setString(4, label.toString())
+                            ps.executeUpdate()
+                        }
+                    } else {
+                        connection.prepareStatement("INSERT INTO Label (label, type, color, ord) VALUES (?, ?, ?, ?)").use { ps ->
+                            ps.setString(1, label.toString())
+                            ps.setString(2, label.type?.name)
+                            ps.setInt(3, label.color)
+                            ps.setInt(4, label.ord)
+                            ps.executeUpdate()
+                        }
+                    }
+                    connection.commit()
+                } catch (e: Exception) {
+                    connection.rollback()
+                    throw e
+                }
+            }
+        }
+    }
+
     override fun countUnread(label: Label?): Int {
         val where = if (label == null) {
             ""
@@ -68,7 +113,7 @@ class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRep
         try {
             config.getConnection().use { connection ->
                 connection.createStatement().use { stmt ->
-                    stmt.executeQuery("SELECT count(*) FROM Message WHERE $where").use { rs ->
+                    stmt.executeQuery("SELECT count(1) FROM Message WHERE $where").use { rs ->
                         if (rs.next()) {
                             return rs.getInt(1)
                         }
@@ -127,7 +172,7 @@ class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRep
         val result = ArrayList<Label>()
         try {
             connection.createStatement().use { stmt ->
-                stmt.executeQuery("SELECT id, label, type, color FROM Label WHERE $where").use { rs ->
+                stmt.executeQuery("SELECT id, label, type, color, ord FROM Label WHERE $where").use { rs ->
                     while (rs.next()) {
                         result.add(getLabel(rs))
                     }
@@ -226,11 +271,15 @@ class JdbcMessageRepository(private val config: JdbcConfig) : AbstractMessageRep
             ps.setObject(13, message.nextTry)
             ps.setObject(14, message.conversationId)
 
-            ps.executeUpdate()
+            try {
-            // get generated id
+                ps.executeUpdate()
-            ps.generatedKeys.use { rs ->
+                // get generated id
-                rs.next()
+                ps.generatedKeys.use { rs ->
-                message.id = rs.getLong(1)
+                    rs.next()
+                    message.id = rs.getLong(1)
+                }
+            } catch (e: SQLIntegrityConstraintViolationException) {
+                throw AlreadyStoredException(cause = e)
             }
         }
     }