From d139892ae0992b5c8e9a9b6d02b62d67432641ce Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 10 May 2017 13:49:34 +0000
Subject: [PATCH] SusiDNS: Fix display of default subscription when no
subscriptions.txt file present
---
apps/addressbook/java/src/net/i2p/addressbook/Daemon.java | 1 +
apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
index 36c9f6c0a7..5ccd348645 100644
--- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java
@@ -52,6 +52,7 @@ class Daemon {
public static final String VERSION = "2.0.4";
private volatile boolean _running;
private static final boolean DEBUG = false;
+ // If you change this, change in SusiDNS SubscriptionBean also
private static final String DEFAULT_SUB = "http://i2p-projekt.i2p/hosts.txt";
/** @since 0.9.12 */
static final String OLD_DEFAULT_SUB = "http://www.i2p2.i2p/hosts.txt";
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java
index c1043260f2..2ecd991b20 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java
@@ -45,6 +45,8 @@ public class SubscriptionsBean extends BaseBean
{
private String fileName, content;
private static final String SUBS_FILE = "subscriptions.txt";
+ // If you change this, change in Addressbook Daemon also
+ private static final String DEFAULT_SUB = "http://i2p-projekt.i2p/hosts.txt";
public String getFileName()
{
@@ -87,6 +89,8 @@ public class SubscriptionsBean extends BaseBean
if (br != null)
try { br.close(); } catch (IOException ioe) {}
}
+ } else {
+ content = DEFAULT_SUB;
}
}
--
GitLab