From 62b5b49b02d73216f95759b599dfa1c36efc5668 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 4 Dec 2016 15:25:38 +0000 Subject: [PATCH] Console: Sort banlist and floodfills in true binary order, not by base64 string --- .../java/src/net/i2p/router/web/BanlistRenderer.java | 5 ++++- .../src/net/i2p/router/web/ProfileOrganizerRenderer.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java index 5dc9db8d2..d8319165d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java @@ -31,9 +31,12 @@ class BanlistRenderer { _context = context; } + /** + * As of 0.9.29, sorts in true binary order, not base64 string + */ private static class HashComparator implements Comparator, Serializable { public int compare(Hash l, Hash r) { - return l.toBase64().compareTo(r.toBase64()); + return DataHelper.compareTo(l.getData(), r.getData()); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index 99f0c31ff..2c7ca06aa 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -322,11 +322,12 @@ class ProfileOrganizerRenderer { /** * Used for floodfill-only page + * As of 0.9.29, sorts in true binary order, not base64 string * @since 0.9.8 */ private static class HashComparator implements Comparator, Serializable { public int compare(PeerProfile left, PeerProfile right) { - return left.getPeer().toBase64().compareTo(right.getPeer().toBase64()); + return DataHelper.compareTo(left.getPeer().getData(), right.getPeer().getData()); } }