diff --git a/build.xml b/build.xml
index 70b77d9531f7ae083abe858bff23205cf4d4aed8..639fe19894e55fe7e0ebcc17f0cf4ddb55cc1468 100644
--- a/build.xml
+++ b/build.xml
@@ -156,6 +156,8 @@
<target name="copy-i2p-resources" depends="findI2PSource, -dirs" >
<copy file="LICENSE.txt" tofile="res/raw/license_app_txt" />
<copy file="${i2pbase}/installer/resources/themes/console/images/i2plogo.png" todir="res/drawable/" />
+ <copy file="${i2pbase}/installer/resources/themes/console/light/images/header.png" todir="res/drawable/" />
+ <copy file="${i2pbase}/installer/resources/themes/console/light/console.css" tofile="res/raw/console_css" />
<copy file="${i2pbase}/installer/resources/blocklist.txt" tofile="res/raw/blocklist_txt" />
<copy file="${i2pbase}/installer/resources/hosts.txt" tofile="res/raw/hosts_txt" />
<copy file="${i2pbase}/licenses/LICENSE-ElGamalDSA.txt" tofile="res/raw/license_elgamaldsa_txt" />
@@ -199,6 +201,8 @@
<target name="distclean" depends="clean">
<delete dir="${jar.libs.dir}" verbose="${verbose}" />
<delete file="res/drawable/i2plogo.png" verbose="${verbose}"/>
+ <delete file="res/drawable/header.png" verbose="${verbose}"/>
+ <delete file="res/raw/console_css" verbose="${verbose}"/>
<delete file="res/raw/blocklist_txt" verbose="${verbose}" />
<delete file="res/raw/hosts_txt" verbose="${verbose}" />
<delete file="res/raw/license_app_txt" />
diff --git a/res/drawable/itoopie_sm.png b/res/drawable/itoopie_sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c9b87d573bdff9a98db1fb8da68ffec4140d2e6
Binary files /dev/null and b/res/drawable/itoopie_sm.png differ
diff --git a/res/raw/ahelper_conflict_header_ht b/res/raw/ahelper_conflict_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..75738da36f057fd172658ed75dde9e080789e919
--- /dev/null
+++ b/res/raw/ahelper_conflict_header_ht
@@ -0,0 +1,27 @@
+HTTP/1.1 409 Conflict
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Warning: Destination key conflict</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <img src="file:///data/data/net.i2p.android.router/files/docs/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0">
+</div>
+<div class=warning id=warning>
+<h3>Warning: Destination Key Conflict</h3>
+The addresshelper link you followed specifies a different destination key
+than a host entry in your host database.
+Someone could be trying to impersonate another eepsite,
+or people have given two eepsites identical names.
+<p>
+You can resolve the conflict by considering which key you trust,
+and either discarding the addresshelper link,
+discarding the host entry from your host database,
+or naming one of them differently.
+<p>
diff --git a/res/raw/ahelper_new_header_ht b/res/raw/ahelper_new_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..96d512e895b3f851712d9d08059fc54f79040a8b
--- /dev/null
+++ b/res/raw/ahelper_new_header_ht
@@ -0,0 +1,24 @@
+HTTP/1.1 409 New Address
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Information: New Host Name</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <img src="file:///data/data/net.i2p.android.router/files/docs/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0">
+</div>
+<div class=warning id=warning>
+<h3>Information: New Host Name with Address Helper</h3>
+<p>
+The address helper link you followed is for a new host name that is not in your address book.
+You may save this host name to your local address book.
+If you save it to your address book, you will not see this message again.
+If you do not save it, the host name will be forgotten after the next router restart.
+If you do not wish to visit this host, click the "back" button on your browser.
+</p>
diff --git a/res/raw/android_css b/res/raw/android_css
new file mode 100644
index 0000000000000000000000000000000000000000..a20a8ba6f9566062c60d9d85d13f6f3aea21b4fb
--- /dev/null
+++ b/res/raw/android_css
@@ -0,0 +1,13 @@
+/* overrides of console.css */
+
+div.logo {
+ margin: 0 auto;
+ float: none;
+}
+
+/* proxy error messages */
+
+div.warning {
+ margin: 20px;
+ min-width: 360px;
+}
diff --git a/res/raw/auth_header_ht b/res/raw/auth_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..2208634629ac80fa2e02c9bf927c992abdbb86c0
--- /dev/null
+++ b/res/raw/auth_header_ht
@@ -0,0 +1,24 @@
+HTTP/1.1 407 Proxy Authorization Required
+Content-Type: text/html; charset=UTF-8
+Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.5
+Proxy-Authenticate: Basic realm="I2P HTTP Proxy"
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>Proxy Authorization Required</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=warning id=warning>
+<h3>I2P HTTP Proxy Authorization Required</h3>
+This proxy is configured to require a username and password for access.
+Please enter your username and password, or check your
+router configuration
+or
+I2PTunnel configuration.
+To disable authorization, remove the configuration
+<code>i2ptunnel.proxy.auth=basic</code>, then stop and restart the HTTP Proxy tunnel.
+</div>
diff --git a/res/raw/denied_header_ht b/res/raw/denied_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..3c5e454cb8427070814286369c806c794ca69bc0
--- /dev/null
+++ b/res/raw/denied_header_ht
@@ -0,0 +1,19 @@
+HTTP/1.1 403 Request Denied
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Warning: Request Denied</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <img src="file:///data/data/net.i2p.android.router/files/docs/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0">
+</div>
+<div class=warning id=warning>
+<h3>Warning: Request Denied</h3>
+You attempted to connect to a non-I2P website or location.
+</div>
diff --git a/res/raw/dnf_header_ht b/res/raw/dnf_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..109d47418ba2d14cff891521963d768db47262a3
--- /dev/null
+++ b/res/raw/dnf_header_ht
@@ -0,0 +1,22 @@
+HTTP/1.1 504 Gateway Timeout
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Warning: Eepsite not reachable</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <img src="file:///data/data/net.i2p.android.router/files/docs/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0">
+</div>
+<div class=warning id=warning>
+<h3>Warning: Eepsite Unreachable</h3>
+The eepsite was not reachable.
+The eepsite is offline, there is network congestion,
+or your router is not yet well-integrated with peers.
+You may want to retry.
+<hr><b>Could not find the following destination:</b><BR><BR>
diff --git a/res/raw/dnfb_header_ht b/res/raw/dnfb_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..cb094b9a3bddbfbedac59ddefec17067991a21b2
--- /dev/null
+++ b/res/raw/dnfb_header_ht
@@ -0,0 +1,23 @@
+HTTP/1.1 400 Destination Not Found
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Warning: Invalid eepsite destination</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <img src="file:///data/data/net.i2p.android.router/files/docs/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0">
+</div>
+<div class=warning id=warning>
+<h3>Warning: Invalid Destination</h3>
+The eepsite destination specified was not valid, or was
+otherwise unreachable. Perhaps you pasted in the
+wrong BASE64 string or the link you are following is
+bad. The I2P host could also
+be offline. You may want to retry.
+<hr><b>Could not find the following destination:</b><BR><BR>
diff --git a/res/raw/dnfh_header_ht b/res/raw/dnfh_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..659dcc2003d4598a6f4311deeef3cd204f0bc23a
--- /dev/null
+++ b/res/raw/dnfh_header_ht
@@ -0,0 +1,26 @@
+HTTP/1.1 404 Domain Not Found
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Warning: Eepsite unknown</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <img src="file:///data/data/net.i2p.android.router/files/docs/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0">
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</div>
+<div class=warning id=warning>
+<h3>Warning: Eepsite Not Found in Addressbook</h3>
+The eepsite was not found in your router's addressbook.
+Check the link or find a BASE64 address.
+If you have the BASE64 address, paste it into your userhosts.txt in
+your address book,
+use a BASE64 address helper, or use a jump service link below.<br><br>
+Seeing this page often? See <a href="http://www.i2p2.i2p/faq.html#subscriptions">the FAQ</a>
+for help in adding some subscriptions
+to your addressbook.<hr>
+<b>Could not find the following destination:</b><BR><BR>
diff --git a/res/raw/dnfp_header_ht b/res/raw/dnfp_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..d97fe272ed70ccd9bb3c40a27bb90596f2648315
--- /dev/null
+++ b/res/raw/dnfp_header_ht
@@ -0,0 +1,25 @@
+HTTP/1.1 504 Gateway Timeout
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Warning: Outproxy Not Found</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <img src="file:///data/data/net.i2p.android.router/files/docs/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0">
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</div>
+<div class=warning id=warning>
+<h3>Warning: I2P Proxy Not Found</h3>
+The WWW Outproxy was not found.
+It is offline, there is network congestion,
+or your router is not yet well-integrated with peers.
+You may want to retry
+as this will randomly reselect an outproxy from the pool you have defined
+(if you have more than one configured).
+If you continue to have trouble you may want to edit your outproxy list.
+<hr><b>Could not find the following destination:</b><BR><BR>
diff --git a/res/raw/localhost_header_ht b/res/raw/localhost_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..9865fa3776705b0fa538ad8e56948f1c959d96d3
--- /dev/null
+++ b/res/raw/localhost_header_ht
@@ -0,0 +1,18 @@
+HTTP/1.1 403 Access Denied
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Error: Request Denied</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+
+<div class=warning id=warning>
+<h3>Error: Local Access</h3>
+Your browser is misconfigured. Do not use the proxy to access the router console,
+localhost, or local LAN destinations.
+</div>
diff --git a/res/raw/noproxy_header_ht b/res/raw/noproxy_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..f14524230221e23e6a8ffd25252d9839c49fb65a
--- /dev/null
+++ b/res/raw/noproxy_header_ht
@@ -0,0 +1,20 @@
+HTTP/1.1 503 Service Unavailable
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Warning: No outproxy configured</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <img src="file:///data/data/net.i2p.android.router/files/docs/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0">
+</div>
+<div class=warning id=warning>
+<h3>Warning: No Outproxy Configured</h3>
+Your request was for a site outside of I2P, but you have no
+HTTP outproxy configured. Please configure an outproxy in I2PTunnel.
+</div>
diff --git a/res/raw/protocol_header_ht b/res/raw/protocol_header_ht
new file mode 100644
index 0000000000000000000000000000000000000000..299cc69a5cbea424dc8b1db4cba5b94967d31539
--- /dev/null
+++ b/res/raw/protocol_header_ht
@@ -0,0 +1,20 @@
+HTTP/1.1 403 Bad Protocol
+Content-Type: text/html; charset=UTF-8
+Cache-control: no-cache
+Connection: close
+Proxy-Connection: close
+
+<html><head>
+<title>I2P Warning: Non-HTTP Protocol</title>
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/console.css" rel="stylesheet" type="text/css" >
+<link href="file:///data/data/net.i2p.android.router/files/docs/themes/console/light/android.css" rel="stylesheet" type="text/css" >
+</head>
+<body>
+<div class=logo>
+ <img src="file:///data/data/net.i2p.android.router/files/docs/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0">
+</div>
+<div class=warning id=warning>
+<h3>Warning: Non-HTTP Protocol</h3>
+The request uses a bad protocol.
+The I2P HTTP Proxy supports http:// requests ONLY. Other protocols such as https:// and ftp:// are not allowed.
+</div>
diff --git a/src/net/i2p/android/apps/EepGetFetcher.java b/src/net/i2p/android/apps/EepGetFetcher.java
index 6c8ee6a33cc9ca1092d26f2d989f9949e7b4cf8d..983bf400d357bd42bf85c90ab3ccd35118f63229 100644
--- a/src/net/i2p/android/apps/EepGetFetcher.java
+++ b/src/net/i2p/android/apps/EepGetFetcher.java
@@ -27,7 +27,7 @@ public class EepGetFetcher implements EepGet.StatusListener {
private static final String ERROR_HEADER = "<html><head><title>Not Found</title></head><body>";
private static final String ERROR_URL = "<p>Unable to load URL: ";
- private static final String ERROR_ROUTER = "<p>Your router does not appear to be up.</p>";
+ private static final String ERROR_ROUTER = "<p>Your router (or the HTTP proxy) does not appear to be running.</p>";
private static final String ERROR_FOOTER = "</body></html>";
/**
diff --git a/src/net/i2p/android/router/activity/I2PWebViewClient.java b/src/net/i2p/android/router/activity/I2PWebViewClient.java
index d2def71bee4b5a14580d64c7453b7c6b5fbc7814..8c9ecc15f7a30328a5710f0bea42c48452f28748 100644
--- a/src/net/i2p/android/router/activity/I2PWebViewClient.java
+++ b/src/net/i2p/android/router/activity/I2PWebViewClient.java
@@ -38,7 +38,7 @@ class I2PWebViewClient extends WebViewClient {
private static final String HEADER = "<html><head></head><body>";
private static final String FOOTER = "</body></html>";
private static final String ERROR_URL = "<p>Unable to load URL: ";
- private static final String ERROR_ROUTER = "<p>Your router does not appear to be up.</p>";
+ private static final String ERROR_ROUTER = "<p>Your router (or the HTTP proxy) does not appear to be running.</p>";
public I2PWebViewClient(Context ctx) {
super();
diff --git a/src/net/i2p/android/router/service/Init.java b/src/net/i2p/android/router/service/Init.java
index 01434538ec5edb6b742f2642e31eb5512165aff7..6e9f76d2442e0cf245b5a4edb4ded620e7038fb9 100644
--- a/src/net/i2p/android/router/service/Init.java
+++ b/src/net/i2p/android/router/service/Init.java
@@ -72,10 +72,39 @@ class Init {
mergeResourceToFile(R.raw.hosts_txt, "hosts.txt", null);
mergeResourceToFile(R.raw.more_hosts_txt, "hosts.txt", null);
copyResourceToFile(R.raw.blocklist_txt, "blocklist.txt");
+
File abDir = new File(myDir, "addressbook");
abDir.mkdir();
copyResourceToFile(R.raw.subscriptions_txt, "addressbook/subscriptions.txt");
mergeResourceToFile(R.raw.addressbook_config_txt, "addressbook/config.txt", null);
+
+ File docsDir = new File(myDir, "docs");
+ docsDir.mkdir();
+ copyResourceToFile(R.raw.ahelper_conflict_header_ht, "docs/ahelper-conflict-header.ht");
+ copyResourceToFile(R.raw.ahelper_new_header_ht, "docs/ahelper-new-header.ht");
+ copyResourceToFile(R.raw.auth_header_ht, "docs/auth-header.ht");
+ copyResourceToFile(R.raw.denied_header_ht, "docs/denied-header.ht");
+ copyResourceToFile(R.raw.dnf_header_ht, "docs/dnf-header.ht");
+ copyResourceToFile(R.raw.dnfb_header_ht, "docs/dnfb-header.ht");
+ copyResourceToFile(R.raw.dnfh_header_ht, "docs/dnfh-header.ht");
+ copyResourceToFile(R.raw.dnfp_header_ht, "docs/dnfp-header.ht");
+ copyResourceToFile(R.raw.localhost_header_ht, "docs/localhost-header.ht");
+ copyResourceToFile(R.raw.noproxy_header_ht, "docs/noproxy-header.ht");
+ copyResourceToFile(R.raw.protocol_header_ht, "docs/protocol-header.ht");
+
+ File cssDir = new File(docsDir, "themes/console/light");
+ cssDir.mkdirs();
+ copyResourceToFile(R.raw.console_css, "docs/themes/console/light/console.css");
+ copyResourceToFile(R.raw.android_css, "docs/themes/console/light/android.css");
+
+ File imgDir = new File(docsDir, "themes/console/images");
+ imgDir.mkdir();
+ copyResourceToFile(R.drawable.i2plogo, "docs/themes/console/images/i2plogo.png");
+ copyResourceToFile(R.drawable.itoopie_sm, "docs/themes/console/images/itoopie_sm.png");
+
+ File img2Dir = new File(cssDir, "images");
+ img2Dir.mkdir();
+ copyResourceToFile(R.drawable.header, "docs/themes/console/light/images/header.png");
}
deleteOldFiles();