diff --git a/res/raw/initialnews_html b/res/raw/initialnews_html
index 6a32ced86fec8bfd327069a9c0d52930be3200fd..b2c837bc089153ace3a3440e8172081b819a050e 100644
--- a/res/raw/initialnews_html
+++ b/res/raw/initialnews_html
@@ -13,8 +13,8 @@ While you are waiting, please read the release notes and welcome page.
<p>
Once you have client tunnels,
please <b>check out</b> our
- <a href="http://www.i2p2.i2p/faq.html">FAQ</a>.
-Or use the <a href="http://www.i2p2.de/faq.html">non-anonymous link</a>
+ <a href="http://i2p-projekt.i2p/faq">FAQ</a>.
+Or use the <a href="https://geti2p.net/faq">non-anonymous link</a>
if you don't want to wait for tunnels.
</p>
<p>
diff --git a/res/raw/releasenotes_txt b/res/raw/releasenotes_txt
index 7e22ee616e745af7f5405b4fae581521d746cd7f..4a5cd87e4bcf73088acca824e9d7f9e4634855be 100644
--- a/res/raw/releasenotes_txt
+++ b/res/raw/releasenotes_txt
@@ -77,4 +77,4 @@ Report results and bugs on the zzz.i2p Android forum (preferred) or on trac.i2p2
Help Wanted!
------------
-Want to help make the app better? Volunteer on the zzz.i2p Android forum. Want to donate money or bitcoins to buy more Android devices, including tablets, for development and testing? Go to www.i2p2.i2p/donate.
+Want to help make the app better? Volunteer on the zzz.i2p Android forum. Want to donate money or bitcoins to buy more Android devices, including tablets, for development and testing? Go to i2p-projekt.i2p/donate.
diff --git a/res/raw/welcome_html b/res/raw/welcome_html
index 7f0973dd735f32efff1942c60ce7fee34150dea9..762ca8910b74f7460bb71434c692cb97293cc0f8 100644
--- a/res/raw/welcome_html
+++ b/res/raw/welcome_html
@@ -74,11 +74,8 @@ intercept your conversation!
<h3>I2P-Hosted Sites of Interest</h3>
<ul class="links">
<li class="tidylist"><b>Invisible Internet Project (I2P) Official
-Website</b><br><a href="http://www.i2p2.i2p/" target="_blank">www.i2p2.i2p</a>
-and
- its mirror <a href="http://i2p-projekt.i2p/"
-target="_blank">i2p-projekt.i2p</a>: Secure and
- anonymous connections to <a href="http://www.i2p2.de/"
+Website</b><br><a href="http://i2p-projekt.i2p/" target="_blank">i2p-projekt.i2p</a>:
+Secure and anonymous connections to <a href="http://www.i2p2.de/"
target="_blank">www.i2p2.de</a>. There's also an official mirror running on <a
href="http://geti2p.net/" target="_blank">geti2p.net</a>. If you want to know
more about how I2P works or how you can participate, this is your first port of
@@ -91,7 +88,7 @@ and users alike discuss problems and ideas relating to I2P and associated
topics, and <a href="http://zzz.i2p/" target="_blank">zzz's developer
forums</a> for both end users and developers.</li>
<li class="tidylist"><b>I2P Anonymous Pastebin</b><br><a
-href="http://paste.i2p2.i2p/" target="_blank">paste.i2p2.i2p</a>: Secure and
+href="http://pastethis.i2p/" target="_blank">paste.i2p2.i2p</a>: Secure and
anonymous paste service allowing anonymous text and text-based code
sharing over I2P.</li>
<li class="tidylist"><b>Echelon's I2P Resources</b><br><a
@@ -141,12 +138,12 @@ than 5, there are several things you can do to check for problems:
<li class="tidylist"><b>Check Your Logs</b><br>Logs may
help resolve a problem. You may wish to paste excerpts in a <a
href="http://forum.i2p/viewforum.php?f=10" target="_blank">forum</a> for help,
-or perhaps <a href="http://paste.i2p2.i2p/" target="_blank">paste</a> it
+or perhaps <a href="http://pastethis.i2p/" target="_blank">paste</a> it
instead and reference the link on IRC for help.
</li>
<li class="tidylist"><b>Getting Support Online</b><br>You may also want
- to review the information on the <a href="http://www.i2p2.i2p/"
+ to review the information on the <a href="http://i2p-projekt.i2p/"
target="_blank">I2P website</a>,
post messages to the <a href="http://forum.i2p/" target="_blank">I2P
discussion forum</a> (also reachable <a href="http://forum.i2p2.de/"
@@ -170,24 +167,24 @@ href="http://stats.i2p/cgi-bin/viewmtn/" target="_blank">zzz's mtn repository
viewer</a>, <a href="http://i2host.i2p/cgi-bin/view/branch/changes/i2p.i2p"
target="_blank">Sponge's instance</a>, or via <a
href="http://trac.i2p2.i2p/browser" target="_blank">trac.i2p2.i2p</a>. We
-primarily use <a href="http://www.i2p2.i2p/monotone.html"
+primarily use <a href="http://i2p-projekt.i2p/monotone.html"
target="_blank">monotone</a> to manage our source code.
</li>
<li class="tidylist"><b>Get Involved!</b><br>I2P is developed and maintained
mostly through unfunded, voluntary participation by community members. We're
-happy to accept <a href="http://www.i2p2.i2p/donate.html"
+happy to accept <a href="http://i2p-projekt.i2p/donate.html"
target="_blank">donations</a>, which go into essential hosting and
-administrative costs. We have <a href="http://www.i2p2.i2p/bounties.html"
+administrative costs. We have <a href="http://i2p-projekt.i2p/bounties.html"
target="_blank">cash bounties</a> for aspects of I2P for developers looking for
incentives to participate, and we're always looking for more <a
-href="http://www.i2p2.i2p/newdevelopers.html" target="_blank">Java coders</a>,
-<a href="http://www.i2p2.i2p/newtranslators.html"
+href="http://i2p-projekt.i2p/newdevelopers.html" target="_blank">Java coders</a>,
+<a href="http://i2p-projekt.i2p/newtranslators.html"
target="_blank">translators</a>, promoters and users to help I2P grow. The
bigger the I2P network, the more everyone benefits, so simply telling all your
friends about I2P (and lending a hand with the installation and setup where
needed) is a big help. For further info on how you can participate, visit the
-<a href="http://www.i2p2.i2p/getinvolved.html" target="_blank">volunteers
+<a href="http://i2p-projekt.i2p/getinvolved.html" target="_blank">volunteers
page</a> on the website.
</li>
diff --git a/src/net/i2p/android/apps/NewsFetcher.java b/src/net/i2p/android/apps/NewsFetcher.java
index 876367d5d91565184120d9c3b6b2687a094f6b59..8b40a87a62f7cb8bb2507c76749d2b8353e76e9f 100644
--- a/src/net/i2p/android/apps/NewsFetcher.java
+++ b/src/net/i2p/android/apps/NewsFetcher.java
@@ -38,8 +38,15 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
private static final String NEWS_DIR = "docs";
private static final String NEWS_FILE = "news.xml";
private static final String TEMP_NEWS_FILE = "news.xml.temp";
- /** @since 0.7.14 not configurable */
- private static final String BACKUP_NEWS_URL = "http://www.i2p2.i2p/_static/news/news.xml";
+
+ /**
+ * Changed in 0.9.11 to the b32 for psi.i2p, run by psi.
+ * We may be able to change it to psi.i2p in a future release after
+ * the hostname propagates.
+ *
+ * @since 0.7.14 not configurable
+ */
+ private static final String BACKUP_NEWS_URL = "http://avviiexdngd32ccoy4kuckvc3mkf53ycvzbz6vz75vzhv4tbpk5a.b32.i2p/news.xml";
private static final String PROP_LAST_CHECKED = "router.newsLastChecked";
private static final String PROP_REFRESH_FREQUENCY = "router.newsRefreshFrequency";
private static final String DEFAULT_REFRESH_FREQUENCY = 24*60*60*1000 + "";
diff --git a/src/net/i2p/android/router/activity/MainActivity.java b/src/net/i2p/android/router/activity/MainActivity.java
index c0af403a93e92d711982da1eebc4bca4c64f6236..0c30485a379f264b6f6a06eb14d6a713e4e871ea 100644
--- a/src/net/i2p/android/router/activity/MainActivity.java
+++ b/src/net/i2p/android/router/activity/MainActivity.java
@@ -96,7 +96,7 @@ public class MainActivity extends I2PActivityBase {
public void onClick(View view) {
Intent intent = new Intent(view.getContext(), WebActivity.class);
//intent.setData((new Uri.Builder()).scheme("http").authority("www.i2p2.de").path("/").build());
- intent.setData(Uri.parse("http://www.i2p2.de/"));
+ intent.setData(Uri.parse("https://geti2p.net/"));
startActivity(intent);
}
});
@@ -107,7 +107,7 @@ public class MainActivity extends I2PActivityBase {
public void onClick(View view) {
Intent intent = new Intent(view.getContext(), WebActivity.class);
//intent.setData((new Uri.Builder()).scheme("http").authority("www.i2p2.de").path("/faq").build());
- intent.setData(Uri.parse("http://www.i2p2.de/faq"));
+ intent.setData(Uri.parse("https://geti2p.net/faq"));
startActivity(intent);
}
});