From d71ead3f5317fa25accf4cb1cfb5272a54e1b4f5 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 21 Jun 2011 01:56:01 +0000
Subject: [PATCH] Bump to API 8 for setBlockNetworkLoads() More welcome file
updates
---
AndroidManifest.xml | 8 +++-----
README.txt | 5 ++---
build.xml | 1 -
jni/build.sh | 2 +-
res/raw/welcome_html | 28 ----------------------------
5 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 852b2fc99..2363507be 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.i2p.android.router"
- android.versionCode="4206788"
- android.versionName="0.8.6-24_b132-SDK3"
+ android.versionCode="4206808"
+ android.versionName="0.8.6-27_b56-SDK8"
android:installLocation="preferExternal"
>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <!-- 3 = 1.5, 2 = 1.1, 1 = 1.0; would probably work with 1 but don't have a 1.0 SDK to test against -->
- <!-- 3 required for NDK -->
- <uses-sdk android:minSdkVersion="7" />
+ <uses-sdk android:minSdkVersion="8" />
<application android:label="@string/app_name"
android:icon="@drawable/ic_launcher_itoopie" >
diff --git a/README.txt b/README.txt
index 160830219..dec166921 100644
--- a/README.txt
+++ b/README.txt
@@ -30,10 +30,9 @@ The i2p source must be installed in ../i2p.i2p
# DO NOT create a new project or anything. It's all set up right here for you.
-# Create the android 1.5 (API 3) virtual device
+# Create the android 2.2 (API 8) virtual device
# (don't make a custom hardware profile)
-# A AVD created with the 1.5 SDK will not work with the newer tools
-../android-sdk-linux_86/tools/android create avd --name i2p --target 3
+../android-sdk-linux_86/tools/android create avd --name i2p --target 8
#then run the emulator:
../android-sdk-linux_86/tools/emulator -avd i2p &
diff --git a/build.xml b/build.xml
index 21d83490e..52153ca7e 100644
--- a/build.xml
+++ b/build.xml
@@ -69,7 +69,6 @@
-->
<setup import="true" />
- <echo>Ignore warning about SDK version</echo>
<!--
================================================================================
New I2P rules
diff --git a/jni/build.sh b/jni/build.sh
index 591014863..6f0db1b1c 100755
--- a/jni/build.sh
+++ b/jni/build.sh
@@ -22,7 +22,7 @@ export NDK=$(realpath ../../android-ndk-r5b/)
#
# API level, must match that in ../AndroidManifest.xml
#
-LEVEL=7
+LEVEL=8
ARCH=arm
export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/
export AABI=arm-linux-androideabi-4.4.3
diff --git a/res/raw/welcome_html b/res/raw/welcome_html
index a67458839..55e5b03a0 100644
--- a/res/raw/welcome_html
+++ b/res/raw/welcome_html
@@ -54,22 +54,6 @@ client</a>
target="_blank">hq.postman.i2p</a>.
</li>
-<li class="tidylist"><b>Anonymous File Transfer</b><br><a href="/i2psnark/"
-target="_blank">I2PSnark</a> is integrated into I2P, providing anonymous,
-encrypted <a
-href="https://secure.wikimedia.org/wikipedia/en/wiki/BitTorrent_%28protocol%29"
-target="_blank">BitTorrent</a> transfers.
- In addition, Sponge develops a bittorrent client called <a
-href="http://bob.i2p/Robert.html">Robert</a> written in Python.
- There is also a port of <a href="http://www.emule-project.net/"
-target="_blank">eMule</a> to I2P called <a
-href="http://echelon.i2p/imule/">iMule</a> [Needs developers!], an anonymous,
-secure implementation of a <a
-href="https://secure.wikimedia.org/wikipedia/en/wiki/Gnutella"
-target="_blank">Gnutella network</a>, accessible using <a
-href="http://echelon.i2p/i2phex/" target="_blank">I2Phex</a> [maintained by
-Complication, seeking new developers!], and additional facilities including
-browser-based file hosting.</li>
<li class="tidylist"><b>Anonymous Chat</b><br>Start your IRC client (e.g.
Chatzilla, Pidgin, XChat)
and connect to the <a href="irc://127.0.0.1:6668/i2p-help">server</a> at
@@ -199,18 +183,6 @@ or perhaps <a href="http://paste.i2p2.i2p/" target="_blank">paste</a> it
instead and reference the link on IRC for help.
</li>
-<li class="tidylist"><b>Verify Java is Up to Date</b><br>Ensure your Java is up
-to date [version 1.6 recommended and required for some features]. Check the
-version of your JRE (<a
-href="https://secure.wikimedia.org/wikipedia/en/wiki/JRE" target="_blank">Java
-Runtime Environment</a>)
- at the top of <a href="/logs">the logs page</a>.
- If you're a developer, a <a
-href="https://secure.wikimedia.org/wikipedia/en/wiki/Java_SDK"
-target="_blank">Java SDK</a> and <a href="http://ant.apache.org/"
-target="_blank">Apache Ant</a> are required to build from source.
- </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/"
target="_blank">I2P website</a>,
--
GitLab