Author: jflesch
Date: 2007-03-03 23:42:55 +0000 (Sat, 03 Mar 2007)
New Revision: 11951

Modified:
   trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java
Log:
Don't auto-refresh indexes with a private key and a revision == 0 (bug #1138)

Modified: trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java     2007-03-03 
23:42:31 UTC (rev 11950)
+++ trunk/apps/Thaw/src/thaw/plugins/index/AutoRefresh.java     2007-03-03 
23:42:55 UTC (rev 11951)
@@ -106,20 +106,26 @@

                        Index index;

-                       index = new Index(browserPanel.getDb(),
-                                         results.getInt("id"),
-                                         null, results.getString("publicKey"),
-                                         results.getInt("revision"),
-                                         results.getString("privateKey"),
-                                         results.getString("displayName"),
-                                         false);
+                       if (results.getString("privateKey") == null
+                           || results.getInt("revision") > 0) {

-                       index.downloadFromFreenet(this, 
browserPanel.getIndexTree(), queueManager);
+                               Logger.debug(this, "Index unavailable on 
freenet -> not updated");

-                       browserPanel.getIndexTree().redraw();
+                               index = new Index(browserPanel.getDb(),
+                                                 results.getInt("id"),
+                                                 null, 
results.getString("publicKey"),
+                                                 results.getInt("revision"),
+                                                 
results.getString("privateKey"),
+                                                 
results.getString("displayName"),
+                                                 false);

-                       browserPanel.getIndexProgressBar().addTransfer(1);
+                               index.downloadFromFreenet(this, 
browserPanel.getIndexTree(), queueManager);

+                               browserPanel.getIndexTree().redraw();
+
+                               
browserPanel.getIndexProgressBar().addTransfer(1);
+                       }
+
                        return ret;

                } catch(java.sql.SQLException e) {


Reply via email to