/*
 * This file is part of Bitsquare.
 *
 * Bitsquare is free software: you can redistribute it and/or modify it
 * under the terms of the GNU Affero General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or (at
 * your option) any later version.
 *
 * Bitsquare 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 Affero General Public
 * License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
 */

package io.bitsquare.crypto;

import io.bitsquare.p2p.Message;

import java.security.PublicKey;

public final class DecryptedMsgWithPubKey {
    public final Message message;
    public final PublicKey signaturePubKey;

    public DecryptedMsgWithPubKey(Message message, PublicKey signaturePubKey) {
        this.message = message;
        this.signaturePubKey = signaturePubKey;
    }

    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (!(o instanceof DecryptedMsgWithPubKey)) return false;

        DecryptedMsgWithPubKey that = (DecryptedMsgWithPubKey) o;

        if (message != null ? !message.equals(that.message) : that.message != null) return false;
        return !(signaturePubKey != null ? !signaturePubKey.equals(that.signaturePubKey) : that.signaturePubKey != null);

    }

    @Override
    public int hashCode() {
        int result = message != null ? message.hashCode() : 0;
        result = 31 * result + (signaturePubKey != null ? signaturePubKey.hashCode() : 0);
        return result;
    }

    @Override
    public String toString() {
        return "DecryptedMsgWithPubKey{" +
                ", message=" + message +
                ", signaturePubKey.hashCode()=" + signaturePubKey.hashCode() +
                '}';
    }
}

@@ -725,16 +725,101 @@
 rypto;%0A%0A
+import io.bitsquare.app.Version;%0Aimport io.bitsquare.common.persistance.Persistable;%0A
 import i
@@ -919,17 +919,215 @@
 hPubKey 
-%7B
+implements Persistable %7B%0A    // That object is saved to disc. We need to take care of changes to not break deserialization.%0A    private static final long serialVersionUID = Version.LOCAL_DB_VERSION;%0A
 %0A    pub

add persistable