From 2d41de7ae002dea897ec65414e4122d0dbd7ec48 Mon Sep 17 00:00:00 2001
From: ragnarok <ragnarok>
Date: Wed, 9 Feb 2005 02:21:43 +0000
Subject: [PATCH] Restore original method of filtering names with non .i2p tlds
---
.../java/src/addressbook/AddressBook.java | 27 ++-----------------
.../java/src/addressbook/Daemon.java | 3 +--
2 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/apps/addressbook/java/src/addressbook/AddressBook.java b/apps/addressbook/java/src/addressbook/AddressBook.java
index c0d3f8c260..41a34ee170 100644
--- a/apps/addressbook/java/src/addressbook/AddressBook.java
+++ b/apps/addressbook/java/src/addressbook/AddressBook.java
@@ -188,7 +188,7 @@ public class AddressBook {
String otherKey = (String) otherIter.next();
String otherValue = (String) other.addresses.get(otherKey);
- if (otherValue.length() >= 516) {
+ if (otherKey.endsWith(".i2p") && otherValue.length() >= 516) {
if (this.addresses.containsKey(otherKey)) {
if (!this.addresses.get(otherKey).equals(otherValue)
&& log != null) {
@@ -243,27 +243,4 @@ public class AddressBook {
public void write() {
this.write(new File(this.location));
}
-
- /**
- * Filter out bad addresses in this addressbook, and write them to log.
- * Returns the number of addresses removed.
- *
- * @author Sugadude
- */
- public int filter(Log log) {
- Iterator iter = this.addresses.keySet().iterator();
- int removed = 0;
- while(iter.hasNext()) {
- String aKey = (String) iter.next();
- if(!aKey.endsWith(".i2p")) {
- iter.remove();
- removed++;
- if(log != null)
- log.append("Invalid address " + aKey + " filtered out.");
- }
- }
- if(removed > 0)
- this.modified = true;
- return removed;
- }
-}
+}
\ No newline at end of file
diff --git a/apps/addressbook/java/src/addressbook/Daemon.java b/apps/addressbook/java/src/addressbook/Daemon.java
index e9af850a05..770501b5e9 100644
--- a/apps/addressbook/java/src/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/addressbook/Daemon.java
@@ -64,7 +64,6 @@ public class Daemon {
while (iter.hasNext()) {
master.merge((AddressBook) iter.next(), log);
}
- master.filter(log); /** @author Sugadude */
master.write(new File(routerLocation));
master.write(published);
subscriptions.write();
@@ -169,4 +168,4 @@ public class Daemon {
}
}
}
-}
+}
\ No newline at end of file
--
GitLab