Changeset 8a4c469

Timestamp:

May 31, 2019 3:26:20 PM (11 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

1109331

Parents:

b4f331e6

Message:

Blinding: cache b32, sort by b32 on /configkeyring

Files:

• apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java (modified) (3 diffs)
• core/java/src/net/i2p/data/BlindData.java (modified) (3 diffs)

apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.io.StringWriter;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -90 +93 @@
         if (!local) {
             List<BlindData> bdata = _context.netDb().getBlindData();
-            // TODO sort by hostname
+            if (bdata.size() > 1)
+                Collections.sort(bdata, new BDComparator());
             for (BlindData bd : bdata) {
                 buf.append("\n<tr><td>");
@@ -142 +146 @@
         buf.append("</table>\n");
     }
+
+    /** @since 0.9.41 */
+    private static class BDComparator implements Comparator<BlindData>, Serializable {
+         public int compare(BlindData l, BlindData r) {
+             return l.toBase32().compareTo(r.toBase32());
+        }
+    }
 }

core/java/src/net/i2p/data/BlindData.java

@@ -29 +29 @@
     private boolean _authRequired;
     private long _date;
+    private String _b32;
 
     /**
@@ -218 +219 @@
      */
     public synchronized String toBase32() {
-        return Blinding.encode(_clearSPK, _secret != null, _authKey != null);
-    }
-
-    /**
-     *  @since 0.9.41
-     */
-    public void setSecretRequired() {
+        if (_b32 == null)
+            _b32 = Blinding.encode(_clearSPK, _secretRequired, _authRequired);
+        return _b32;
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    public synchronized void setSecretRequired() {
         _secretRequired = true;
+        _b32 = null;
     }
 
@@ -238 +242 @@
      *  @since 0.9.41
      */
-    public void setAuthRequired() {
+    public synchronized void setAuthRequired() {
         _authRequired = true;
+        _b32 = null;
     }