[Thaw-dev] r14446 - trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-07-30 22:57:36 +0000 (Mon, 30 Jul 2007)
New Revision: 14446

Modified:
   trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
   trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
Log:
Fix getNextUnreadMessage()

Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java   
2007-07-30 22:21:57 UTC (rev 14445)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java   
2007-07-30 22:57:36 UTC (rev 14446)
@@ -257,6 +257,7 @@
                                        "       frostKSKMessages.sigId AS 
sigId, "+
                                        "       frostKSKMessages.date AS date, 
"+
                                        "       frostKSKMessages.rev AS rev, "+
+                                       "       frostKSKMessages.encryptedFor 
AS encryptedFor, "+
                                        "       signatures.nickName AS sigNick, 
"+
                                        "       signatures.publicKey AS 
sigPublicKey, "+
                                        "       signatures.privateKey AS 
sigPrivateKey, "+

Modified: 
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java    
2007-07-30 22:21:57 UTC (rev 14445)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java    
2007-07-30 22:57:36 UTC (rev 14446)
@@ -113,9 +113,13 @@
        }

        protected boolean convertDatabase_0_to_1() {
-               if (!sendQuery("ALTER TABLE frostKSKMessages ADD COLUMN 
encryptedFor INTEGER DEFAULT NULL NULL")
-                   || !sendQuery("ALTER TABLE frostKSKMessages ADD FOREIGN KEY 
(encryptedFor) REFERENCES signatures (id)")) {
+               boolean b = sendQuery("ALTER TABLE frostKSKMessages ADD COLUMN 
encryptedFor INTEGER DEFAULT NULL NULL");

+               boolean c = sendQuery("ALTER TABLE frostKSKMessages ADD FOREIGN 
KEY (encryptedFor) REFERENCES signatures (id)");
+               b = b & c;
+
+               if (!b) {
+
                        Logger.error(this, "Error while converting the board 
database from version 0 to 1");
                        return false;