From 63a0e2117fcbcd37e820cc18052273f7977e3d2f Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 12 Jun 2014 23:17:05 +0000
Subject: [PATCH] Copy i2ptunnel.config from resource for new installs
---
src/net/i2p/android/router/InitActivities.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/net/i2p/android/router/InitActivities.java b/src/net/i2p/android/router/InitActivities.java
index d3531cd73..3e531b51b 100644
--- a/src/net/i2p/android/router/InitActivities.java
+++ b/src/net/i2p/android/router/InitActivities.java
@@ -82,6 +82,7 @@ class InitActivities {
// settings, which can now be configured manually. We don't want to
// overwrite the user's tunnels.
//mergeResourceToFile(R.raw.i2ptunnel_config, "i2ptunnel.config", null);
+ copyResourceToFileIfAbsent(R.raw.i2ptunnel_config, "i2ptunnel.config");
// FIXME this is a memory hog to merge this way
mergeResourceToFile(R.raw.hosts_txt, "hosts.txt", null);
mergeResourceToFile(R.raw.more_hosts_txt, "hosts.txt", null);
@@ -145,6 +146,15 @@ class InitActivities {
System.setProperty("wrapper.logfile", myDir + "/wrapper.log");
}
+ /**
+ * @param f relative to base dir
+ */
+ private void copyResourceToFileIfAbsent(int resID, String f) {
+ File file = new File(myDir, f);
+ if (!file.exists())
+ copyResourceToFile(resID, f);
+ }
+
/**
* @param f relative to base dir
*/
--
GitLab