Make shared clients (IRC) delay-open since the HTTP proxy

is not a shared client any more.

.classpath

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2ptunnel"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/BOB"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/addressbook"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

.mtn-ignore

@@ -22,3 +22,21 @@ _jsp\.java$
 ~$
 /build/
 /classes/
+
+# Android-specific ignores
+^bin
+^gen
+^routerjars/bin
+^routerjars/gen
+^routerjars/lib
+AndroidManifest.xml
+lint.xml
+local.properties
+
+# I2P-specific ignores
+^res/raw/blocklist_txt
+^res/raw/certificates_zip
+^res/raw/hosts_txt
+^res/raw/license_
+^scripts/build.number
+^scripts/version.properties

.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>I2P_Android</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

.tx/config

@@ -0,0 +1,11 @@
+[main]
+host = https://www.transifex.com
+lang_map = pt_BR: pt-rBR, ru_RU: ru, sv_SE: sv, tr_TR: tr, zh_CN: zh
+
+[I2P.android]
+file_filter = res/values-<lang>/strings.xml
+source_file = res/values/strings.xml
+source_lang = en
+type = ANDROID
+minimum_perc = 50
+

AndroidManifest.xml.in

@@ -1,49 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="net.i2p.android.router"
-      android.versionCode="0"
-      android.versionName="0.0.0-0_b0-API8"
+      android:versionCode="0"
+      android:versionName="0.0.0-0_b0-API8"
       android:installLocation="auto"
       >
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="8"
+              android:targetSdkVersion="19" />
 
     <application android:label="@string/app_name"
+               android:theme="@style/Theme.AppCompat"
                android:icon="@drawable/ic_launcher_itoopie" >
         <service android:name=".service.RouterService"
                   android:label="@string/app_name"
-                  android:icon="@drawable/ic_launcher_itoopie" />
+                  android:icon="@drawable/ic_launcher_itoopie" >
+            <intent-filter>
+                <action android:name="net.i2p.android.router.service.IRouterState" />
+            </intent-filter>
+        </service>
         <provider android:name=".provider.CacheProvider"
                   android:authorities="net.i2p.android.router" />
-        <activity android:name=".activity.MainActivity"
+        <activity android:name=".MainActivity"
                   android:label="@string/app_name"
                   android:icon="@drawable/ic_launcher_itoopie"
-                  android.theme="@android:style/Theme.NoTitleBar"
                   android:launchMode="singleTop" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="net.i2p.android.router.START_I2P" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
-        <activity android:name=".activity.NewsActivity"
+        <activity android:name=".NewsActivity"
                   android:label="I2P News"
-                  android:configChanges="orientation|keyboardHidden"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+                  android:configChanges="orientation|keyboardHidden" >
         </activity>
-        <activity android:name=".activity.TextResourceActivity"
-                  android:label="I2P Information"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+        <activity android:name=".HelpActivity"
+                  android:label="Help"
+                  android:parentActivityName=".MainActivity" >
         </activity>
-        <activity android:name=".activity.LicenseActivity"
+        <activity android:name=".LicenseActivity"
                   android:label="I2P License Information"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+                  android:parentActivityName=".HelpActivity" >
         </activity>
-        <activity android:name=".activity.WebActivity"
+        <activity android:name=".web.WebActivity"
                   android:label="I2P Web Browser"
-                  android:configChanges="orientation|keyboardHidden"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+                  android:configChanges="orientation|keyboardHidden" >
+            <!-- Disabled, this browser is not very secure
+            Temporarily enabled until an alternative browser is ready -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -51,30 +60,68 @@
                 <data android:host="*.i2p" android:scheme="http" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.SettingsActivity"
+        <activity android:name=".SettingsActivity"
                   android:label="I2P Settings"
-                  android.theme="@android:style/Theme.NoTitleBar"
-                  android:launchMode="singleTop" >
+                  android:parentActivityName=".MainActivity" >
         </activity>
-        <activity android:name=".activity.AddressbookSettingsActivity"
+        <activity android:name=".addressbook.AddressbookSettingsActivity"
                   android:label="I2P Addressbook Settings"
-                  android.theme="@android:style/Theme.NoTitleBar"
+                  android:parentActivityName=".addressbook.AddressbookActivity"
                   android:launchMode="singleTop" >
         </activity>
-        <activity android:name=".activity.AddressbookActivity"
-                  android:label="I2P Address Book"
-                  android.theme="@android:style/Theme.NoTitleBar"
+        <activity android:name=".addressbook.AddressbookActivity"
+                  android:label="Addressbook"
+                  android:launchMode="singleTop" >
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                       android:resource="@xml/searchable_addressbook"/>
+        </activity>
+        <activity android:name=".addressbook.AddressbookAddWizardActivity"
+                  android:label="Add new Destination"
+                  android:parentActivityName=".addressbook.AddressbookActivity" >
+        </activity>
+        <activity android:name="net.i2p.android.i2ptunnel.TunnelListActivity"
+                  android:label="I2PTunnel"
                   android:launchMode="singleTop" >
         </activity>
-        <activity android:name=".activity.LogActivity"
+        <activity android:name="net.i2p.android.i2ptunnel.TunnelDetailActivity"
+                  android:label="I2PTunnel"
+                  android:parentActivityName="net.i2p.android.i2ptunnel.TunnelListActivity" >
+        </activity>
+        <activity android:name="net.i2p.android.i2ptunnel.TunnelWizardActivity"
+                  android:label="Tunnel Creation Wizard"
+                  android:parentActivityName="net.i2p.android.i2ptunnel.TunnelListActivity" >
+        </activity>
+        <activity android:name=".log.LogActivity"
                   android:label="I2P Logs"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+                  android:parentActivityName=".MainActivity" >
         </activity>
-        <activity android:name=".activity.PeersActivity"
+        <activity android:name=".log.LogDetailActivity"
+                  android:label="Log Entry"
+                  android:parentActivityName=".log.LogActivity" >
+        </activity>
+        <activity android:name=".stats.RateGraphActivity"
+                  android:label="Rate Graph"
+                  android:parentActivityName=".MainActivity" >
+        </activity>
+        <activity android:name=".stats.PeersActivity"
                   android:label="I2P Peers and Transport Status"
                   android:configChanges="orientation|keyboardHidden"
-                  android.theme="@android:style/Theme.NoTitleBar"
                   android:launchMode="singleTop" >
         </activity>
+        <activity android:name=".netdb.NetDbActivity"
+                  android:label="NetDB"
+                  android:parentActivityName=".MainActivity" >
+        </activity>
+        <activity android:name=".netdb.NetDbDetailActivity"
+                  android:label="NetDB Detail"
+                  android:parentActivityName=".netdb.NetDbActivity" >
+        </activity>
     </application>
 </manifest>

README.txt

@@ -14,7 +14,7 @@ Dependencies:
 - Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
 - Apache Ant 1.8.0 or higher
 - I2P source in ../i2p.i2p
-- Android SDK (tested with Rev 20 and platform-tools version 12)
+- Android SDK (tested with Rev 22.3 and platform-tools version 19)
 
 =====================
 
@@ -29,11 +29,18 @@ Instructions:
 
 # now go to the available packages tab, check the box and click refresh,
 # and download an SDK Platform
-# Since I2P is configured to run on 2.2 or higher
-# (API 8) download at least that one. Otherwise you must change the
-# target in project.properties from android-8 to andriod-x
+# Since I2P is targeted at 4.4 (API 19)
+# download at least that one. Otherwise you must change the
+# target in project.properties from android-19 to andriod-x
 # where x is the API version.
 
+# I2P is configured to run on 2.2 (API 8) or higher using the
+# Android Support Library, so download that as well
+# (it's under "Extras"). 
+
+# update the compatibility project
+../android-sdk-linux/tools/android update lib-project -p ../android-sdk-linux/extras/android/support/v7/appcompat -t android-19
+
 # To run the debugger (ddms) you also need to download the
 # "Android SDK Platform-Tools" package from the GUI updater.
 
@@ -42,11 +49,18 @@ Instructions:
 # sdk.dir=/path/to/your/android-sdk-linux
 # Copy this file to the routerjars/ directory, it is needed in both places.
 
+# If your SDK is not in ../android-sdk-linux/ then you must
+# override the location of the Android Support Library. Add
+# the following line to local.properties
+# do NOT use an absolute path
+# android.library.reference.2=path/to/your/android-sdk-linux/extras/android/support/v7/appcompat
+# Don't add it to the local.properties in the routerjars/ directory.
+
 # DO NOT create a new project or anything. It's all set up right here for you.
 
-# Create the android 2.2 (API 8) virtual device
+# Create the android 4.4 (API 19) virtual device
 # (don't make a custom hardware profile)
-../android-sdk-linux/tools/android create avd --name i2p --target 8
+../android-sdk-linux/tools/android create avd --name i2p --target android-19
 
 # then run the emulator:
 #  This may take a LONG time the first time (half an hour or more)...

TODO

@@ -0,0 +1,36 @@
+# Required for release
+
+- Display release notes directly on new router version
+- Text content
+  - Move help content from release notes to help page
+  - Rewrite release notes to be release-specific
+  - Fill out help page
+- Fix release notes UI, either make back button use clear or add buttons
+- NetDB tablet view fixes
+  - Refresh detail fragment when changing tab
+  - Move list to correct item when changing tab
+  - Create nav history when viewing RI from LS
+- Include GeoIP db for country info
+- Maybe change router-off mechanic for various pages? Enable as they become available?
+- Add "copy (error) log" option
+
+# Short-term
+
+- Expose log level overrides
+- Improve graphs
+  - Show time on bottom axis
+  - Show fixed x range, not only available data
+  - Think about pan/zoom
+  - How to persist data across restarts?
+- I2PTunnel
+  - Show all messages somewhere
+  - Improve detail page, expose advanced settings
+  - Add edit page
+
+# Long-term
+
+- Remote router support
+  - Implement a "router wrapper" that can represent a local or remote router
+  - Implement/use client APIs to talk to remote router
+    - I2CP
+    - I2PControl

ant.properties

@@ -1,5 +1,4 @@
 application-package=net.i2p.router
 key.store=${user.home}/.android/${application-package}.keystore
 key.alias=${application-package}
-android.library.reference.1=./routerjars
 key.store.password=android

art/itoopie-512.svg

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   height="512"
+   width="512"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="itoopie-512.svg"
+   inkscape:export-xdpi="16.875"
+   inkscape:export-ydpi="16.875">
+  <defs
+     id="defs661" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     id="namedview659"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="1"
+     inkscape:cx="185.67866"
+     inkscape:cy="266.66758"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4321">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path6"
+     d="M153,239c-9.59,3.52-17.87,11.09-26.09,17l-40.91,28.2c-6.471,4.6-19.02,10.92-15.397,20.8,2.682,7.31,11.925,12.87,17.397,18.04,16.94,16,42.13,32.1,51.54,53.96,2.26,5.25-3.5,15.19-4.25,21-1.64,12.6-1.11,27.89,2.92,40,2.26,6.82,5.84,14.12,9.93,20,2.2,3.16,6.64,7.85,6.22,12-1.12,11.2-27.13,23.77-11.32,35.35,4.63,3.39,10.55,2.65,15.96,2.65h34c17.51,0,35.54,1.26,53-0.06,4.08-0.3,7.16-3.88,11-3.98,4.19-0.1,8.42,2.98,13,3.04,18.31,0.22,36.68-2,55-2l40-1c4.66-0.01,12.53,0.5,16.12-3.03,8.06-7.94-1.26-18.06-7.12-23.25-2-1.77-6.69-5-6.22-8.13,0.92-6.16,11.38-15.09,14.16-21.59,6.81-15.9,4.83-37.87,0.06-54,6.31-3.31,5.85-7.34,9.01-12.83,3.71-6.45,9.15-10.02,9.89-18.17,0.52-5.81-2.98-11.38-1.57-17,4.16-16.71,10.39-33.74,16.01-50,2.52-7.28,7.54-16.06,5.15-24-2.94-9.76-16.29-18.22-22.78-25.84-6.17-7.26-14.72-20.05-24.71-21.16,11.99-21.64,23.36-44.57,23.98-70,0.62-25.17-3.64-49.18-14.61-72-27.64-57.494-96.02-87.19-157.37-72.764-21.55,5.067-40.77,16.12-58,29.648-15.33,12.037-26.71,28.931-35.51,46.116-11.04,21.55-12.6,45.31-12.49,69,0.11,22.92,8.73,45.5,20.23,64.98,4,6.78,10.19,12.12,13.77,19.02z"
+     fill="#010101" />
+  <path
+     id="path14"
+     d="M180,329l18,8c9.24-17.53,14.78-38.36,21.56-57,2.31-6.35,3.57-17.15,9.57-21.24,4.73-3.22,14.51-0.44,19.87,0.07,10.84,1.03,23.37,0.68,34-1.72,52.22-11.77,89.71-57.83,91.96-111.11,3.11-73.764-69.66-132.42-140.96-116.98-43.93,9.507-76.57,43.459-88.57,85.985-10.53,37.33,1.89,78.48,27.37,106.83,6.71,7.46,14.87,14.11,23.29,19.57,3.73,2.42,9.79,4.83,10.96,9.62,1.32,5.42-4.33,13.76-5.85,18.98-5.82,19.96-16.4,38.78-21.2,59z"
+     fill="#ffff01" />
+  <path
+     id="path88"
+     d="M299,75.518c-52.42,11.12-36.2,92.762,16,81.662,52.67-11.2,36.32-92.76-16-81.662z"
+     fill="#010101" />
+  <path
+     id="path96"
+     d="M203,78.432c-41.94,5.523-52.25,62.648-12,79.888,7.45,3.19,18.11,2.68,26,1.47,48.64-7.5,34.78-87.781-14-81.358z"
+     fill="#010101" />
+  <path
+     id="path158"
+     d="M283,134c3-3.96,5.42-9.52,10.18-11.66,15.75-7.07,24.49,8.35,22.82,21.66,38.8-11.2,14.11-71.907-22-53.85-4.34,2.168-8.17,5.944-10.96,9.85-3.18,4.48-5.24,9.49-5.71,15-0.59,6.86,2.59,13.13,5.67,19z"
+     fill="#FFF" />
+  <path
+     id="path186"
+     d="M196,147c-1.86-8.13-2.94-15.07,3.38-21.79,10.5-11.16,28.74-3.58,30.62,10.79,9.52-9.43,5.95-29.23-3.17-37.74-12.58-11.724-31.99-10.389-42.89,2.76-3.76,4.52-5.37,9.22-6.17,14.98-0.77,5.56,0.25,11.88,2.58,17,3.12,6.83,8.9,11.17,15.65,14z"
+     fill="#FFF" />
+  <path
+     id="path658"
+     d="M237,270c-8.48,15.92-15.41,36.57-20.08,54-1.36,5.06-6.23,11.67-4.89,17,3.2,12.76,17.13,22.54,28.97,25.62,22.34,5.83,48.15,7.53,70-1.07,3.88-1.53,9.74-2.89,11.97-6.74,2.07-3.57,0.82-8.86,1.2-12.81,0.99-10.2,6.53-18.52,16.83-21,0.01-9.11,1.67-18.72,8.46-25.47,3.91-3.89,10.2-6.15,14.14-1.19,9.75,12.3-3.7,27.68,12.4,36.66,13.76-29.42,26.34-75.12-15-88.74-5.23-1.73-11.36-4.63-17-4.08-10.25,1.01-22.68,14.27-32.42,18.73-22.23,10.18-50.54,14.88-74.58,9.09z"
+     fill="#ff013d" />
+  <path
+     id="path702"
+     d="M137,338c3.18-4.17,6.58-7.19,11-10-1.97-3.92-6.68-6.5-7.46-11-1.64-9.41,12.19-20.93,20.46-21.82,4.38-0.48,12.3,5.08,15.49,2.99,2.51-1.64,3.42-6.55,4.51-9.17,3.1-7.51,12.87-25.96,7.97-33.72-5.8-9.2-26.8,3.73-32.97,7.22-13.64,7.73-26.48,17.21-39,26.63-3.86,2.9-12.34,8.01-13.48,13-1.24,5.43,2.89,10.17,6.2,13.83,7.67,8.5,17.17,16.64,27.28,22.04z"
+     fill="#ff013d" />
+  <path
+     id="path980"
+     d="M343,338l1,1-1-1z"
+     fill="#926a61" />
+  <path
+     id="path982"
+     d="M344.04,338.74c-8.51,3.44-8.51,27.18-1.48,32.23,3.87,2.78,17.29-0.65,21.44-2.32,23.49-9.46-4.63-36.1-19.96-29.91z"
+     fill="#fbb5a7" />
+  <path
+     id="path1006"
+     d="M201,365c-6.76-9.02-21.93-17.44-33-19.53-4.52-0.85-12.18-1.71-14.24,3.59-2.56,6.57,3.94,13.06,9.24,15.61,11.8,5.69,25.9,4.17,38,0.33z"
+     fill="#fbb5a7" />
+  <path
+     id="path1110"
+     d="M357,385c-17.01,3.2-27.07,2.97-31-16-11.91,1.56-23.62,7.8-36,9.57-4.1,0.59-11.08-0.98-14.3,2.03-5.1,4.77-5.44,14.02-5.74,20.4-0.22,4.66-2.39,9.33-1.6,14,1.72,10.26,13.38,21.18,19.74,29,4.59,5.66,10.59,14.3,17.9,16.49,8.24,2.46,16.55-4.65,23-8.83,9.21-5.99,19.98-13.42,24.98-23.66,2.33-4.78,0.91-11.82,1.04-17,0.21-8.7,1.98-17.26,1.98-26z"
+     fill="#95bb95" />
+  <path
+     id="path1138"
+     d="M157,384c0,13.94-0.51,25.95,5.22,39,4.77,10.86,10.96,21.1,18.95,30,6.92,7.7,14.83,8.96,24.83,9,17.21,0.08,33.73-6.21,42.48-22,11.07-19.97,3.58-55.02-21.52-61.31-7.81-1.95-23.68,6.35-31.96,8.1-13.65,2.89-24.79-0.54-38-2.79z"
+     fill="#9fc79f" />
+  <path
+     id="path1198"
+     d="M365,406c-0.86,6.78,1.35,18.22-1.49,24.2-7.25,15.25-24.45,25.44-38.51,33.66-6.58,3.84-13.19,7.73-21,5.03-16.77-5.8-20.94-25.76-35-33.89,0,8.86,0.3,16.69,3.74,25,17.58,42.43,71.5,11.84,89.46-14,7.43-10.69,13.35-29.47,2.8-40m-208,3l1,1-1-1z"
+     fill="#576e57" />
+  <path
+     id="path1222"
+     d="M155,432c2.63,10.96,11.11,20.8,17.28,30.04,2.17,3.23,4.52,8.56,8.1,10.4,4.57,2.35,11.58,2.11,16.62,2.72,15.31,1.83,33.26,2.59,48-2.5,5.63-1.95,11.75-4.02,14.68-9.66,2.98-5.74-0.56-14.03-1.68-20-5.56,5.92-9.39,12.43-16,17.54-14.23,10.98-43.14,17.76-59,6.03-12.43-9.19-17.42-24.31-28-34.57m11,0l1,1-1-1m113,0l1,1-1-1z"
+     fill="#576e57" />
+</svg>

art/itoopie-white-512.svg

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   height="512"
+   width="512"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="itoopie-white-512.svg"
+   inkscape:export-xdpi="8.4375"
+   inkscape:export-ydpi="8.4375">
+  <defs
+     id="defs661" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     id="namedview659"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="137.71425"
+     inkscape:cy="184.35799"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4321">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g3042"
+     style="fill:#ffffff">
+    <path
+       sodipodi:nodetypes="cccccssccc"
+       style="fill:#ffffff"
+       inkscape:connector-curvature="0"
+       d="m 269.51027,463.35455 c -15.30293,7.3383 -16.75232,9.62416 -35.48219,9.7875 -18.0352,-0.48628 -44.4921,-1.71026 -52.17332,-10.84871 -14.84797,-18.35292 -17.30834,-7.98026 -17.72834,-3.83026 -1.12,11.2 -27.13,23.77 -11.32,35.35 4.63,3.39 10.55,2.65 15.96,2.65 l 34,0 c 17.51,0 35.54,1.26 53,-0.06 4.08,-0.3 6.15805,-3.88 9.99805,-3.98 0.39189,-9.24282 0.78712,-8.70426 3.7458,-29.06853 z"
+       id="path6" />
+    <path
+       style="fill:#ffffff"
+       id="path14"
+       d="m 267.11017,14.994328 c -7.7324,-0.0069 -15.54531,0.81125 -23.34375,2.5 -43.93,9.507 -76.5625,43.44275 -88.5625,85.968752 -10.53,37.33 1.895,78.49375 27.375,106.84375 6.71,7.46 14.86125,14.1025 23.28125,19.5625 3.73,2.42 9.79875,4.835 10.96875,9.625 1.32,5.42 -4.355,13.74875 -5.875,18.96875 -5.82,19.96 -16.3875,38.78 -21.1875,59 l 18,8 c 9.24,-17.53 14.7825,-38.36 21.5625,-57 2.31,-6.35 3.5625,-17.16 9.5625,-21.25 4.73,-3.22 14.515,-0.41625 19.875,0.0937 10.84,1.03 23.37,0.68125 34,-1.71875 52.22,-11.76995 89.71875,-57.84495 91.96875,-111.12495 C 387.50501,68.767016 330.074,15.050289 267.11017,14.994328 z m 51.03125,47.9375 c 44.71373,-0.143005 56.00313,72.218752 6.625,82.718752 -52.2,11.1 -68.42,-70.536252 -16,-81.656252 3.27,-0.693625 6.39408,-1.052966 9.375,-1.0625 z m -100.90625,3.625 c 45.11524,-1.123505 56.65125,74.421872 9.53125,81.687502 -7.89,1.21 -18.55,1.72125 -26,-1.46875 -40.25,-17.24 -29.94,-74.352002 12,-79.875002 1.52437,-0.200719 3.01342,-0.307508 4.46875,-0.34375 z"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 292.76642,122.46308 c 3,-3.96 5.42,-9.52 10.18,-11.66 15.75,-7.07 24.49,8.35 22.82,21.66 38.8,-11.2 14.11,-71.907002 -22,-53.850002 -4.34,2.168 -8.17,5.944 -10.96,9.85 -3.18,4.48 -5.24,9.49 -5.71,15.000002 -0.59,6.86 2.59,13.13 5.67,19 z"
+       id="path158"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 205.76642,135.46308 c -1.86,-8.13 -2.94,-15.07 3.38,-21.79 10.5,-11.16 28.74,-3.58 30.62,10.79 9.52,-9.43 5.95,-29.230002 -3.17,-37.740002 -12.58,-11.724 -31.99,-10.389 -42.89,2.76 -3.76,4.52 -5.37,9.22 -6.17,14.980002 -0.77,5.56 0.25,11.88 2.58,17 3.12,6.83 8.9,11.17 15.65,14 z"
+       id="path186"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 246.76642,258.46308 c -8.48,15.92 -15.41,36.57 -20.08,54 -1.36,5.06 -6.23,11.67 -4.89,17 3.2,12.76 17.13,22.54 28.97,25.62 22.34,5.83 48.15,7.53 70,-1.07 3.88,-1.53 9.74,-2.89 11.97,-6.74 2.07,-3.57 0.82,-8.86 1.2,-12.81 0.99,-10.2 6.53,-18.52 16.83,-21 0.01,-9.11 1.67,-18.72 8.46,-25.47 3.91,-3.89 10.2,-6.15 14.14,-1.19 9.75,12.3 -3.7,27.68 12.4,36.66 13.76,-29.42 26.34,-75.12 -15,-88.74 -5.23,-1.73 -11.36,-4.63 -17,-4.08 -10.25,1.01 -22.68,14.27 -32.42,18.73 -22.23,10.18 -50.54,14.88 -74.58,9.09 z"
+       id="path658"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 146.76642,326.46308 c 3.18,-4.17 6.58,-7.19 11,-10 -1.97,-3.92 -6.68,-6.5 -7.46,-11 -1.64,-9.41 12.19,-20.93 20.46,-21.82 4.38,-0.48 12.3,5.08 15.49,2.99 2.51,-1.64 3.42,-6.55 4.51,-9.17 3.1,-7.51 12.87,-25.96 7.97,-33.72 -5.8,-9.2 -26.8,3.73 -32.97,7.22 -13.64,7.73 -26.48,17.21 -39,26.63 -3.86,2.9 -12.34,8.01 -13.48,13 -1.24,5.43 2.89,10.17 6.2,13.83 7.67,8.5 17.17,16.64 27.28,22.04 z"
+       id="path702"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 352.76642,326.46308 1,1 -1,-1 z"
+       id="path980"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 353.80642,327.20308 c -8.51,3.44 -8.51,27.18 -1.48,32.23 3.87,2.78 17.29,-0.65 21.44,-2.32 23.49,-9.46 -4.63,-36.1 -19.96,-29.91 z"
+       id="path982"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 210.76642,353.46308 c -6.76,-9.02 -21.93,-17.44 -33,-19.53 -4.52,-0.85 -12.18,-1.71 -14.24,3.59 -2.56,6.57 3.94,13.06 9.24,15.61 11.8,5.69 25.9,4.17 38,0.33 z"
+       id="path1006"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 366.76642,373.46308 c -17.01,3.2 -27.07,2.97 -31,-16 -11.91,1.56 -23.62,7.8 -36,9.57 -4.1,0.59 -11.08,-0.98 -14.3,2.03 -5.1,4.77 -5.44,14.02 -5.74,20.4 -0.22,4.66 -2.39,9.33 -1.6,14 1.72,10.26 13.38,21.18 19.74,29 4.59,5.66 10.59,14.3 17.9,16.49 8.24,2.46 16.55,-4.65 23,-8.83 9.21,-5.99 19.98,-13.42 24.98,-23.66 2.33,-4.78 0.91,-11.82 1.04,-17 0.21,-8.7 1.98,-17.26 1.98,-26 z"
+       id="path1110"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 166.76642,372.46308 c 0,13.94 -0.51,25.95 5.22,39 4.77,10.86 10.96,21.1 18.95,30 6.92,7.7 14.83,8.96 24.83,9 17.21,0.08 33.73,-6.21 42.48,-22 11.07,-19.97 3.58,-55.02 -21.52,-61.31 -7.81,-1.95 -23.68,6.35 -31.96,8.1 -13.65,2.89 -24.79,-0.54 -38,-2.79 z"
+       id="path1138"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 374.76642,394.46308 c -0.86,6.78 1.35,18.22 -1.49,24.2 -7.25,15.25 -24.45,25.44 -38.51,33.66 -6.58,3.84 -13.19,7.73 -21,5.03 -16.77,-5.8 -20.94,-25.76 -35,-33.89 0,8.86 0.3,16.69 3.74,25 17.58,42.43 71.5,11.84 89.46,-14 7.43,-10.69 13.35,-29.47 2.8,-40 m -208,3 1,1 -1,-1 z"
+       id="path1198"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 164.76642,420.46308 c 2.63,10.96 11.11,20.8 17.28,30.04 2.17,3.23 4.52,8.56 8.1,10.4 4.57,2.35 11.58,2.11 16.62,2.72 15.31,1.83 33.26,2.59 48,-2.5 5.63,-1.95 11.75,-4.02 14.68,-9.66 2.98,-5.74 -0.56,-14.03 -1.68,-20 -5.56,5.92 -9.39,12.43 -16,17.54 -14.23,10.98 -43.14,17.76 -59,6.03 -12.43,-9.19 -17.42,-24.31 -28,-34.57 m 11,0 1,1 -1,-1 m 113,0 1,1 -1,-1 z"
+       id="path1222"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3026"
+       d="m 278.35292,463.71009 c -3.2194,13.63977 -2.83178,10.63387 -5.35379,28.59447 3.70248,1.1188 2.18729,3.09852 6.76729,3.15852 18.31,0.22 36.68,-2 55,-2 l 40,-1 c 4.66,-0.01 12.53,0.5 16.12,-3.03 8.06,-7.94 -1.26,-18.06 -7.12,-23.25 -2,-1.77 -6.69,-5 -6.22,-8.13 1.09974,-9.03578 -1.60893,-15.80295 -13.03557,-0.88889 -8.80009,6.59847 -11.40617,7.99716 -26.32376,13.38008 -9.52026,2.77856 -24.99871,5.64892 -35.63945,3.81206 -18.02388,-2.48398 -18.05064,-7.63298 -24.19472,-10.64624 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff"
+       sodipodi:nodetypes="cccccccccccc" />
+  </g>
+</svg>

custom_rules.xml

@@ -40,16 +40,21 @@
                 major = values[0];
                 minor = "0";
                 release = "0";
+                point = "";
                 if(dots > 0) {
                     minor = values[1];
                     if(dots > 1) {
                         release = values[2];
+                        if (dots > 2) {
+                            point = "." + values[3];
                         }
                     }
-                project.setNewProperty("CORE", major + "." + minor +"." + release);
+                }
+                project.setNewProperty("CORE", major + "." + minor + "." + release + point);
                 project.setNewProperty("CORE.major", major);
                 project.setNewProperty("CORE.minor", minor);
                 project.setNewProperty("CORE.release", release);
+                project.setNewProperty("CORE.point", point);
 
             ]]>
     </scriptdef>
@@ -71,17 +76,19 @@
             <attribute name="major"/>
             <attribute name="minor"/>
             <attribute name="release"/>
+            <attribute name="point"/>
             <attribute name="routerbuild"/>
             <attribute name="androidbuild"/>
             <attribute name="sdk"/>
             <![CDATA[
                 Major = attributes.get("major") + ".";
                 Minor = attributes.get("minor") + ".";
-                Release = attributes.get("release") +"-";
+                Release = attributes.get("release");
+                Point = attributes.get("point") + "-";
                 Routerbuild = attributes.get("routerbuild") +"_b";
                 Androidbuild = attributes.get("androidbuild") +"-API";
                 SDK = attributes.get("sdk");
-                project.setNewProperty(attributes.get("prefix") + ".full", Major + Minor + Release + Routerbuild + Androidbuild + SDK);
+                project.setNewProperty(attributes.get("prefix") + ".full", Major + Minor + Release + Point + Routerbuild + Androidbuild + SDK);
                 /*
                 * Android version code is an integer.
                 * So we have 31 bits.
@@ -95,6 +102,8 @@
                 * beware of that if you release multiple builds using the
                 * same ROUTERBUILD, or clear it if you update ROUTERBUILD
                 * Subtract 1 from ANDROIDBUILD since it starts at 1 after distclean.
+                *
+                * WARNING - 4th core field ("point") is ignored. Be sure to increment android build number.
                 */
                 iMajor = ((parseInt(Major) % 16) << 27);
                 iMinor = ((parseInt(Minor) % 256) << 19);
@@ -238,10 +247,10 @@
                 props.store(fo, "AUTO-GENERATED FILE, DO NOT EDIT!");
                 fo.close();
             }
-            sp1 = 'android.versionCode="[0-9]*"';
-            rp1 = 'android.versionCode="' + props.getProperty("my.version.code") + '"';
-            sp2 = 'android.versionName="[^"]*"';
-            rp2 = 'android.versionName="' + props.getProperty("my.version.name") + '"';
+            sp1 = 'android:versionCode="[0-9]*"';
+            rp1 = 'android:versionCode="' + props.getProperty("my.version.code") + '"';
+            sp2 = 'android:versionName="[^"]*"';
+            rp2 = 'android:versionName="' + props.getProperty("my.version.name") + '"';
 
             /* sed primary manifest */
             cfg = File(attributes.get("mainxml") + ".in");
@@ -323,11 +332,14 @@
     <normalizeitem name="buildversion" value="${buildversionfile}" />
     <echo message="buildversion `${buildversion}`" />
 
+   <!--
     <split value="${target}" sep="-" prefix="gettarget"/>
+   -->
+    <property name="gettarget.1" value="${minSdkVersion}" />
     <echo message="API${gettarget.1}" />
     <!-- generate the version infos that we will want to see -->
     <generateversions prefix="zap" major="${CORE.major}"
-        minor="${CORE.minor}" release="${CORE.release}"
+        minor="${CORE.minor}" release="${CORE.release}"  point="${CORE.point}"
         routerbuild="${ROUTERBUILD}" androidbuild="${buildversion}"
         sdk="${gettarget.1}"/>
 
@@ -352,17 +364,6 @@
     <property name="version.name" value="${my.version.name}" />
     <echo message="version.code '${version.code}', 'version.name '${version.name}', '${my.version.name}'" />
 
-    <!-- If we are missing any jars, we _MUST_ make them ahead of time so
-	 the build does not fail! _HOWEVER_ we must only do this if we are
-	 _BUILDING_! Apache Ant does not allow us to know what target we are
-	 about to run, because the authors believe it is 'evil' and other
-	 nonsense. So for now (so sorry!) we force build it ahead of time
-	 always, no matter what target was selected, until some better way
-	 of resolving this issue apears.
-    -->
-    <ant dir="routerjars" inheritall="false" useNativeBasedir="true" >
-	<target name="buildrouter" />
-    </ant>
     <!--
          ================================================================================
          New I2P rules
@@ -382,12 +383,9 @@
     <!-- overrides of those in main_rules.xml -->
 
     <target name="-pre-build" depends="copy-i2p-resources" >
-        <!-- aapt messes up when resources are added or deleted, just build every time
-        <delete dir="${gen.absolute.dir}/net" verbose="${verbose}" />
-         -->
-        <!-- screw it, do the classes too, until I add the depend class
-        <delete dir="${out.absolute.dir}/classes/net" verbose="${verbose}" />
-        -->
+        <ant dir="routerjars" inheritall="false" useNativeBasedir="true" >
+            <target name="buildrouter" />
+        </ant>
     </target>
 
 <!--
@@ -411,17 +409,8 @@
         <copy file="LICENSE.txt" tofile="res/raw/license_app_txt" />
         <copy file="licenses/LICENSE-Apache2.0.txt" tofile="res/raw/license_apache20_txt" />
         <copy file="${i2pbase}/installer/resources/themes/console/images/i2plogo.png" todir="res/drawable/" />
-	<!-- 
-	
-	No, no, no. Wrong, wrong, wrong. Static web sources should be in
-        the assets directory. 
-        
-        <copy file="${i2pbase}/installer/resources/themes/console/images/outbound.png" todir="res/drawable/" />
-        <copy file="${i2pbase}/installer/resources/themes/console/images/inbound.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/drawable/console_css" />
-        -->
 
+        <!-- Static web sources should be in the assets directory.  -->
         <copy file="${i2pbase}/installer/resources/themes/console/images/i2plogo.png" todir="assets/themes/console/images/" />
         <copy file="${i2pbase}/installer/resources/themes/console/images/outbound.png" todir="assets/themes/console/images/" />
         <copy file="${i2pbase}/installer/resources/themes/console/images/inbound.png" todir="assets/themes/console/images/" />
@@ -453,7 +442,7 @@
     <target name="reinstall" depends="install" />
 
     <target name="-pre-clean">
-        <delete dir="${jar.libs.dir}" verbose="${verbose}" />
+        <!--<delete dir="${jar.libs.dir}" verbose="${verbose}" />-->
         <delete file="res/drawable/i2plogo.png" verbose="${verbose}"/>
         <delete file="res/drawable/outbound.png" verbose="${verbose}"/>
         <delete file="res/drawable/inbound.png" verbose="${verbose}"/>
@@ -481,6 +470,7 @@
         <delete file="res/raw/license_gplv2_txt" />
         <delete file="res/raw/license_gplv3_txt" />
         <delete file="res/raw/license_lgplv3_txt" />
+        <delete file="res/raw/license_fatcowicons_txt" />
         <delete file="res/raw/certificates_zip" />
     </target>
 

project.properties

@@ -8,4 +8,13 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-19
+# Must match that in AndroidManifest.xml.in
+minSdkVersion=8
+# I2P router libs
+android.library.reference.1=./routerjars
+# Android Support Library
+# If the relative path differs in your local environment,
+# override this in the base local.properties
+# (not routerjars/local.properties)
+android.library.reference.2=../android-sdk-linux/extras/android/support/v7/appcompat

res/drawable/routerled_ry.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/routerled_ry_1" android:duration="200" />
+    <item android:drawable="@drawable/routerled_ry_2" android:duration="200" />
+    <item android:drawable="@drawable/routerled_ry_3" android:duration="200" />
+    <item android:drawable="@drawable/routerled_ry_4" android:duration="200" />
+    <item android:drawable="@drawable/routerled_ry_5" android:duration="200" />
+</animation-list>