0.9.19

i2p.i2p tag: i2p-0.9.19

.mtn-ignore

@@ -39,9 +39,13 @@ signing.properties
 build
 
 # I2P-specific ignores
-^res/raw/blocklist_txt
-^res/raw/certificates_zip
-^res/raw/hosts_txt
-^res/raw/license_
+^app/src/main/res/drawable/i2plogo.png
+^app/src/main/res/raw/blocklist_txt
+^app/src/main/res/raw/hosts_txt
+^app/src/main/res/raw/license_
+^app/src/main/res/raw/certificates_zip
+^app/src/main/assets/themes/console/images
+^app/src/main/assets/themes/console/light/console.css
+^app/src/main/assets/themes/console/light/images/header.png
 ^scripts/build.number
 ^scripts/version.properties

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = pt_BR: pt-rBR, ru_RU: ru, sv_SE: sv, tr_TR: tr, zh_CN: zh
+lang_map = pt_BR: pt-rBR, ru_RU: ru, sv_SE: sv, tr_TR: tr, uk_UA: uk, zh_CN: zh
 
 [I2P.android]
 file_filter = app/src/main/res/values-<lang>/strings.xml

CHANGELOG

@@ -0,0 +1,33 @@
+0.9.19
+ * Made internal state handling more stable
+ * Added graceful shutdown support
+ * Improved logging
+ * Bug fixes and translation updates
+
+0.9.18 / 2015-03-04 / c2f4831a1617f4ce716a08640446fdd992c751ff
+ * I2P can start automatically when phone boots (configure in Setting)
+ * Updated browser configuration guides for Orfox and Firefox
+ * Tunnels for postman's mail server added to defaults (for new installs)
+ * Settings options for configuring UDP and TCP ports
+ * Bug fixes and translation updates
+
+0.9.17.1 / 2014-12-14 / cd8bb5e3ac4238efac12179c78c4fa517fcaabec
+ * Fixed crashes in addressbook and netDb status page
+ * Fixed crash when opening an IRC client tunnel
+ * Updated translations
+
+0.9.17 / 2014-12-01 / bcf947f433876f643e0f6dff81aac88848b797d3
+ * Migrated to the new Material design from Android Lollipop
+ * Added a browser configuration guide
+ * Improved the help screen
+ * Upgraded the I2P router to 0.9.17
+ * Various bug fixes and translation updates
+
+0.9.15.1 / 2014-10-16 / 9cc4e80134cf9becb3838ed3cc78e0bed1363165
+ * Fixed a configuration bug
+
+0.9.15 / 2014-10-16 / 9b51f78b791c28a580d57f1a5019c94493de6231
+ * Upgraded the I2P router to 0.9.15
+ * Added a help screen with some basic information
+ * Logs can now be copied to the clipboard
+ * Various user interface improvements and fixes

README.md

@@ -7,9 +7,10 @@
 - Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
 - Apache Ant 1.8.0 or higher
 - I2P source
-- Android SDK (tested with Rev 22.6.4 and platform-tools version 19.1)
+- Android SDK for API 21
+- Android Build Tools 21.1.2
 - Android Support Repository
-- Gradle 1.12
+- Gradle 2.2.1
 
 ### Gradle
 
@@ -86,24 +87,15 @@ systemProp.socksProxyPort=9150
 
 ## Client library
 
-### "Uploading" to a local file repository (to use a local build of the library in a project)
+### "Uploading" to the local Maven repository (to use a local build of the library in a project)
 
-1. Add the following line to your `~/.gradle/gradle.properties`:
+1. `gradle :client:installArchives`
 
-    ```
-    localFileRepoDir=/path/to/local/file/repo
-    ```
-
-2. `gradle :client:uploadArchives`
-
-3. Add the resulting directory to your project as a repository. For Gradle projects, add the following above any existing repositories (so it is checked first):
+2. Add the local Maven repository to your project. For Gradle projects, add the following above any existing repositories (so it is checked first):
 
     ```
     repositories {
-        flatDir {
-            name 'fileRepo'
-            dirs file('/path/to/local/file/repo')
-        }
+        mavenLocal()
     }
     ```
 

TODO

@@ -1,18 +1,27 @@
 # Fixes
 
-- Better addressbook column widths
+- Better twopane column widths
     <zzz> on the i2ptunnel and addressbook pages on the tablet, the columns are too skinny, they aren't as wide as the tab
     <zzz> only a few addressbook entries wrap but on i2ptunnel everything is wrapped and most of the screen is empty
+- Create tunnel wizard
+    <zzz> hmm would be nice if they could be shared-client or have an option
+    <zzz> was setting up email tunnels
+- Browser
+    <zzzccc> Bug report: i2p browser treats 302 as an error
+    <zzzccc> Bug 2: rotate screen in i2p browser seems to go back one page
 
 # Short-term
 
 - Disable uPnP when on cell networks
     <zzz> spewing UPnP out into cell networks is a waste of time at best and a security risk at worst, but you really want it for wifi
+- I2PTunnel
+  - Show all messages somewhere
+  - Improve detail page, expose advanced settings
+  - Add edit page
+- Progress feedback for addressbook subscriptions reload
 - 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
+- Fill out help pages
+- Rewrite release notes to be release-specific
 - Fix release notes UI, either make back button use clear or add buttons
 - NetDB tablet view fixes
   - Refresh detail fragment when changing tab
@@ -20,20 +29,63 @@
   - 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
 
 # Medium-term
 
+- Network profiles
+  - User selects profile in settings
+  - Change network participation etc. based on profile
+  - Also look at connection type: Connectivity.isConnectionFast()
 - 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
+
+# Silent Store approval checks to confirm/implement
+
+- Known Vulnerabilities
+  - Apps will be tested to ensure that they are not susceptible to known
+    publicly disclosed vulnerabilities. For example:
+    - Heartbleed
+    - Poodle
+    - MasterKey
+    - Common Path Traversal attacks
+    - Common SQL Injection attacks
+- Network Security Protocols
+  - All Apps that require transmission of data from the App to a system that
+    does not exist on the device must use, at a minimum, TLS1.1 standards.
+    However, Blackphone would prefer the usage of TLS1.2.
+  - Apps must not use algorithms for cryptographic purposes that are considered
+    obsolete or outdated i.e. MD5, SHA1, RC4, DES, or any encryption algorithm
+    that is weaker than AES128.
+- Transport Layer Protection
+  - All network communication should be encrypted
+  - Not vulnerable to SSl Strip
+- Data Leakage
+  - No storage of sensitive data outside of application sandbox
+  - Files should not be created with MODE_WORLD_READABLE or MODE_WORLD_WRITABLE
+  - Copy & Paste will be evaluated on a case by case basis
+  - App logs should not contain sensitive information
+- Authentication and Authorization
+  - Validate that authentication credentials are not stored on the device
+  - Must use an approved password-based key derivation function ie. PBKDF2, scrypt
+- Data-at-rest Encryption
+  - Must use at a minimum AES128 with modes CCM or GCM
+  - Should not store the encryption key on the file system
+- Permission Checks
+  - The App must function with all permissions disabled
+  - Apps must not hard crash if a permission is disabled
+  - Apps should ask users to enable permissions that are disabled if needed to
+    function properly and explain why the permission is necessary
+- Privacy Policy
+  - Apps must have a privacy policy that details how customer data is used,
+    stored, shared, etc...
+  - Apps must be configured with the customer opted out by default
+  - App logs should not contain PII
+- Error Handling
+  - Apps should follow best-practices for error handling and logging
 
 # Long-term
 

app/build.gradle

@@ -1,12 +1,17 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 apply plugin: 'witness'
 
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
     defaultConfig {
+        versionCode 4745227
+        versionName '0.9.19'
         minSdkVersion 9
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
+
+        // For Espresso
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
         release
@@ -14,13 +19,24 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
+        debug {
+            applicationIdSuffix '.debug'
+            versionNameSuffix '-DEBUG'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
     lintOptions {
         abortOnError false
     }
+    packagingOptions {
+        exclude 'LICENSE.txt'
+    }
     productFlavors {
         free {
             applicationId 'net.i2p.android'
@@ -35,17 +51,35 @@ android {
 }
 
 dependencies {
+    // Local dependencies
     compile project(':routerjars')
     compile project(':client')
-    compile 'com.android.support:support-v4:19.1.0'
-    compile 'com.android.support:appcompat-v7:19.1.0'
-    compile files('libs/androidplot-core-0.6.0.jar')
+
+    // Android Support Repository dependencies
+    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:appcompat-v7:21.0.3'
+    compile 'com.android.support:recyclerview-v7:21.0.3'
+
+    // Remote dependencies
+    compile 'net.i2p.android.ext:floatingactionbutton:1.8.0'
+    compile files('libs/androidplot-core-0.6.1.jar')
+
+    compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){
+        exclude module: 'support-v4'
+    }
+
+    // Testing-only dependencies
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0'
+    androidTestCompile 'com.android.support.test:testing-support-lib:0.1'
 }
 
 dependencyVerification {
     verify = [
-            'com.android.support:support-v4:3f40fa7b3a4ead01ce15dce9453b061646e7fe2e7c51cb75ca01ee1e77037f3f',
-            'com.android.support:appcompat-v7:9df7637c5219202ddbbbf0924c2d5a9e6d64379166795a89d8f75d1e3f3372df',
+            'com.android.support:support-v4:703572d3015a088cc5604b7e38885af3d307c829d0c5ceaf8654ff41c71cd160',
+            'com.android.support:appcompat-v7:5dbeb5316d0a6027d646ae552804c3baa5e3bd53f7f33db50904d51505c8a0e5',
+            'com.android.support:recyclerview-v7:e525ad3f33c84bb12b73d2dc975b55364a53f0f2d0697e043efba59ba73e22d2',
+            'net.i2p.android.ext:floatingactionbutton:a20d1f0cae15f8965b81486ba31245937968ae6ee5fa6e8a3ea21d7f6c6243ab',
+            'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad',
     ]
 }
 
@@ -71,15 +105,17 @@ task certificatesZip(type: Zip) {
     from files('' + i2pbase + '/installer/resources/certificates')
 }
 task copyI2PResources(type: Copy) {
-    into 'src/main'
-    into('res/drawable') {
+    // Force this to always run: Copy only detects source changes, not if missing in destination
+    outputs.upToDateWhen { false }
+    into 'src/main/res'
+    into('drawable') {
         from file(i2pbase + '/installer/resources/themes/console/images/i2plogo.png')
     }
-    into('res/raw') {
-        from(i2pbase + '/installer/resources/blocklist.txt') { rename {'blocklist_txt' } }
-        from(i2pbase + '/installer/resources/hosts.txt') { rename {'hosts_txt' } }
-        from('../LICENSE.txt') { rename {'license_app_txt' } }
-        from('../licenses/LICENSE-Apache2.0.txt') { rename {'license_apache20_txt' } }
+    into('raw') {
+        from(i2pbase + '/installer/resources/blocklist.txt') { rename { 'blocklist_txt' } }
+        from(i2pbase + '/installer/resources/hosts.txt') { rename { 'hosts_txt' } }
+        from('../LICENSE.txt') { rename { 'license_app_txt' } }
+        from('../licenses/LICENSE-Apache2.0.txt') { rename { 'license_apache20_txt' } }
         from(i2pbase + '/licenses') {
             include { elem ->
                 elem.name in [
@@ -105,19 +141,28 @@ task copyI2PResources(type: Copy) {
         }
         from certificatesZip
     }
-    // For peers WebView
-    into('assets/themes/console/images') {
+}
+// For peers WebView
+task copyI2PAssets(type: Copy) {
+    // Force this to always run: Copy only detects source changes, not if missing in destination
+    outputs.upToDateWhen { false }
+    into 'src/main/assets/themes/console'
+    into('images') {
         from file(i2pbase + '/installer/resources/themes/console/images/i2plogo.png')
         from file(i2pbase + '/installer/resources/themes/console/images/inbound.png')
         from file(i2pbase + '/installer/resources/themes/console/images/outbound.png')
     }
-    into ('assets/themes/console/light') {
+    into('light') {
         from file(i2pbase + '/installer/resources/themes/console/light/console.css')
     }
-    into('assets/themes/console/light/images') {
+    into('light/images') {
         from file(i2pbase + '/installer/resources/themes/console/light/images/header.png')
     }
 }
+
+preBuild.dependsOn copyI2PResources
+preBuild.dependsOn copyI2PAssets
+
 task cleanI2PResources(type: Delete) {
     delete file('src/main/res/drawable/i2plogo.png')
     delete fileTree('src/main/res/raw') {
@@ -126,12 +171,15 @@ task cleanI2PResources(type: Delete) {
         include 'license_*'
         include 'certificates_zip'
     }
+}
+task cleanI2PAssets(type: Delete) {
     delete fileTree('src/main/assets/themes/console/images')
     delete file('src/main/assets/themes/console/light/console.css')
     delete file('src/main/assets/themes/console/light/images/header.png')
 }
-preBuild.dependsOn copyI2PResources
+
 clean.dependsOn cleanI2PResources
+clean.dependsOn cleanI2PAssets
 
 props = new Properties()
 propFile = new File(project.rootDir, 'signing.properties')

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">I2P DEBUG</string>
+</resources>

app/src/debug/res/xml/settings_headers.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+    <header
+        android:fragment="net.i2p.android.router.SettingsActivity$SettingsFragment"
+        android:title="@string/settings_label_bandwidth_net">
+        <extra
+            android:name="settings"
+            android:value="net" />
+    </header>
+    <header
+        android:fragment="net.i2p.android.router.SettingsActivity$SettingsFragment"
+        android:title="@string/label_graphs">
+        <extra
+            android:name="settings"
+            android:value="graphs" />
+    </header>
+    <header
+        android:fragment="net.i2p.android.router.SettingsActivity$SettingsFragment"
+        android:title="@string/settings_label_logging">
+        <extra
+            android:name="settings"
+            android:value="logging" />
+    </header>
+    <header
+        android:title="@string/label_addressbook">
+        <intent
+            android:targetPackage="net.i2p.android.debug"
+            android:targetClass="net.i2p.android.router.addressbook.AddressbookSettingsActivity" />
+    </header>
+    <header
+        android:fragment="net.i2p.android.router.SettingsActivity$SettingsFragment"
+        android:title="@string/settings_label_advanced">
+        <extra
+            android:name="settings"
+            android:value="advanced" />
+    </header>
+</preference-headers>

app/src/debug/res/xml/settings_headers_legacy.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+    <Preference android:title="@string/settings_label_bandwidth_net">
+        <intent
+            android:targetPackage="net.i2p.android.debug"
+            android:targetClass="net.i2p.android.router.SettingsActivity"
+            android:action="net.i2p.android.router.PREFS_NET" />
+    </Preference>
+    <Preference android:title="@string/label_graphs">
+        <intent
+            android:targetPackage="net.i2p.android.debug"
+            android:targetClass="net.i2p.android.router.SettingsActivity"
+            android:action="net.i2p.android.router.PREFS_GRAPHS" />
+    </Preference>
+    <Preference android:title="@string/settings_label_logging">
+        <intent
+            android:targetPackage="net.i2p.android.debug"
+            android:targetClass="net.i2p.android.router.SettingsActivity"
+            android:action="net.i2p.android.router.PREFS_LOGGING" />
+    </Preference>
+    <Preference android:title="@string/label_addressbook">
+        <intent
+            android:targetPackage="net.i2p.android.debug"
+            android:targetClass="net.i2p.android.router.addressbook.AddressbookSettingsActivity" />
+    </Preference>
+    <Preference android:title="@string/settings_label_advanced">
+        <intent
+            android:targetPackage="net.i2p.android.debug"
+            android:targetClass="net.i2p.android.router.SettingsActivity"
+            android:action="net.i2p.android.router.PREFS_ADVANCED" />
+    </Preference>
+</PreferenceScreen>

app/src/main/AndroidManifest.xml

@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.i2p.android.router"
-    android:installLocation="auto"
-    android:versionCode="4745219"
-    android:versionName="0.9.14.1-rc3">
+    android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="19" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
         android:icon="@drawable/ic_launcher_itoopie"
         android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat">
+        android:theme="@style/Theme.I2P">
         <service
             android:name=".service.RouterService"
             android:icon="@drawable/ic_launcher_itoopie"
@@ -26,7 +21,12 @@
         </service>
         <provider
             android:name=".provider.CacheProvider"
-            android:authorities="net.i2p.android" />
+            android:authorities="${applicationId}.provider" />
+        <receiver android:name=".receiver.OnBootReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
 
         <activity
             android:name=".MainActivity"
@@ -45,15 +45,23 @@
         <activity
             android:name=".NewsActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:label="I2P News"
+            android:label="@string/label_news"
             android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="net.i2p.android.router.MainActivity" />
         </activity>
         <activity
-            android:name=".HelpActivity"
-            android:label="Help"
+            android:name="net.i2p.android.help.HelpActivity"
+            android:label="@string/menu_help"
+            android:parentActivityName=".MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="net.i2p.android.router.MainActivity" />
+        </activity>
+        <activity
+            android:name="net.i2p.android.help.BrowserConfigActivity"
+            android:label="@string/label_browser_configuration"
             android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -61,11 +69,11 @@
         </activity>
         <activity
             android:name=".LicenseActivity"
-            android:label="I2P License Information"
-            android:parentActivityName=".HelpActivity">
+            android:label="@string/label_licenses"
+            android:parentActivityName="net.i2p.android.help.HelpActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="net.i2p.android.router.HelpActivity" />
+                android:value="net.i2p.android.help.HelpActivity" />
         </activity>
         <activity
             android:name=".web.WebActivity"
@@ -86,7 +94,7 @@
         </activity>
         <activity
             android:name=".SettingsActivity"
-            android:label="I2P Settings"
+            android:label="@string/menu_settings"
             android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -94,7 +102,7 @@
         </activity>
         <activity
             android:name=".addressbook.AddressbookSettingsActivity"
-            android:label="I2P Addressbook Settings"
+            android:label="Addressbook Settings"
             android:launchMode="singleTop"
             android:parentActivityName=".addressbook.AddressbookActivity">
             <meta-data
@@ -103,7 +111,7 @@
         </activity>
         <activity
             android:name=".addressbook.AddressbookActivity"
-            android:label="Addressbook"
+            android:label="@string/label_addressbook"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
@@ -127,7 +135,7 @@
         </activity>
         <activity
             android:name="net.i2p.android.i2ptunnel.TunnelListActivity"
-            android:label="I2PTunnel"
+            android:label="@string/label_i2ptunnel"
             android:launchMode="singleTop"
             android:parentActivityName=".MainActivity">
             <meta-data
@@ -140,7 +148,15 @@
             android:parentActivityName="net.i2p.android.i2ptunnel.TunnelListActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="net.i2p.android.router.i2ptunnel.TunnelListActivity" />
+                android:value="net.i2p.android.i2ptunnel.TunnelListActivity" />
+        </activity>
+        <activity
+            android:name="net.i2p.android.i2ptunnel.EditTunnelActivity"
+            android:label="@string/edit_tunnel"
+            android:parentActivityName="net.i2p.android.i2ptunnel.TunnelDetailActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="net.i2p.android.i2ptunnel.TunnelDetailActivity" />
         </activity>
         <activity
             android:name="net.i2p.android.i2ptunnel.TunnelWizardActivity"

app/src/main/java/net/i2p/android/help/Browser.java

@@ -0,0 +1,83 @@
+package net.i2p.android.help;
+
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+
+public class Browser implements Comparable<Browser> {
+    public final String packageName;
+    public final CharSequence label;
+    public final Drawable icon;
+    public final boolean isInstalled;
+    public final boolean isKnown;
+    public final boolean isSupported;
+    public final boolean isRecommended;
+
+    /**
+     * A browser that we don't know about.
+     *
+     * @param pm      the PackageManager used to find the browser
+     * @param browser the browser
+     */
+    public Browser(PackageManager pm, ResolveInfo browser) {
+        this(
+                browser.activityInfo.packageName,
+                browser.loadLabel(pm),
+                browser.loadIcon(pm),
+                true, false, false, false
+        );
+    }
+
+    /**
+     * A browser that we know about.
+     *
+     * @param pm        the PackageManager used to find the browser
+     * @param browser   the browser
+     * @param supported can this browser be used with I2P?
+     */
+    public Browser(PackageManager pm, ResolveInfo browser, boolean supported, boolean recommended) {
+        this(
+                browser.activityInfo.packageName,
+                browser.loadLabel(pm),
+                browser.loadIcon(pm),
+                true, true, supported, recommended
+        );
+    }
+
+    public Browser(String pn, CharSequence l, Drawable ic, boolean i, boolean k, boolean s, boolean r) {
+        packageName = pn;
+        label = l;
+        icon = ic;
+        isInstalled = i;
+        isKnown = k;
+        isSupported = s;
+        isRecommended = r;
+    }
+
+    @Override
+    public int compareTo(@NonNull Browser browser) {
+        // Sort order: supported -> unknown -> unsupported
+        int a = getOrder(this);
+        int b = getOrder(browser);
+
+        if (a < b)
+            return -1;
+        else if (a > b)
+            return 1;
+
+        return label.toString().compareTo(browser.label.toString());
+    }
+
+    private static int getOrder(Browser browser) {
+        if (browser.isKnown) {
+            if (browser.isRecommended)
+                return 0;
+            else if (browser.isSupported)
+                return 1;
+            else
+                return 3;
+        } else
+            return 2;
+    }
+}

app/src/main/java/net/i2p/android/help/BrowserAdapter.java

@@ -0,0 +1,117 @@
+package net.i2p.android.help;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.net.Uri;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import net.i2p.android.router.R;
+
+public class BrowserAdapter extends RecyclerView.Adapter<BrowserAdapter.ViewHolder> {
+    private Context mCtx;
+    private Browser[] mBrowsers;
+    private OnBrowserSelectedListener mListener;
+
+    // Provide a reference to the views for each data item
+    // Complex data items may need more than one view per item, and
+    // you provide access to all the views for a data item in a view holder
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        public ImageView mIcon;
+        public TextView mLabel;
+        public ImageView mStatus;
+
+        public ViewHolder(View v) {
+            super(v);
+            mIcon = (ImageView) v.findViewById(R.id.browser_icon);
+            mLabel = (TextView) v.findViewById(R.id.browser_label);
+            mStatus = (ImageView) v.findViewById(R.id.browser_status_icon);
+        }
+    }
+
+    public static interface OnBrowserSelectedListener {
+        public void onBrowserSelected(Browser browser);
+    }
+
+    public BrowserAdapter(Context ctx, OnBrowserSelectedListener listener) {
+        mCtx = ctx;
+        mListener = listener;
+    }
+
+    public void setBrowsers(Browser[] browsers) {
+        mBrowsers = browsers;
+        notifyDataSetChanged();
+    }
+
+    public void clear() {
+        mBrowsers = null;
+        notifyDataSetChanged();
+    }
+
+    // Create new views (invoked by the layout manager)
+    @Override
+    public BrowserAdapter.ViewHolder onCreateViewHolder(ViewGroup parent,
+                                                        int viewType) {
+        View v = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.listitem_browser, parent, false);
+        return new ViewHolder(v);
+    }
+
+    // Replace the contents of a view (invoked by the layout manager)
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        final Browser browser = mBrowsers[position];
+        holder.mIcon.setImageDrawable(browser.icon);
+        holder.mLabel.setText(browser.label);
+
+        if (browser.isKnown) {
+            if (browser.isRecommended && browser.isInstalled) {
+                holder.mStatus.setImageDrawable(
+                        mCtx.getResources().getDrawable(R.drawable.ic_stars_white_24dp));
+                holder.mStatus.setVisibility(View.VISIBLE);
+            } else if (browser.isSupported && !browser.isInstalled) {
+                holder.mStatus.setImageDrawable(
+                        mCtx.getResources().getDrawable(R.drawable.ic_shop_white_24dp));
+                holder.mStatus.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        String uriMarket = "market://search?q=pname:" + browser.packageName;
+                        Uri uri = Uri.parse(uriMarket);
+                        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                        mCtx.startActivity(intent);
+                    }
+                });
+                holder.mStatus.setVisibility(View.VISIBLE);
+            } else if (!browser.isSupported) {
+                // Make the icon gray-scale to show it is unsupported
+                ColorMatrix matrix = new ColorMatrix();
+                matrix.setSaturation(0);
+                ColorMatrixColorFilter filter = new ColorMatrixColorFilter(matrix);
+                holder.mIcon.setColorFilter(filter);
+                holder.mLabel.setTextColor(
+                        mCtx.getResources().getColor(R.color.primary_text_disabled_material_dark));
+            }
+        }
+
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mListener.onBrowserSelected(browser);
+            }
+        });
+    }
+
+    // Return the size of the dataset (invoked by the layout manager)
+    @Override
+    public int getItemCount() {
+        if (mBrowsers != null)
+            return mBrowsers.length;
+        return 0;
+    }
+}

app/src/main/java/net/i2p/android/help/BrowserConfigActivity.java

@@ -0,0 +1,94 @@
+package net.i2p.android.help;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+
+import net.i2p.android.router.R;
+
+import java.lang.reflect.Field;
+
+public class BrowserConfigActivity extends ActionBarActivity implements
+        BrowserAdapter.OnBrowserSelectedListener {
+
+    /**
+     * Whether or not the activity is in two-pane mode, i.e. running on a tablet
+     * device.
+     */
+    private boolean mTwoPane;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_help);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (findViewById(R.id.detail_fragment) != null) {
+            // The detail container view will be present only in the
+            // large-screen layouts (res/values-large and
+            // res/values-sw600dp). If this view is present, then the
+            // activity should be in two-pane mode.
+            mTwoPane = true;
+        }
+
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.main_fragment, new BrowserListFragment())
+                    .commit();
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    // BrowserAdapter.OnBrowserSelected
+
+    @Override
+    public void onBrowserSelected(Browser browser) {
+        int file;
+        if (browser.isKnown) {
+            if (browser.isSupported) {
+                // Check for embedded browser
+                if (browser.packageName.startsWith("net.i2p.android"))
+                    file = R.raw.help_embedded_browser;
+                else {
+                    // Load the configuration guide for this browser
+                    try {
+                        String name = "help_" + browser.packageName.replace('.', '_');
+                        Class res = R.raw.class;
+                        Field field = res.getField(name);
+                        file = field.getInt(null);
+                    } catch (Exception e) {
+                        file = R.raw.help_unknown_browser;
+                    }
+                }
+            } else
+                file = R.raw.help_unsupported_browser;
+        } else
+            file = R.raw.help_unknown_browser;
+        HelpHtmlFragment configFrag = HelpHtmlFragment.newInstance(file);
+        if (mTwoPane) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.detail_fragment, configFrag)
+                    .commit();
+        } else {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.main_fragment, configFrag)
+                    .addToBackStack("config" + browser.packageName)
+                    .commit();
+        }
+    }
+}

app/src/main/java/net/i2p/android/help/BrowserListFragment.java

@@ -0,0 +1,187 @@
+package net.i2p.android.help;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.Loader;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import net.i2p.android.router.R;
+import net.i2p.android.router.util.BetterAsyncTaskLoader;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class BrowserListFragment extends Fragment implements
+        LoaderManager.LoaderCallbacks<List<Browser>> {
+    private static final int BROWSER_LOADER_ID = 1;
+
+    private BrowserAdapter.OnBrowserSelectedListener mCallback;
+    private BrowserAdapter mAdapter;
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
+        // This makes sure that the container activity has implemented
+        // the callback interface. If not, it throws an exception
+        try {
+            mCallback = (BrowserAdapter.OnBrowserSelectedListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString()
+                    + " must implement OnBrowserSelectedListener");
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_help_browsers, container, false);
+        RecyclerView mRecyclerView = (RecyclerView) v.findViewById(R.id.browser_list);
+
+        // use a linear layout manager
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity());
+        mRecyclerView.setLayoutManager(mLayoutManager);
+
+        mAdapter = new BrowserAdapter(getActivity(), mCallback);
+        mRecyclerView.setAdapter(mAdapter);
+
+        return v;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        getLoaderManager().initLoader(BROWSER_LOADER_ID, null, this);
+    }
+
+    // LoaderManager.LoaderCallbacks<List<Browser>>
+
+    @Override
+    public Loader<List<Browser>> onCreateLoader(int id, Bundle args) {
+        return new BrowserLoader(getActivity());
+    }
+
+    public static class BrowserLoader extends BetterAsyncTaskLoader<List<Browser>> {
+        private List<String> recommended;
+        private List<String> recommendedLabels;
+        private List<String> supported;
+        private List<String> supportedLabels;
+        private List<String> unsupported;
+
+        public BrowserLoader(Context context) {
+            super(context);
+            recommended = Arrays.asList(
+                    getContext().getResources().getStringArray(R.array.recommended_browsers));
+            recommendedLabels = Arrays.asList(
+                    getContext().getResources().getStringArray(R.array.recommended_browser_labels));
+            supported = Arrays.asList(
+                    getContext().getResources().getStringArray(R.array.supported_browsers));
+            supportedLabels = Arrays.asList(
+                    getContext().getResources().getStringArray(R.array.supported_browser_labels));
+            unsupported = Arrays.asList(
+                    context.getResources().getStringArray(R.array.unsupported_browsers));
+        }
+
+        @Override
+        public List<Browser> loadInBackground() {
+            List<Browser> browsers = new ArrayList<>();
+            Map<String, String> recommendedMap = new HashMap<>();
+            for (int i = 0; i < recommended.size(); i++) {
+                recommendedMap.put(recommended.get(i), recommendedLabels.get(i));
+            }
+            Map<String, String> supportedMap = new HashMap<>();
+            for (int i = 0; i < supported.size(); i++) {
+                supportedMap.put(supported.get(i), supportedLabels.get(i));
+            }
+
+            // Find all installed browsers that listen for ".i2p"
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse("http://stats.i2p"));
+
+            final PackageManager pm = getContext().getPackageManager();
+            List<ResolveInfo> installedBrowsers = pm.queryIntentActivities(intent, 0);
+
+            for (ResolveInfo browser : installedBrowsers) {
+                if (recommended.contains(browser.activityInfo.packageName)) {
+                    browsers.add(new Browser(pm, browser, true, true));
+                    recommendedMap.remove(browser.activityInfo.packageName);
+                } else if (supported.contains(browser.activityInfo.packageName) ||
+                        browser.activityInfo.packageName.startsWith("net.i2p.android")) {
+                    browsers.add(new Browser(pm, browser, true, false));
+                    supportedMap.remove(browser.activityInfo.packageName);
+                } else if (unsupported.contains(browser.activityInfo.packageName))
+                    browsers.add(new Browser(pm, browser, false, false));
+                else
+                    browsers.add(new Browser(pm, browser));
+            }
+
+            // Now add the remaining recommended and supported browsers
+            for (Map.Entry<String, String> browser : recommendedMap.entrySet()) {
+                browsers.add(new Browser(browser.getKey(), browser.getValue(),
+                        getDrawableForPackage(browser.getKey()),
+                        false, true, true, true));
+            }
+            for (Map.Entry<String, String> browser : supportedMap.entrySet()) {
+                browsers.add(new Browser(browser.getKey(), browser.getValue(),
+                        getDrawableForPackage(browser.getKey()),
+                        false, true, true, false));
+            }
+
+            Collections.sort(browsers);
+            return browsers;
+        }
+        private Drawable getDrawableForPackage(String packageName) {
+            try {
+                String name = "icon_" + packageName.replace('.', '_');
+                Class res = R.drawable.class;
+                Field field = res.getField(name);
+                int drawable = field.getInt(null);
+                return getContext().getResources().getDrawable(drawable);
+            } catch (Exception e) {
+                return null;
+            }
+        }
+
+        @Override
+        protected void onStartMonitoring() {
+        }
+
+        @Override
+        protected void onStopMonitoring() {
+        }
+
+        @Override
+        protected void releaseResources(List<Browser> data) {
+        }
+    }
+
+    @Override
+    public void onLoadFinished(Loader<List<Browser>> listLoader, List<Browser> browsers) {
+        if (listLoader.getId() == BROWSER_LOADER_ID)
+            mAdapter.setBrowsers(browsers.toArray(new Browser[browsers.size()]));
+    }
+
+    @Override
+    public void onLoaderReset(Loader<List<Browser>> listLoader) {
+        if (listLoader.getId() == BROWSER_LOADER_ID)
+            mAdapter.clear();
+    }
+}

app/src/main/java/net/i2p/android/help/HelpActivity.java

@@ -0,0 +1,155 @@
+package net.i2p.android.help;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.NavUtils;
+import android.support.v4.app.TaskStackBuilder;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import net.i2p.android.router.LicenseActivity;
+import net.i2p.android.router.R;
+import net.i2p.android.router.dialog.TextResourceDialog;
+
+public class HelpActivity extends ActionBarActivity implements
+        HelpListFragment.OnEntrySelectedListener {
+    public static final String CATEGORY = "help_category";
+    public static final int CAT_MAIN = 0;
+    public static final int CAT_CONFIGURE_BROWSER = 1;
+    public static final int CAT_ADDRESSBOOK = 2;
+    public static final int CAT_I2PTUNNEL = 3;
+
+    /**
+     * Whether or not the activity is in two-pane mode, i.e. running on a tablet
+     * device.
+     */
+    private boolean mTwoPane;
+    private int mCategory;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_help);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (findViewById(R.id.detail_fragment) != null) {
+            // The detail container view will be present only in the
+            // large-screen layouts (res/values-large and
+            // res/values-sw600dp). If this view is present, then the
+            // activity should be in two-pane mode.
+            mTwoPane = true;
+        }
+
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.main_fragment, new HelpListFragment())
+                    .commit();
+        }
+
+        mCategory = getIntent().getIntExtra(CATEGORY, -1);
+        if (mCategory >= 0) {
+            showCategory(mCategory);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.activity_help_actions, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                if (mCategory >= 0) {
+                    onBackPressed();
+                } else {
+                    Intent upIntent = NavUtils.getParentActivityIntent(this);
+                    if (NavUtils.shouldUpRecreateTask(this, upIntent)) {
+                        // This activity is NOT part of this app's task, so create a new task
+                        // when navigating up, with a synthesized back stack.
+                        TaskStackBuilder.create(this)
+                                // Add all of this activity's parents to the back stack
+                                .addNextIntentWithParentStack(upIntent)
+                                        // Navigate up to the closest parent
+                                .startActivities();
+                    } else {
+                        // This activity is part of this app's task, so simply
+                        // navigate up to the logical parent activity.
+                        NavUtils.navigateUpTo(this, upIntent);
+                    }
+                }
+                return true;
+            case R.id.menu_help_licenses:
+                Intent lic = new Intent(HelpActivity.this, LicenseActivity.class);
+                startActivity(lic);
+                return true;
+            case R.id.menu_help_release_notes:
+                TextResourceDialog dialog = new TextResourceDialog();
+                Bundle args = new Bundle();
+                args.putString(TextResourceDialog.TEXT_DIALOG_TITLE,
+                        getResources().getString(R.string.label_release_notes));
+                args.putInt(TextResourceDialog.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
+                dialog.setArguments(args);
+                dialog.show(getSupportFragmentManager(), "release_notes");
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        if (mCategory >= 0)
+            mCategory = -1;
+    }
+
+    // HelpListFragment.OnEntrySelectedListener
+
+    @Override
+    public void onEntrySelected(int entry) {
+        if (entry == CAT_CONFIGURE_BROWSER) {
+            Intent i = new Intent(this, BrowserConfigActivity.class);
+            startActivity(i);
+        } else {
+            mCategory = entry;
+            showCategory(entry);
+        }
+    }
+
+    private void showCategory(int category) {
+        int file;
+        switch (category) {
+            case CAT_ADDRESSBOOK:
+                file = R.raw.help_addressbook;
+                break;
+
+            case CAT_I2PTUNNEL:
+                file = R.raw.help_i2ptunnel;
+                break;
+
+            case CAT_MAIN:
+            default:
+                file = R.raw.help_main;
+                break;
+        }
+        HelpHtmlFragment f = HelpHtmlFragment.newInstance(file);
+        if (mTwoPane) {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.detail_fragment, f).commit();
+        } else {
+            getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.main_fragment, f)
+                    .addToBackStack("help" + category)
+                    .commit();
+        }
+    }
+}

app/src/main/java/net/i2p/android/help/HelpHtmlFragment.java

@@ -0,0 +1,36 @@
+package net.i2p.android.help;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ScrollView;
+
+import net.i2p.android.router.R;
+
+import org.sufficientlysecure.htmltextview.HtmlTextView;
+
+public class HelpHtmlFragment extends Fragment {
+    public static final String ARG_HTML_FILE = "htmlFile";
+
+    static HelpHtmlFragment newInstance(int htmlFile) {
+        HelpHtmlFragment f = new HelpHtmlFragment();
+        Bundle args = new Bundle();
+        args.putInt(ARG_HTML_FILE, htmlFile);
+        f.setArguments(args);
+        return f;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        ScrollView scroller = new ScrollView(getActivity());
+        HtmlTextView text = new HtmlTextView(getActivity());
+        scroller.addView(text);
+        int padH = getResources().getDimensionPixelOffset(R.dimen.activity_horizontal_margin);
+        int padV = getResources().getDimensionPixelOffset(R.dimen.activity_vertical_margin);
+        text.setPadding(padH, padV, padH, padV);
+        text.setHtmlFromRawResource(getActivity(), getArguments().getInt(ARG_HTML_FILE), true);
+        return scroller;
+    }
+}

app/src/main/java/net/i2p/android/help/HelpListFragment.java

@@ -0,0 +1,47 @@
+package net.i2p.android.help;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v4.app.ListFragment;
+import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+import net.i2p.android.router.R;
+
+public class HelpListFragment extends ListFragment {
+    OnEntrySelectedListener mEntrySelectedCallback;
+
+    // Container Activity must implement this interface
+    public interface OnEntrySelectedListener {
+        public void onEntrySelected(int entry);
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
+        // This makes sure that the container activity has implemented
+        // the callback interface. If not, it throws an exception
+        try {
+            mEntrySelectedCallback = (OnEntrySelectedListener) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException(activity.toString()
+                    + " must implement OnEntrySelectedListener");
+        }
+
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        setListAdapter(ArrayAdapter.createFromResource(getActivity(),
+                R.array.help_categories, R.layout.listitem_text));
+    }
+
+    @Override
+    public void onListItemClick(ListView parent, View view, int pos, long id) {
+        super.onListItemClick(parent, view, pos, id);
+        mEntrySelectedCallback.onEntrySelected(pos);
+    }
+}

app/src/main/java/net/i2p/android/i2ptunnel/EditTunnelActivity.java

@@ -0,0 +1,27 @@
+package net.i2p.android.i2ptunnel;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
+
+import net.i2p.android.router.R;
+
+public class EditTunnelActivity extends ActionBarActivity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_help_onepane);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        if (savedInstanceState == null) {
+            int tunnelId = getIntent().getIntExtra(TunnelDetailFragment.TUNNEL_ID, 0);
+            EditTunnelFragment editFrag = EditTunnelFragment.newInstance(tunnelId);
+            getSupportFragmentManager().beginTransaction()
+                .add(R.id.main_fragment, editFrag).commit();
+        }
+    }
+}

app/src/main/java/net/i2p/android/i2ptunnel/EditTunnelFragment.java

@@ -0,0 +1,272 @@
+package net.i2p.android.i2ptunnel;
+
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.support.v4.preference.PreferenceFragment;
+
+import net.i2p.I2PAppContext;
+import net.i2p.android.i2ptunnel.util.TunnelLogic;
+import net.i2p.android.i2ptunnel.util.TunnelUtil;
+import net.i2p.android.router.R;
+import net.i2p.i2ptunnel.TunnelControllerGroup;
+import net.i2p.i2ptunnel.ui.TunnelConfig;
+
+public class EditTunnelFragment extends PreferenceFragment {
+    private static final String ARG_TUNNEL_ID = "tunnelId";
+
+    private TunnelControllerGroup mGroup;
+    private int mTunnelId;
+
+    public static EditTunnelFragment newInstance(int tunnelId) {
+        EditTunnelFragment f = new EditTunnelFragment();
+        Bundle args = new Bundle();
+        args.putInt(ARG_TUNNEL_ID, tunnelId);
+        f.setArguments(args);
+        return f;
+    }
+
+    @Override
+    public void onCreate(Bundle paramBundle) {
+        super.onCreate(paramBundle);
+
+        String error;
+        try {
+            mGroup = TunnelControllerGroup.getInstance();
+            error = mGroup == null ? getResources().getString(R.string.i2ptunnel_not_initialized) : null;
+        } catch (IllegalArgumentException iae) {
+            mGroup = null;
+            error = iae.toString();
+        }
+
+        if (mGroup == null) {
+            // TODO Show error
+        } else if (getArguments().containsKey(ARG_TUNNEL_ID)) {
+            mTunnelId = getArguments().getInt(ARG_TUNNEL_ID, 0);
+            TunnelUtil.writeTunnelToPreferences(getActivity(), mGroup, mTunnelId);
+            // https://stackoverflow.com/questions/17880437/which-settings-file-does-preferencefragment-read-write
+            getPreferenceManager().setSharedPreferencesName(TunnelUtil.getPreferencesFilename(mTunnelId));
+            loadPreferences();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        // Pre-Honeycomb: onPause() is the last method guaranteed to be called.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB)
+            saveTunnel();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        // Honeycomb and above: onStop() is the last method guaranteed to be called.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+            saveTunnel();
+    }
+
+    private void saveTunnel() {
+        if (mGroup != null) {
+            TunnelConfig cfg = TunnelUtil.createConfigFromPreferences(getActivity(), mGroup, mTunnelId);
+            TunnelUtil.saveTunnel(I2PAppContext.getGlobalContext(), mGroup, mTunnelId, cfg);
+        }
+    }
+
+    private void loadPreferences() {
+        String type = TunnelUtil.getController(mGroup, mTunnelId).getType();
+        new TunnelPreferences(type).runLogic();
+    }
+
+    class TunnelPreferences extends TunnelLogic {
+        PreferenceScreen ps;
+        PreferenceCategory generalCategory;
+        PreferenceCategory portCategory;
+        PreferenceScreen advanced;
+        PreferenceCategory tunParamCategory;
+
+        public TunnelPreferences(String type) {
+            super(type);
+        }
+
+        @Override
+        protected void general() {
+            addPreferencesFromResource(R.xml.tunnel_gen);
+            ps = getPreferenceScreen();
+            generalCategory = (PreferenceCategory) ps.findPreference(
+                    getString(R.string.TUNNEL_CAT_GENERAL));
+            portCategory = (PreferenceCategory) ps.findPreference(
+                    getString(R.string.TUNNEL_CAT_PORT));
+        }
+
+        @Override
+        protected void generalClient() {
+            addPreferencesFromResource(R.xml.tunnel_gen_client, generalCategory);
+        }
+
+        @Override
+        protected void generalClientStreamr(boolean isStreamr) {
+            if (isStreamr) {
+                generalCategory.removePreference(generalCategory.findPreference(getString(R.string.TUNNEL_SHARED_CLIENT)));
+                addPreferencesFromResource(R.xml.tunnel_gen_server_port, portCategory);
+                portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_TARGET_PORT)));
+                portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+            }
+        }
+
+        @Override
+        protected void generalClientPort() {
+            addPreferencesFromResource(R.xml.tunnel_gen_client_port, portCategory);
+        }
+
+        @Override
+        protected void generalClientPortStreamr(boolean isStreamr) {
+            if (isStreamr)
+                portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_INTERFACE)));
+        }
+
+        @Override
+        protected void generalClientProxy(boolean isProxy) {
+            if (isProxy) {
+                generalCategory.removePreference(generalCategory.findPreference(getString(R.string.TUNNEL_DEST)));
+                addPreferencesFromResource(R.xml.tunnel_gen_client_proxy);
+            }
+        }
+
+        @Override
+        protected void generalClientProxyHttp(boolean isHttp) {
+            if (!isHttp)
+                ps.removePreference(ps.findPreference(getString(R.string.TUNNEL_HTTPCLIENT_SSL_OUTPROXIES)));
+        }
+
+        @Override
+        protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            if (!isStandardOrIrc)
+                portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+        }
+
+        @Override
+        protected void generalClientIrc() {
+            addPreferencesFromResource(R.xml.tunnel_gen_client_irc);
+        }
+
+        @Override
+        protected void generalServerHttp() {
+            addPreferencesFromResource(R.xml.tunnel_gen_server_http, generalCategory);
+        }
+
+        @Override
+        protected void generalServerHttpBidirOrStreamr(boolean isStreamr) {
+            addPreferencesFromResource(R.xml.tunnel_gen_client_port, portCategory);
+            portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+            if (isStreamr)
+                portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_LISTEN_PORT)));
+        }
+
+        @Override
+        protected void generalServerPort() {
+            addPreferencesFromResource(R.xml.tunnel_gen_server_port, portCategory);
+        }
+
+        @Override
+        protected void generalServerPortStreamr(boolean isStreamr) {
+            if (isStreamr) {
+                portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_TARGET_HOST)));
+                portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+            }
+        }
+
+        @Override
+        protected void advanced() {
+            addPreferencesFromResource(R.xml.tunnel_adv);
+            advanced = (PreferenceScreen) ps.findPreference(
+                    getString(R.string.TUNNEL_CAT_ADVANCED));
+            tunParamCategory = (PreferenceCategory) ps.findPreference(
+                    getString(R.string.TUNNEL_CAT_TUNNEL_PARAMS));
+        }
+
+        @Override
+        protected void advancedStreamr(boolean isStreamr) {
+            if (isStreamr)
+                tunParamCategory.removePreference(tunParamCategory.findPreference(getString(R.string.TUNNEL_OPT_PROFILE)));
+        }
+
+        @Override
+        protected void advancedServerOrStreamrClient(boolean isServerOrStreamrClient) {
+            if (isServerOrStreamrClient)
+                tunParamCategory.removePreference(tunParamCategory.findPreference(getString(R.string.TUNNEL_OPT_DELAY_CONNECT)));
+        }
+
+        @Override
+        protected void advancedServer() {
+            addPreferencesFromResource(R.xml.tunnel_adv_server, advanced);
+        }
+
+        @Override
+        protected void advancedServerHttp(boolean isHttp) {
+            if (isHttp)
+                addPreferencesFromResource(R.xml.tunnel_adv_server_http, advanced);
+            else {
+                PreferenceCategory accessCtlCategory = (PreferenceCategory) ps.findPreference(
+                        getString(R.string.TUNNEL_CAT_ACCESS_CONTROL));
+                accessCtlCategory.removePreference(accessCtlCategory.findPreference(getString(R.string.TUNNEL_OPT_REJECT_INPROXY)));
+            }
+        }
+
+        @Override
+        protected void advancedIdle() {
+            addPreferencesFromResource(R.xml.tunnel_adv_idle, advanced);
+        }
+
+        @Override
+        protected void advancedIdleServerOrStreamrClient(boolean isServerOrStreamrClient) {
+            if (isServerOrStreamrClient)
+                advanced.removePreference(advanced.findPreference(getString(R.string.TUNNEL_OPT_DELAY_OPEN)));
+        }
+
+        @Override
+        protected void advancedClient() {
+            PreferenceCategory idleCategory = (PreferenceCategory) ps.findPreference(
+                    getString(R.string.TUNNEL_CAT_IDLE)
+            );
+            addPreferencesFromResource(R.xml.tunnel_adv_idle_client, idleCategory);
+        }
+
+        @Override
+        protected void advancedClientHttp() {
+            addPreferencesFromResource(R.xml.tunnel_adv_client_http, advanced);
+        }
+
+        @Override
+        protected void advancedClientProxy() {
+            addPreferencesFromResource(R.xml.tunnel_adv_client_proxy, advanced);
+        }
+
+        @Override
+        protected void advancedOther() {
+            addPreferencesFromResource(R.xml.tunnel_adv_other, advanced);
+        }
+    }
+
+    /**
+     * http://stackoverflow.com/a/20806812
+     *
+     * @param id the Preferences XML to load
+     * @param newParent the parent PreferenceGroup to add the new Preferences to.
+     */
+    private void addPreferencesFromResource (int id, PreferenceGroup newParent) {
+        PreferenceScreen screen = getPreferenceScreen();
+        int last = screen.getPreferenceCount();
+        addPreferencesFromResource(id);
+        while (screen.getPreferenceCount () > last) {
+            Preference p = screen.getPreference (last);
+            screen.removePreference(p); // decreases the preference count
+            newParent.addPreference(p);
+        }
+    }
+}

app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailActivity.java

@@ -1,16 +1,20 @@
 package net.i2p.android.i2ptunnel;
 
+import android.content.Intent;
+import android.os.Bundle;
+
 import net.i2p.android.router.I2PActivityBase;
 import net.i2p.android.router.R;
-import android.os.Bundle;
 
 public class TunnelDetailActivity extends I2PActivityBase implements
-        TunnelDetailFragment.OnTunnelDeletedListener {
+        TunnelDetailFragment.TunnelDetailListener {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mDrawerToggle.setDrawerIndicatorEnabled(false);
 
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+
         if (savedInstanceState == null) {
             int tunnelId = getIntent().getIntExtra(TunnelDetailFragment.TUNNEL_ID, 0);
             TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);
@@ -19,7 +23,14 @@ public class TunnelDetailActivity extends I2PActivityBase implements
         }
     }
 
-    // TunnelDetailFragment.OnTunnelDeletedListener
+    // TunnelDetailFragment.TunnelDetailListener
+
+    @Override
+    public void onEditTunnel(int tunnelId) {
+        Intent editIntent = new Intent(this, EditTunnelActivity.class);
+        editIntent.putExtra(TunnelDetailFragment.TUNNEL_ID, tunnelId);
+        startActivity(editIntent);
+    }
 
     public void onTunnelDeleted(int tunnelId, int numTunnelsLeft) {
         finish();

app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java

@@ -1,15 +1,11 @@
 package net.i2p.android.i2ptunnel;
 
-import java.util.List;
-
-import net.i2p.android.i2ptunnel.util.TunnelUtil;
-import net.i2p.android.router.R;
-import net.i2p.i2ptunnel.TunnelControllerGroup;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -22,10 +18,17 @@ import android.widget.CheckBox;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import net.i2p.I2PAppContext;
+import net.i2p.android.i2ptunnel.util.TunnelUtil;
+import net.i2p.android.router.R;
+import net.i2p.i2ptunnel.TunnelControllerGroup;
+
+import java.util.List;
+
 public class TunnelDetailFragment extends Fragment {
     public static final String TUNNEL_ID = "tunnel_id";
 
-    OnTunnelDeletedListener mCallback;
+    TunnelDetailListener mCallback;
     private TunnelControllerGroup mGroup;
     private TunnelEntry mTunnel;
 
@@ -38,7 +41,8 @@ public class TunnelDetailFragment extends Fragment {
     }
 
     // Container Activity must implement this interface
-    public interface OnTunnelDeletedListener {
+    public interface TunnelDetailListener {
+        public void onEditTunnel(int tunnelId);
         public void onTunnelDeleted(int tunnelId, int numTunnelsLeft);
     }
 
@@ -49,7 +53,7 @@ public class TunnelDetailFragment extends Fragment {
         // This makes sure that the container activity has implemented
         // the callback interface. If not, it throws an exception
         try {
-            mCallback = (OnTunnelDeletedListener) activity;
+            mCallback = (TunnelDetailListener) activity;
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString()
                     + " must implement OnTunnelDeletedListener");
@@ -96,11 +100,39 @@ public class TunnelDetailFragment extends Fragment {
             TextView description = (TextView) v.findViewById(R.id.tunnel_description);
             description.setText(mTunnel.getDescription());
 
-            TextView targetIfacePort = (TextView) v.findViewById(R.id.tunnel_target_interface_port);
-            targetIfacePort.setText(mTunnel.getIfacePort());
+            TextView details = (TextView) v.findViewById(R.id.tunnel_details);
+            details.setText(mTunnel.getDetails());
 
+            View accessIfacePortLabel = v.findViewById(R.id.tunnel_access_interface_port_label);
             TextView accessIfacePort = (TextView) v.findViewById(R.id.tunnel_access_interface_port);
-            accessIfacePort.setText(mTunnel.getIfacePort());
+            View targetIfacePortLabel = v.findViewById(R.id.tunnel_target_interface_port_label);
+            TextView targetIfacePort = (TextView) v.findViewById(R.id.tunnel_target_interface_port);
+            switch (mTunnel.getInternalType()) {
+                case "httpbidirserver":
+                    accessIfacePort.setText(mTunnel.getClientLink(false));
+                    targetIfacePort.setText(mTunnel.getServerLink(false));
+                    break;
+                case "streamrserver":
+                    accessIfacePort.setText(mTunnel.getServerLink(false));
+                    targetIfacePortLabel.setVisibility(View.GONE);
+                    targetIfacePort.setVisibility(View.GONE);
+                    break;
+                case "streamrclient":
+                    accessIfacePortLabel.setVisibility(View.GONE);
+                    accessIfacePort.setVisibility(View.GONE);
+                    targetIfacePort.setText(mTunnel.getClientLink(false));
+                    break;
+                default:
+                    if (mTunnel.isClient()) {
+                        accessIfacePort.setText(mTunnel.getClientLink(false));
+                        targetIfacePortLabel.setVisibility(View.GONE);
+                        targetIfacePort.setVisibility(View.GONE);
+                    } else {
+                        accessIfacePortLabel.setVisibility(View.GONE);
+                        accessIfacePort.setVisibility(View.GONE);
+                        targetIfacePort.setText(mTunnel.getServerLink(false));
+                    }
+            }
 
             CheckBox autoStart = (CheckBox) v.findViewById(R.id.tunnel_autostart);
             autoStart.setChecked(mTunnel.startAutomatically());
@@ -112,7 +144,7 @@ public class TunnelDetailFragment extends Fragment {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.fragment_i2ptunnel_detail_actions, menu);
-        // Hide the edit action until we have an edit UI
+        // Disable until ticket #815 is closed
         menu.findItem(R.id.action_edit_tunnel).setVisible(false);
     }
 
@@ -140,6 +172,9 @@ public class TunnelDetailFragment extends Fragment {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        if (mTunnel == null)
+            return false;
+
         // Handle presses on the action bar items
         switch (item.getItemId()) {
         case R.id.action_start_tunnel:
@@ -159,9 +194,11 @@ public class TunnelDetailFragment extends Fragment {
             getActivity().supportInvalidateOptionsMenu();
             return true;
         case R.id.action_edit_tunnel:
+            mCallback.onEditTunnel(mTunnel.getId());
             return true;
         case R.id.action_delete_tunnel:
             DialogFragment dg = new DialogFragment() {
+                @NonNull
                 @Override
                 public Dialog onCreateDialog(Bundle savedInstanceState) {
                     return new AlertDialog.Builder(getActivity())
@@ -171,7 +208,8 @@ public class TunnelDetailFragment extends Fragment {
 
                                     public void onClick(DialogInterface dialog, int which) {
                                         List<String> msgs = TunnelUtil.deleteTunnel(
-                                                getActivity(), mGroup, mTunnel.getId());
+                                                I2PAppContext.getGlobalContext(),
+                                                mGroup, mTunnel.getId(), null);
                                         dialog.dismiss();
                                         Toast.makeText(getActivity().getApplicationContext(),
                                                 msgs.get(0), Toast.LENGTH_LONG).show();

app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntry.java

@@ -1,17 +1,20 @@
 package net.i2p.android.i2ptunnel;
 
-import java.util.List;
-
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.widget.Toast;
-import net.i2p.android.i2ptunnel.util.TunnelConfig;
+
+import net.i2p.I2PAppContext;
 import net.i2p.android.i2ptunnel.util.TunnelUtil;
 import net.i2p.android.router.R;
 import net.i2p.data.Destination;
 import net.i2p.data.PrivateKeyFile;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
+import net.i2p.i2ptunnel.ui.TunnelConfig;
+
+import java.util.List;
 
 public class TunnelEntry {
     public static final int RUNNING = 1;
@@ -29,7 +32,7 @@ public class TunnelEntry {
             TunnelConfig cfg) {
         int tunnelId = tcg.getControllers().size();
         List<String> msgs = TunnelUtil.saveTunnel(
-                ctx, tcg, -1, cfg.getConfig());
+                I2PAppContext.getGlobalContext(), tcg, -1, cfg);
         // TODO: Do something else with the other messages.
         Toast.makeText(ctx.getApplicationContext(),
                 msgs.get(0), Toast.LENGTH_LONG).show();
@@ -90,6 +93,16 @@ public class TunnelEntry {
         else return NOT_RUNNING;
     }
 
+    public boolean isRunning() {
+        switch (getStatus()) {
+            case STANDBY:
+            case RUNNING:
+                return true;
+            default:
+                return false;
+        }
+    }
+
     public boolean isClient() {
         return TunnelUtil.isClient(mController.getType());
     }
@@ -100,18 +113,42 @@ public class TunnelEntry {
         return Boolean.parseBoolean(mController.getSharedClient());
     }
 
+    /**
+     * Call this to see if it is okay to linkify getClientLink()
+     * @return true if getClientLink() can be linkified, false otherwise.
+     */
+    public boolean isClientLinkValid() {
+        return ("ircclient".equals(mController.getType())) &&
+                mController.getListenOnInterface() != null &&
+                mController.getListenPort() != null;
+    }
+
+    /**
+     * @return valid host:port only if isClientLinkValid() is true
+     */
+    public String getClientLink(boolean linkify) {
+        String host = getClientInterface();
+        String port = getClientPort();
+        String link =  host + ":" + port;
+        if (linkify) {
+            if ("ircclient".equals(mController.getType()))
+                link = "irc://" + link;
+        }
+        return link;
+    }
+
     public String getClientInterface() {
+        String rv;
         if ("streamrclient".equals(mController.getType()))
-            return mController.getTargetHost();
+            rv = mController.getTargetHost();
         else
-            return mController.getListenOnInterface();
+            rv = mController.getListenOnInterface();
+        return rv != null ? rv : "";
     }
 
     public String getClientPort() {
         String rv = mController.getListenPort();
-        if (rv != null)
-            return rv;
-        return "";
+        return rv != null ? rv : "";
     }
 
     public String getClientDestination() {
@@ -128,10 +165,10 @@ public class TunnelEntry {
     /* Server tunnel data */
 
     /**
-     * Call this to see if it is okay to linkify getServerTarget()
-     * @return true if getServerTarget() can be linkified, false otherwise.
+     * Call this to see if it is okay to linkify getServerLink()
+     * @return true if getServerLink() can be linkified, false otherwise.
      */
-    public boolean isServerTargetLinkValid() {
+    public boolean isServerLinkValid() {
         return ("httpserver".equals(mController.getType()) ||
                 "httpbidirserver".equals(mController.getType())) &&
                 mController.getTargetHost() != null &&
@@ -139,9 +176,9 @@ public class TunnelEntry {
     }
 
     /**
-     * @return valid host:port only if isServerTargetLinkValid() is true
+     * @return valid host:port only if isServerLinkValid() is true
      */
-    public String getServerTarget() {
+    public String getServerLink(boolean linkify) {
         String host;
         if ("streamrserver".equals(getInternalType()))
             host = mController.getListenOnInterface();
@@ -152,7 +189,13 @@ public class TunnelEntry {
         if (port == null) port = "";
         if (host.indexOf(':') >= 0)
             host = '[' + host + ']';
-        return host + ":" + port;
+        String link =  host + ":" + port;
+        if (linkify) {
+            if ("httpserver".equals(mController.getType()) ||
+                    "httpbidirserver".equals(mController.getType()))
+                link = "http://" + link;
+        }
+        return link;
     }
 
     public String getDestinationBase64() {
@@ -183,18 +226,25 @@ public class TunnelEntry {
 
     /* Other output formats */
 
-    public String getIfacePort() {
-        if (isClient()) {
-            String host;
-            if ("streamrclient".equals(getInternalType()))
-                host = mController.getTargetHost();
-            else
-                host = mController.getListenOnInterface();
-            String port = mController.getListenPort();
-            if (host == null) host = "";
-            if (port == null) port = "";
-            return host + ":" + port;
-        } else return getServerTarget();
+    public boolean isTunnelLinkValid() {
+        if (isClient()) return isClientLinkValid();
+        else return isServerLinkValid();
+    }
+
+    public String getTunnelLink(boolean linkify) {
+        if (isClient()) return getClientLink(linkify);
+        else return getServerLink(linkify);
+    }
+
+    public Uri getRecommendedAppForTunnel() {
+        int resId = 0;
+        if ("ircclient".equals(mController.getType()))
+            resId = R.string.market_irc;
+
+        if (resId > 0)
+            return Uri.parse(mContext.getString(resId));
+        else
+            return null;
     }
 
     public String getDetails() {
@@ -209,16 +259,29 @@ public class TunnelEntry {
     public Drawable getStatusIcon() {
         switch (getStatus()) {
         case STANDBY:
+            return mContext.getResources()
+                    .getDrawable(R.drawable.ic_schedule_black_24dp);
         case STARTING:
-            return mContext.getResources()
-                    .getDrawable(R.drawable.local_inprogress);
         case RUNNING:
-            return mContext.getResources()
-                    .getDrawable(R.drawable.local_up);
         case NOT_RUNNING:
         default:
-            return mContext.getResources()
-                    .getDrawable(R.drawable.local_down);
+            return null;
+        }
+    }
+
+    public Drawable getStatusBackground() {
+        switch (getStatus()) {
+            case STANDBY:
+            case STARTING:
+                return mContext.getResources()
+                        .getDrawable(R.drawable.tunnel_yellow);
+            case RUNNING:
+                return mContext.getResources()
+                        .getDrawable(R.drawable.tunnel_green);
+            case NOT_RUNNING:
+            default:
+                return mContext.getResources()
+                        .getDrawable(R.drawable.tunnel_red);
         }
     }
 }

app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryAdapter.java

@@ -1,9 +1,12 @@
 package net.i2p.android.i2ptunnel;
 
-import java.util.List;
-
-import net.i2p.android.router.R;
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +14,10 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import net.i2p.android.router.R;
+
+import java.util.List;
+
 public class TunnelEntryAdapter extends ArrayAdapter<TunnelEntry> {
     private final LayoutInflater mInflater;
 
@@ -31,22 +38,56 @@ public class TunnelEntryAdapter extends ArrayAdapter<TunnelEntry> {
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         View v = mInflater.inflate(R.layout.listitem_i2ptunnel, parent, false);
-        TunnelEntry tunnel = getItem(position);
+        final TunnelEntry tunnel = getItem(position);
+
+        ImageView status = (ImageView) v.findViewById(R.id.tunnel_status);
+        status.setImageDrawable(tunnel.getStatusIcon());
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
+            status.setBackgroundDrawable(tunnel.getStatusBackground());
+        else
+            status.setBackground(tunnel.getStatusBackground());
 
         TextView name = (TextView) v.findViewById(R.id.tunnel_name);
         name.setText(tunnel.getName());
 
-        TextView type = (TextView) v.findViewById(R.id.tunnel_type);
-        type.setText(tunnel.getType());
+        TextView type = (TextView) v.findViewById(R.id.tunnel_description);
+        type.setText(tunnel.getDescription());
 
         TextView ifacePort = (TextView) v.findViewById(R.id.tunnel_interface_port);
-        ifacePort.setText(tunnel.getIfacePort());
+        ifacePort.setText(tunnel.getTunnelLink(false));
 
-        TextView details = (TextView) v.findViewById(R.id.tunnel_details);
-        details.setText(tunnel.getDetails());
-
-        ImageView status = (ImageView) v.findViewById(R.id.tunnel_status);
-        status.setImageDrawable(tunnel.getStatusIcon());
+        if (tunnel.isRunning() && tunnel.isTunnelLinkValid()) {
+            View open = v.findViewById(R.id.tunnel_open);
+            open.setVisibility(View.VISIBLE);
+            open.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent i = new Intent(Intent.ACTION_VIEW);
+                    i.setData(Uri.parse(tunnel.getTunnelLink(true)));
+                    try {
+                        getContext().startActivity(i);
+                    } catch (ActivityNotFoundException e) {
+                        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                        builder.setTitle(R.string.install_recommended_app)
+                                .setMessage(R.string.app_needed_for_this_tunnel_type)
+                                .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                        Uri uri = tunnel.getRecommendedAppForTunnel();
+                                        if (uri != null) {
+                                            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                                            getContext().startActivity(intent);
+                                        }
+                                    }
+                                })
+                                .setNegativeButton(net.i2p.android.lib.client.R.string.no, new DialogInterface.OnClickListener() {
+                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                    }
+                                });
+                        builder.show();
+                    }
+                }
+            });
+        }
 
         return v;
     }

app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryLoader.java

@@ -1,15 +1,15 @@
 package net.i2p.android.i2ptunnel;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import net.i2p.i2ptunnel.TunnelController;
-import net.i2p.i2ptunnel.TunnelControllerGroup;
-
 import android.content.Context;
 import android.os.Handler;
 import android.support.v4.content.AsyncTaskLoader;
 
+import net.i2p.i2ptunnel.TunnelController;
+import net.i2p.i2ptunnel.TunnelControllerGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
 public class TunnelEntryLoader extends AsyncTaskLoader<List<TunnelEntry>> {
     private TunnelControllerGroup mGroup;
     private boolean mClientTunnels;
@@ -26,7 +26,7 @@ public class TunnelEntryLoader extends AsyncTaskLoader<List<TunnelEntry>> {
 
     @Override
     public List<TunnelEntry> loadInBackground() {
-        List<TunnelEntry> ret = new ArrayList<TunnelEntry>();
+        List<TunnelEntry> ret = new ArrayList<>();
         List<TunnelController> controllers = mGroup.getControllers();
         for (int i = 0; i < controllers.size(); i++) {
             TunnelEntry tunnel = new TunnelEntry(getContext(), controllers.get(i), i);

app/src/main/java/net/i2p/android/i2ptunnel/TunnelListActivity.java

@@ -1,22 +1,28 @@
 package net.i2p.android.i2ptunnel;
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+
 import net.i2p.android.router.I2PActivityBase;
 import net.i2p.android.router.R;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBar.Tab;
 
 public class TunnelListActivity extends I2PActivityBase implements
         TunnelListFragment.OnTunnelSelectedListener,
-        TunnelDetailFragment.OnTunnelDeletedListener {
+        TunnelDetailFragment.TunnelDetailListener {
     /**
      * Whether or not the activity is in two-pane mode, i.e. running on a tablet
      * device.
      */
     private boolean mTwoPane;
 
-    private static final String SELECTED_TAB = "selected_tab";
+    private static final String SELECTED_PAGE = "selected_page";
+    private static final int PAGE_CLIENT = 0;
+
+    private Spinner mSpinner;
 
     @Override
     protected boolean canUseTwoPanes() {
@@ -27,34 +33,22 @@ public class TunnelListActivity extends I2PActivityBase implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // Set up action bar for tabs
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        mSpinner = (Spinner) findViewById(R.id.main_spinner);
+        mSpinner.setVisibility(View.VISIBLE);
 
-        // Client tunnels tab
-        TunnelListFragment cf = new TunnelListFragment();
-        Bundle args = new Bundle();
-        args.putBoolean(TunnelListFragment.SHOW_CLIENT_TUNNELS, true);
-        cf.setArguments(args);
-        Tab tab = actionBar.newTab()
-                .setText(R.string.label_i2ptunnel_client)
-                .setTabListener(new TabListener(cf));
-        actionBar.addTab(tab);
+        mSpinner.setAdapter(ArrayAdapter.createFromResource(this,
+                R.array.i2ptunnel_pages, android.R.layout.simple_spinner_dropdown_item));
 
-        // Server tunnels tab
-        TunnelListFragment sf = new TunnelListFragment();
-        args = new Bundle();
-        args.putBoolean(TunnelListFragment.SHOW_CLIENT_TUNNELS, false);
-        sf.setArguments(args);
-        tab = actionBar.newTab()
-                .setText(R.string.label_i2ptunnel_server)
-                .setTabListener(new TabListener(sf));
-        actionBar.addTab(tab);
+        mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                selectPage(i);
+            }
 
-        if (savedInstanceState != null) {
-            int selected = savedInstanceState.getInt(SELECTED_TAB);
-            actionBar.setSelectedNavigationItem(selected);
-        }
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+            }
+        });
 
         if (findViewById(R.id.detail_fragment) != null) {
             // The detail container view will be present only in the
@@ -62,19 +56,34 @@ public class TunnelListActivity extends I2PActivityBase implements
             // res/values-sw600dp). If this view is present, then the
             // activity should be in two-pane mode.
             mTwoPane = true;
-
-            // In two-pane mode, list items should be given the
-            // 'activated' state when touched.
-            cf.setActivateOnItemClick(true);
-            sf.setActivateOnItemClick(true);
         }
+
+        if (savedInstanceState != null) {
+            int selected = savedInstanceState.getInt(SELECTED_PAGE);
+            mSpinner.setSelection(selected);
+        } else
+            selectPage(PAGE_CLIENT);
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt(SELECTED_TAB,
-                getSupportActionBar().getSelectedNavigationIndex());
+        outState.putInt(SELECTED_PAGE, mSpinner.getSelectedItemPosition());
+    }
+
+    private void selectPage(int page) {
+        TunnelListFragment f = new TunnelListFragment();
+        Bundle args = new Bundle();
+        args.putBoolean(TunnelListFragment.SHOW_CLIENT_TUNNELS, page == PAGE_CLIENT);
+        f.setArguments(args);
+
+        // In two-pane mode, list items should be given the
+        // 'activated' state when touched.
+        if (mTwoPane)
+            f.setActivateOnItemClick(true);
+
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.main_fragment, f).commit();
     }
 
     // TunnelListFragment.OnTunnelSelectedListener
@@ -86,7 +95,7 @@ public class TunnelListActivity extends I2PActivityBase implements
             // fragment transaction.
             TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);
             getSupportFragmentManager().beginTransaction()
-                .replace(R.id.detail_fragment, detailFrag).commit();
+                    .replace(R.id.detail_fragment, detailFrag).commit();
         } else {
             // In single-pane mode, simply start the detail activity
             // for the selected item ID.
@@ -96,7 +105,16 @@ public class TunnelListActivity extends I2PActivityBase implements
         }
     }
 
-    // TunnelDetailFragment.OnTunnelDeletedListener
+    // TunnelDetailFragment.TunnelDetailListener
+
+    @Override
+    public void onEditTunnel(int tunnelId) {
+        EditTunnelFragment editFrag = EditTunnelFragment.newInstance(tunnelId);
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.detail_fragment, editFrag)
+                .addToBackStack("")
+                .commit();
+    }
 
     public void onTunnelDeleted(int tunnelId, int numTunnelsLeft) {
         // Should only get here in two-pane mode, but just to be safe:
@@ -105,11 +123,11 @@ public class TunnelListActivity extends I2PActivityBase implements
                 TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(
                         (tunnelId > 0 ? tunnelId - 1 : 0));
                 getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.detail_fragment, detailFrag).commit();
+                        .replace(R.id.detail_fragment, detailFrag).commit();
             } else {
                 TunnelDetailFragment detailFrag = (TunnelDetailFragment) getSupportFragmentManager().findFragmentById(R.id.detail_fragment);
                 getSupportFragmentManager().beginTransaction()
-                    .remove(detailFrag).commit();
+                        .remove(detailFrag).commit();
             }
         }
     }

app/src/main/java/net/i2p/android/i2ptunnel/TunnelListFragment.java

@@ -1,27 +1,33 @@
 package net.i2p.android.i2ptunnel;
 
-import java.util.List;
-
-import net.i2p.android.i2ptunnel.util.TunnelConfig;
-import net.i2p.android.router.HelpActivity;
-import net.i2p.android.router.I2PFragmentBase;
-import net.i2p.android.router.R;
-import net.i2p.android.router.I2PFragmentBase.RouterContextProvider;
-import net.i2p.i2ptunnel.TunnelControllerGroup;
-import net.i2p.router.RouterContext;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import net.i2p.android.help.HelpActivity;
+import net.i2p.android.i2ptunnel.util.TunnelUtil;
+import net.i2p.android.router.I2PFragmentBase;
+import net.i2p.android.router.I2PFragmentBase.RouterContextProvider;
+import net.i2p.android.router.R;
+import net.i2p.i2ptunnel.TunnelControllerGroup;
+import net.i2p.i2ptunnel.ui.TunnelConfig;
+import net.i2p.router.RouterContext;
+
+import java.util.List;
+
 public class TunnelListFragment extends ListFragment implements
         I2PFragmentBase.RouterContextUser,
         LoaderManager.LoaderCallbacks<List<TunnelEntry>> {
@@ -50,6 +56,8 @@ public class TunnelListFragment extends ListFragment implements
     private int mActivatedPosition = ListView.INVALID_POSITION;
     private boolean mActivateOnItemClick = false;
 
+    private ImageButton mNewTunnel;
+
     // Container Activity must implement this interface
     public interface OnTunnelSelectedListener {
         public void onTunnelSelected(int tunnelId);
@@ -85,6 +93,27 @@ public class TunnelListFragment extends ListFragment implements
         setHasOptionsMenu(true);
     }
 
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // Create the list fragment's content view by calling the super method
+        final View listFragmentView = super.onCreateView(inflater, container, savedInstanceState);
+
+        View v = inflater.inflate(R.layout.fragment_list_with_add, container, false);
+        FrameLayout listContainer = (FrameLayout) v.findViewById(R.id.list_container);
+        listContainer.addView(listFragmentView);
+
+        mNewTunnel = (ImageButton) v.findViewById(R.id.promoted_action);
+        mNewTunnel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent wi = new Intent(getActivity(), TunnelWizardActivity.class);
+                startActivityForResult(wi, TUNNEL_WIZARD_REQUEST);
+            }
+        });
+
+        return v;
+    }
+
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -162,7 +191,7 @@ public class TunnelListFragment extends ListFragment implements
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.fragment_i2ptunnel_list_actions, menu);
         if (getRouterContext() == null) {
-            menu.findItem(R.id.action_add_tunnel).setVisible(false);
+            mNewTunnel.setVisibility(View.GONE);
             menu.findItem(R.id.action_start_all_tunnels).setVisible(false);
             menu.findItem(R.id.action_stop_all_tunnels).setVisible(false);
             menu.findItem(R.id.action_restart_all_tunnels).setVisible(false);
@@ -174,27 +203,22 @@ public class TunnelListFragment extends ListFragment implements
         // Handle presses on the action bar items
         List<String> msgs;
         switch (item.getItemId()) {
-        case R.id.action_add_tunnel:
-            Intent wi = new Intent(getActivity(), TunnelWizardActivity.class);
-            startActivityForResult(wi, TUNNEL_WIZARD_REQUEST);
-            return true;
-        case R.id.action_start_all_tunnels:
-            msgs = mGroup.startAllControllers();
-            break;
-        case R.id.action_stop_all_tunnels:
-            msgs = mGroup.stopAllControllers();
-            break;
-        case R.id.action_restart_all_tunnels:
-            msgs = mGroup.restartAllControllers();
-            break;
-        // TODO: Enable when Help page finished
-        //case R.id.action_i2ptunnel_help:
-        //    Intent hi = new Intent(getActivity(), HelpActivity.class);
-        //    hi.putExtra(HelpActivity.REFERRER, "i2ptunnel");
-        //    startActivity(hi);
-        //    return true;
-        default:
-            return super.onOptionsItemSelected(item);
+            case R.id.action_start_all_tunnels:
+                msgs = mGroup.startAllControllers();
+                break;
+            case R.id.action_stop_all_tunnels:
+                msgs = mGroup.stopAllControllers();
+                break;
+            case R.id.action_restart_all_tunnels:
+                msgs = mGroup.restartAllControllers();
+                break;
+            case R.id.action_i2ptunnel_help:
+                Intent hi = new Intent(getActivity(), HelpActivity.class);
+                hi.putExtra(HelpActivity.CATEGORY, HelpActivity.CAT_I2PTUNNEL);
+                startActivity(hi);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
         }
         // TODO: Do something with the other messages
         if (msgs.size() > 0)
@@ -208,7 +232,7 @@ public class TunnelListFragment extends ListFragment implements
         if (requestCode == TUNNEL_WIZARD_REQUEST) {
             if (resultCode == Activity.RESULT_OK) {
                 Bundle tunnelData = data.getExtras().getBundle(TUNNEL_WIZARD_DATA);
-                TunnelConfig cfg = TunnelConfig.createFromWizard(getActivity(), mGroup, tunnelData);
+                TunnelConfig cfg = TunnelUtil.createConfigFromWizard(getActivity(), mGroup, tunnelData);
                 TunnelEntry tunnel = TunnelEntry.createNewTunnel(getActivity(), mGroup, cfg);
                 mAdapter.add(tunnel);
             }
@@ -252,7 +276,7 @@ public class TunnelListFragment extends ListFragment implements
     }
 
     public void onLoadFinished(Loader<List<TunnelEntry>> loader,
-            List<TunnelEntry> data) {
+                               List<TunnelEntry> data) {
         if (loader.getId() == (mClientTunnels ?
                 CLIENT_LOADER_ID : SERVER_LOADER_ID)) {
             mAdapter.setData(data);

app/src/main/java/net/i2p/android/i2ptunnel/TunnelWizardActivity.java

@@ -1,16 +1,18 @@
 package net.i2p.android.i2ptunnel;
 
-import net.i2p.android.router.R;
-import net.i2p.android.wizard.model.AbstractWizardModel;
-import net.i2p.android.wizard.ui.AbstractWizardActivity;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 
+import net.i2p.android.router.R;
+import net.i2p.android.wizard.model.AbstractWizardModel;
+import net.i2p.android.wizard.ui.AbstractWizardActivity;
+
 public class TunnelWizardActivity extends AbstractWizardActivity {
     @Override
     protected AbstractWizardModel onCreateModel() {
@@ -20,6 +22,7 @@ public class TunnelWizardActivity extends AbstractWizardActivity {
     @Override
     protected DialogFragment onGetFinishWizardDialog() {
         return new DialogFragment() {
+            @NonNull
             @Override
             public Dialog onCreateDialog(Bundle savedInstanceState) {
                 return new AlertDialog.Builder(getActivity())

app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelConfig.java

@@ -1,668 +0,0 @@
-package net.i2p.android.i2ptunnel.util;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.concurrent.ConcurrentHashMap;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-
-import net.i2p.I2PAppContext;
-import net.i2p.android.router.R;
-import net.i2p.android.wizard.model.Page;
-import net.i2p.i2ptunnel.I2PTunnelConnectClient;
-import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
-import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase;
-import net.i2p.i2ptunnel.I2PTunnelIRCClient;
-import net.i2p.i2ptunnel.TunnelControllerGroup;
-import net.i2p.util.ConcurrentHashSet;
-import net.i2p.util.PasswordManager;
-
-public class TunnelConfig {
-    protected final I2PAppContext _context;
-
-    private String _type;
-    private String _name;
-    private String _description;
-    private String _i2cpHost;
-    private String _i2cpPort;
-    private String _tunnelDepth;
-    private String _tunnelQuantity;
-    private String _tunnelVariance;
-    private String _tunnelBackupQuantity;
-    private boolean _connectDelay;
-    private String _customOptions;
-    private String _proxyList;
-    private String _port;
-    private String _reachableBy;
-    private String _targetDestination;
-    private String _targetHost;
-    private String _targetPort;
-    private String _spoofedHost;
-    private String _privKeyFile;
-    private String _profile;
-    private boolean _startOnLoad;
-    private boolean _sharedClient;
-    private final Set<String> _booleanOptions;
-    private final Map<String, String> _otherOptions;
-    private String _newProxyUser;
-    private String _newProxyPW;
-
-    static final String CLIENT_NICKNAME = "shared clients";
-
-    public static TunnelConfig createFromWizard(
-            Context ctx, TunnelControllerGroup tcg, Bundle data) {
-        // Get the Bundle keys
-        Resources res = ctx.getResources();
-
-        String kClientServer = res.getString(R.string.i2ptunnel_wizard_k_client_server);
-        String kType = res.getString(R.string.i2ptunnel_wizard_k_type);
-
-        String kName = res.getString(R.string.i2ptunnel_wizard_k_name);
-        String kDesc = res.getString(R.string.i2ptunnel_wizard_k_desc);
-        String kDest = res.getString(R.string.i2ptunnel_wizard_k_dest);
-        String kOutproxies = res.getString(R.string.i2ptunnel_wizard_k_outproxies);
-        String kTargetHost = res.getString(R.string.i2ptunnel_wizard_k_target_host);
-        String kTargetPort = res.getString(R.string.i2ptunnel_wizard_k_target_port);
-        String kReachableOn = res.getString(R.string.i2ptunnel_wizard_k_reachable_on);
-        String kBindingPort = res.getString(R.string.i2ptunnel_wizard_k_binding_port);
-        String kAutoStart = res.getString(R.string.i2ptunnel_wizard_k_auto_start);
-
-        // Create the TunnelConfig
-        TunnelConfig cfg = new TunnelConfig();
-
-        // Get/set the tunnel wizard settings
-        String clientServer = data.getBundle(kClientServer).getString(Page.SIMPLE_DATA_KEY);
-        String typeName = data.getBundle(clientServer + ":" + kType).getString(Page.SIMPLE_DATA_KEY);
-        String type = TunnelUtil.getTypeFromName(typeName, ctx);
-        cfg.setType(type);
-
-        String name = data.getBundle(kName).getString(Page.SIMPLE_DATA_KEY);
-        cfg.setName(name);
-
-        String desc = data.getBundle(kDesc).getString(Page.SIMPLE_DATA_KEY);
-        cfg.setDescription(desc);
-
-        String dest = null;
-        Bundle pageData = data.getBundle(kDest);
-        if (pageData != null) dest = pageData.getString(Page.SIMPLE_DATA_KEY);
-        cfg.setTargetDestination(dest);
-
-        String outproxies = null;
-        pageData = data.getBundle(kOutproxies);
-        if (pageData != null) outproxies = pageData.getString(Page.SIMPLE_DATA_KEY);
-        cfg.setProxyList(outproxies);
-
-        String targetHost = null;
-        pageData = data.getBundle(kTargetHost);
-        if (pageData != null) targetHost = pageData.getString(Page.SIMPLE_DATA_KEY);
-        cfg.setTargetHost(targetHost);
-
-        String targetPort = null;
-        pageData = data.getBundle(kTargetPort);
-        if (pageData != null) targetPort = pageData.getString(Page.SIMPLE_DATA_KEY);
-        cfg.setTargetPort(targetPort);
-
-        String reachableOn = null;
-        pageData = data.getBundle(kReachableOn);
-        if (pageData != null) reachableOn = pageData.getString(Page.SIMPLE_DATA_KEY);
-        cfg.setReachableBy(reachableOn);
-
-        String bindingPort = null;
-        pageData = data.getBundle(kBindingPort);
-        if (pageData != null) bindingPort = pageData.getString(Page.SIMPLE_DATA_KEY);
-        cfg.setPort(bindingPort);
-
-        boolean autoStart = data.getBundle(kAutoStart).getBoolean(Page.SIMPLE_DATA_KEY);
-        cfg.setStartOnLoad(autoStart);
-
-        // Set sensible defaults for a new tunnel
-        cfg.setTunnelDepth("3");
-        cfg.setTunnelVariance("0");
-        cfg.setTunnelQuantity("2");
-        cfg.setTunnelBackupQuantity("0");
-        cfg.setClientHost("internal");
-        cfg.setClientport("internal");
-        cfg.setCustomOptions("");
-        if (!"streamrclient".equals(type)) {
-            cfg.setProfile("bulk");
-            cfg.setReduceCount("1");
-            cfg.setReduceTime("20");
-        }
-        if (TunnelUtil.isClient(type)) { /* Client-only defaults */
-            if (!"streamrclient".equals(type)) {
-                cfg.setNewDest("0");
-                cfg.setCloseTime("30");
-            }
-            if ("httpclient".equals(type) ||
-                    "connectclient".equals(type) ||
-                    "sockstunnel".equals(type) |
-                    "socksirctunnel".equals(type)) {
-                cfg.setProxyUsername("");
-                cfg.setProxyPassword("");
-                cfg.setOutproxyUsername("");
-                cfg.setOutproxyPassword("");
-            }
-            if ("httpclient".equals(type))
-                cfg.setJumpList("http://i2host.i2p/cgi-bin/i2hostjump?\nhttp://stats.i2p/cgi-bin/jump.cgi?a=");
-        } else { /* Server-only defaults */
-            cfg.setPrivKeyFile(TunnelUtil.getPrivateKeyFile(tcg, -1));
-            cfg.setEncrypt("");
-            cfg.setEncryptKey("");
-            cfg.setAccessMode("0");
-            cfg.setAccessList("");
-            cfg.setLimitMinute("0");
-            cfg.setLimitHour("0");
-            cfg.setLimitDay("0");
-            cfg.setTotalMinute("0");
-            cfg.setTotalHour("0");
-            cfg.setTotalDay("0");
-            cfg.setMaxStreams("0");
-        }
-
-        return cfg;
-    }
-
-    public TunnelConfig() {
-        _context = I2PAppContext.getGlobalContext();
-        _booleanOptions = new ConcurrentHashSet<String>(4);
-        _otherOptions = new ConcurrentHashMap<String,String>(4);
-    }
-
-    /**
-     * What type of tunnel (httpclient, ircclient, client, or server).  This is 
-     * required when adding a new tunnel.
-     *
-     */
-    public void setType(String type) { 
-        _type = (type != null ? type.trim() : null);   
-    }
-    String getType() { return _type; }
-
-    /** Short name of the tunnel */
-    public void setName(String name) { 
-        _name = (name != null ? name.trim() : null);
-    }
-    /** one line description */
-    public void setDescription(String description) { 
-        _description = (description != null ? description.trim() : null);
-    }
-    /** I2CP host the router is on, ignored when in router context */
-    public void setClientHost(String host) {
-        _i2cpHost = (host != null ? host.trim() : null);
-    }
-    /** I2CP port the router is on, ignored when in router context */
-    public void setClientport(String port) {
-        _i2cpPort = (port != null ? port.trim() : null);
-    }
-    /** how many hops to use for inbound tunnels */
-    public void setTunnelDepth(String tunnelDepth) { 
-        _tunnelDepth = (tunnelDepth != null ? tunnelDepth.trim() : null);
-    }
-    /** how many parallel inbound tunnels to use */
-    public void setTunnelQuantity(String tunnelQuantity) { 
-        _tunnelQuantity = (tunnelQuantity != null ? tunnelQuantity.trim() : null);
-    }
-    /** how much randomisation to apply to the depth of tunnels */
-    public void setTunnelVariance(String tunnelVariance) { 
-        _tunnelVariance = (tunnelVariance != null ? tunnelVariance.trim() : null);
-    }
-    /** how many tunnels to hold in reserve to guard against failures */
-    public void setTunnelBackupQuantity(String tunnelBackupQuantity) { 
-        _tunnelBackupQuantity = (tunnelBackupQuantity != null ? tunnelBackupQuantity.trim() : null);
-    }
-    /** what I2P session overrides should be used */
-    public void setCustomOptions(String customOptions) { 
-        _customOptions = (customOptions != null ? customOptions.trim() : null);
-    }
-    /** what HTTP outproxies should be used (httpclient specific) */
-    public void setProxyList(String proxyList) { 
-        _proxyList = (proxyList != null ? proxyList.trim() : null);
-    }
-    /** what port should this client/httpclient/ircclient listen on */
-    public void setPort(String port) { 
-        _port = (port != null ? port.trim() : null);
-    }
-    /** 
-     * what interface should this client/httpclient/ircclient listen on
-     */
-    public void setReachableBy(String reachableBy) { 
-        _reachableBy = (reachableBy != null ? reachableBy.trim() : null);
-    }
-    /** What peer does this client tunnel point at */
-    public void setTargetDestination(String dest) { 
-        _targetDestination = (dest != null ? dest.trim() : null);
-    }
-    /** What host does this server tunnel point at */
-    public void setTargetHost(String host) { 
-        _targetHost = (host != null ? host.trim() : null);
-    }
-    /** What port does this server tunnel point at */
-    public void setTargetPort(String port) { 
-        _targetPort = (port != null ? port.trim() : null);
-    }
-    /** What host does this http server tunnel spoof */
-    public void setSpoofedHost(String host) { 
-        _spoofedHost = (host != null ? host.trim() : null);
-    }
-    /** What filename is this server tunnel's private keys stored in */
-    public void setPrivKeyFile(String file) { 
-        _privKeyFile = (file != null ? file.trim() : null);
-    }
-    /**
-     * If called with true, we want this tunnel to start whenever it is
-     * loaded (aka right now and whenever the router is started up)
-     */
-    public void setStartOnLoad(boolean val) {
-        _startOnLoad = val;
-    }
-    public void setShared(boolean val) {
-        _sharedClient=val;
-    }
-    public void setConnectDelay(String moo) {
-        _connectDelay = true;
-    }
-    public void setProfile(String profile) { 
-        _profile = profile; 
-    }
-
-    public void setReduce(String moo) {
-        _booleanOptions.add("i2cp.reduceOnIdle");
-    }
-    public void setClose(String moo) {
-        _booleanOptions.add("i2cp.closeOnIdle");
-    }
-    public void setEncrypt(String moo) {
-        _booleanOptions.add("i2cp.encryptLeaseSet");
-    }
-
-    /** @since 0.8.9 */
-    public void setDCC(String moo) {
-        _booleanOptions.add(I2PTunnelIRCClient.PROP_DCC);
-    }
-
-    protected static final String PROP_ENABLE_ACCESS_LIST = "i2cp.enableAccessList";
-    protected static final String PROP_ENABLE_BLACKLIST = "i2cp.enableBlackList";
-
-    public void setAccessMode(String val) {
-        if ("1".equals(val))
-            _booleanOptions.add(PROP_ENABLE_ACCESS_LIST);
-        else if ("2".equals(val))
-            _booleanOptions.add(PROP_ENABLE_BLACKLIST);
-    }
-
-    public void setDelayOpen(String moo) {
-        _booleanOptions.add("i2cp.delayOpen");
-    }
-    public void setNewDest(String val) {
-        if ("1".equals(val))
-            _booleanOptions.add("i2cp.newDestOnResume");
-        else if ("2".equals(val))
-            _booleanOptions.add("persistentClientKey");
-    }
-
-    public void setReduceTime(String val) {
-        if (val != null) {
-            try {
-                _otherOptions.put("i2cp.reduceIdleTime", "" + (Integer.parseInt(val.trim()) * 60*1000));
-            } catch (NumberFormatException nfe) {}
-        }
-    }
-    public void setReduceCount(String val) {
-        if (val != null)
-            _otherOptions.put("i2cp.reduceQuantity", val.trim());
-    }
-    public void setEncryptKey(String val) {
-        if (val != null)
-            _otherOptions.put("i2cp.leaseSetKey", val.trim());
-    }
-
-    public void setAccessList(String val) {
-        if (val != null)
-            _otherOptions.put("i2cp.accessList", val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ","));
-    }
-
-    public void setJumpList(String val) {
-        if (val != null)
-            _otherOptions.put(I2PTunnelHTTPClient.PROP_JUMP_SERVERS, val.trim().replace("\r\n", ",").replace("\n", ",").replace(" ", ","));
-    }
-
-    public void setCloseTime(String val) {
-        if (val != null) {
-            try {
-                _otherOptions.put("i2cp.closeIdleTime", "" + (Integer.parseInt(val.trim()) * 60*1000));
-            } catch (NumberFormatException nfe) {}
-        }
-    }
-
-    /** all proxy auth @since 0.8.2 */
-    public void setProxyAuth(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPClientBase.PROP_AUTH, I2PTunnelHTTPClientBase.DIGEST_AUTH);
-    }
-
-    public void setProxyUsername(String s) {
-        if (s != null)
-            _newProxyUser = s.trim();
-    }
-
-    public void setProxyPassword(String s) {
-        if (s != null)
-            _newProxyPW = s.trim();
-    }
-
-    public void setOutproxyAuth(String s) {
-        _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH, I2PTunnelHTTPClientBase.DIGEST_AUTH);
-    }
-
-    public void setOutproxyUsername(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_USER, s.trim());
-    }
-
-    public void setOutproxyPassword(String s) {
-        if (s != null)
-            _otherOptions.put(I2PTunnelHTTPClientBase.PROP_OUTPROXY_PW, s.trim());
-    }
-
-    /** all of these are @since 0.8.3 */
-    protected static final String PROP_MAX_CONNS_MIN = "i2p.streaming.maxConnsPerMinute";
-    protected static final String PROP_MAX_CONNS_HOUR = "i2p.streaming.maxConnsPerHour";
-    protected static final String PROP_MAX_CONNS_DAY = "i2p.streaming.maxConnsPerDay";
-    protected static final String PROP_MAX_TOTAL_CONNS_MIN = "i2p.streaming.maxTotalConnsPerMinute";
-    protected static final String PROP_MAX_TOTAL_CONNS_HOUR = "i2p.streaming.maxTotalConnsPerHour";
-    protected static final String PROP_MAX_TOTAL_CONNS_DAY = "i2p.streaming.maxTotalConnsPerDay";
-    protected static final String PROP_MAX_STREAMS = "i2p.streaming.maxConcurrentStreams";
-
-    public void setLimitMinute(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_CONNS_MIN, s.trim());
-    }
-
-    public void setLimitHour(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_CONNS_HOUR, s.trim());
-    }
-
-    public void setLimitDay(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_CONNS_DAY, s.trim());
-    }
-
-    public void setTotalMinute(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_TOTAL_CONNS_MIN, s.trim());
-    }
-
-    public void setTotalHour(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_TOTAL_CONNS_HOUR, s.trim());
-    }
-
-    public void setTotalDay(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_TOTAL_CONNS_DAY, s.trim());
-    }
-
-    public void setMaxStreams(String s) {
-        if (s != null)
-            _otherOptions.put(PROP_MAX_STREAMS, s.trim());
-    }
-
-    /**
-     * Based on all provided data, create a set of configuration parameters 
-     * suitable for use in a TunnelController.  This will replace (not add to)
-     * any existing parameters, so this should return a comprehensive mapping.
-     *
-     */
-    public Properties getConfig() {
-        Properties config = new Properties();
-        updateConfigGeneric(config);
-        
-        if ((TunnelUtil.isClient(_type) && !"streamrclient".equals(_type)) || "streamrserver".equals(_type)) {
-            // streamrserver uses interface
-            if (_reachableBy != null)
-                config.setProperty("interface", _reachableBy);
-            else
-                config.setProperty("interface", "");
-        } else {
-            // streamrclient uses targetHost
-            if (_targetHost != null)
-                config.setProperty("targetHost", _targetHost);
-        }
-
-        if (TunnelUtil.isClient(_type)) {
-            // generic client stuff
-            if (_port != null)
-                config.setProperty("listenPort", _port);
-            config.setProperty("sharedClient", _sharedClient + "");
-            for (String p : _booleanClientOpts)
-                config.setProperty("option." + p, "" + _booleanOptions.contains(p));
-            for (String p : _otherClientOpts)
-                if (_otherOptions.containsKey(p))
-                    config.setProperty("option." + p, _otherOptions.get(p));
-        } else {
-            // generic server stuff
-            if (_targetPort != null)
-                config.setProperty("targetPort", _targetPort);
-            for (String p : _booleanServerOpts)
-                config.setProperty("option." + p, "" + _booleanOptions.contains(p));
-            for (String p : _otherServerOpts)
-                if (_otherOptions.containsKey(p))
-                    config.setProperty("option." + p, _otherOptions.get(p));
-        }
-
-        // generic proxy stuff
-        if ("httpclient".equals(_type) || "connectclient".equals(_type) || 
-            "sockstunnel".equals(_type) ||"socksirctunnel".equals(_type)) {
-            for (String p : _booleanProxyOpts)
-                config.setProperty("option." + p, "" + _booleanOptions.contains(p));
-            if (_proxyList != null)
-                config.setProperty("proxyList", _proxyList);
-        }
-
-        // Proxy auth including migration to MD5
-        if ("httpclient".equals(_type) || "connectclient".equals(_type)) {
-            // Migrate even if auth is disabled
-            // go get the old from custom options that updateConfigGeneric() put in there
-            String puser = "option." + I2PTunnelHTTPClientBase.PROP_USER;
-            String user = config.getProperty(puser);
-            String ppw = "option." + I2PTunnelHTTPClientBase.PROP_PW;
-            String pw = config.getProperty(ppw);
-            if (user != null && pw != null && user.length() > 0 && pw.length() > 0) {
-                String pmd5 = "option." + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_PREFIX +
-                              user + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_SUFFIX;
-                if (config.getProperty(pmd5) == null) {
-                    // not in there, migrate
-                    String realm = _type.equals("httpclient") ? I2PTunnelHTTPClient.AUTH_REALM
-                                                              : I2PTunnelConnectClient.AUTH_REALM;
-                    String hex = PasswordManager.md5Hex(realm, user, pw);
-                    if (hex != null) {
-                        config.setProperty(pmd5, hex);
-                        config.remove(puser);
-                        config.remove(ppw);
-                    }
-                }
-            }
-            // New user/password
-            String auth = _otherOptions.get(I2PTunnelHTTPClientBase.PROP_AUTH);
-            if (auth != null && !auth.equals("false")) {
-                if (_newProxyUser != null && _newProxyPW != null &&
-                    _newProxyUser.length() > 0 && _newProxyPW.length() > 0) {
-                    String pmd5 = "option." + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_PREFIX +
-                                  _newProxyUser + I2PTunnelHTTPClientBase.PROP_PROXY_DIGEST_SUFFIX;
-                    String realm = _type.equals("httpclient") ? I2PTunnelHTTPClient.AUTH_REALM
-                                                              : I2PTunnelConnectClient.AUTH_REALM;
-                    String hex = PasswordManager.md5Hex(realm, _newProxyUser, _newProxyPW);
-                    if (hex != null)
-                        config.setProperty(pmd5, hex);
-                }
-            }
-        }
-
-        if ("ircclient".equals(_type) || "client".equals(_type) || "streamrclient".equals(_type)) {
-            if (_targetDestination != null)
-                config.setProperty("targetDestination", _targetDestination);
-        } else if ("httpserver".equals(_type) || "httpbidirserver".equals(_type)) {
-            if (_spoofedHost != null)
-                config.setProperty("spoofedHost", _spoofedHost);
-        }
-        if ("httpbidirserver".equals(_type)) {
-            if (_port != null)
-                config.setProperty("listenPort", _port);
-            if (_reachableBy != null)
-                config.setProperty("interface", _reachableBy);
-            else if (_targetHost != null)
-                config.setProperty("interface", _targetHost);
-            else
-                config.setProperty("interface", "");
-        }
-
-        if ("ircclient".equals(_type)) {
-            boolean dcc = _booleanOptions.contains(I2PTunnelIRCClient.PROP_DCC);
-            config.setProperty("option." + I2PTunnelIRCClient.PROP_DCC,
-                               "" + dcc);
-            // add some sane server options since they aren't in the GUI (yet)
-            if (dcc) {
-                config.setProperty("option." + PROP_MAX_CONNS_MIN, "3");
-                config.setProperty("option." + PROP_MAX_CONNS_HOUR, "10");
-                config.setProperty("option." + PROP_MAX_TOTAL_CONNS_MIN, "5");
-                config.setProperty("option." + PROP_MAX_TOTAL_CONNS_HOUR, "25");
-            }
-        }
-
-        return config;
-    }
-    
-    private static final String _noShowOpts[] = {
-        "inbound.length", "outbound.length", "inbound.lengthVariance", "outbound.lengthVariance",
-        "inbound.backupQuantity", "outbound.backupQuantity", "inbound.quantity", "outbound.quantity",
-        "inbound.nickname", "outbound.nickname", "i2p.streaming.connectDelay", "i2p.streaming.maxWindowSize",
-        I2PTunnelIRCClient.PROP_DCC
-        };
-    private static final String _booleanClientOpts[] = {
-        "i2cp.reduceOnIdle", "i2cp.closeOnIdle", "i2cp.newDestOnResume", "persistentClientKey", "i2cp.delayOpen"
-        };
-    private static final String _booleanProxyOpts[] = {
-        I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH
-        };
-    private static final String _booleanServerOpts[] = {
-        "i2cp.reduceOnIdle", "i2cp.encryptLeaseSet", PROP_ENABLE_ACCESS_LIST, PROP_ENABLE_BLACKLIST
-        };
-    private static final String _otherClientOpts[] = {
-        "i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.closeIdleTime",
-        "outproxyUsername", "outproxyPassword",
-        I2PTunnelHTTPClient.PROP_JUMP_SERVERS,
-        I2PTunnelHTTPClientBase.PROP_AUTH
-        };
-    private static final String _otherServerOpts[] = {
-        "i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.leaseSetKey", "i2cp.accessList",
-         PROP_MAX_CONNS_MIN, PROP_MAX_CONNS_HOUR, PROP_MAX_CONNS_DAY,
-         PROP_MAX_TOTAL_CONNS_MIN, PROP_MAX_TOTAL_CONNS_HOUR, PROP_MAX_TOTAL_CONNS_DAY,
-         PROP_MAX_STREAMS
-        };
-
-    /**
-     *  do NOT add these to noShoOpts, we must leave them in for HTTPClient and ConnectCLient
-     *  so they will get migrated to MD5
-     *  TODO migrate socks to MD5
-     */
-    private static final String _otherProxyOpts[] = {
-        "proxyUsername", "proxyPassword"
-        };
-
-    protected static final Set<String> _noShowSet = new HashSet<String>(64);
-    protected static final Set<String> _nonProxyNoShowSet = new HashSet<String>(4);
-    static {
-        _noShowSet.addAll(Arrays.asList(_noShowOpts));
-        _noShowSet.addAll(Arrays.asList(_booleanClientOpts));
-        _noShowSet.addAll(Arrays.asList(_booleanProxyOpts));
-        _noShowSet.addAll(Arrays.asList(_booleanServerOpts));
-        _noShowSet.addAll(Arrays.asList(_otherClientOpts));
-        _noShowSet.addAll(Arrays.asList(_otherServerOpts));
-        _nonProxyNoShowSet.addAll(Arrays.asList(_otherProxyOpts));
-    }
-
-    private void updateConfigGeneric(Properties config) {
-        config.setProperty("type", _type);
-        if (_name != null)
-            config.setProperty("name", _name);
-        if (_description != null)
-            config.setProperty("description", _description);
-        if (!_context.isRouterContext()) {
-            if (_i2cpHost != null)
-                config.setProperty("i2cpHost", _i2cpHost);
-            if ( (_i2cpPort != null) && (_i2cpPort.trim().length() > 0) ) {
-                config.setProperty("i2cpPort", _i2cpPort);
-            } else {
-                config.setProperty("i2cpPort", "7654");
-            }
-        }
-        if (_privKeyFile != null)
-            config.setProperty("privKeyFile", _privKeyFile);
-        
-        if (_customOptions != null) {
-            StringTokenizer tok = new StringTokenizer(_customOptions);
-            while (tok.hasMoreTokens()) {
-                String pair = tok.nextToken();
-                int eq = pair.indexOf('=');
-                if ( (eq <= 0) || (eq >= pair.length()) )
-                    continue;
-                String key = pair.substring(0, eq);
-                if (_noShowSet.contains(key))
-                    continue;
-                // leave in for HTTP and Connect so it can get migrated to MD5
-                // hide for SOCKS until migrated to MD5
-                if ((!"httpclient".equals(_type)) &&
-                    (! "connectclient".equals(_type)) &&
-                    _nonProxyNoShowSet.contains(key))
-                    continue;
-                String val = pair.substring(eq+1);
-                config.setProperty("option." + key, val);
-            }
-        }
-
-        config.setProperty("startOnLoad", _startOnLoad + "");
-
-        if (_tunnelQuantity != null) {
-            config.setProperty("option.inbound.quantity", _tunnelQuantity);
-            config.setProperty("option.outbound.quantity", _tunnelQuantity);
-        }
-        if (_tunnelDepth != null) {
-            config.setProperty("option.inbound.length", _tunnelDepth);
-            config.setProperty("option.outbound.length", _tunnelDepth);
-        }
-        if (_tunnelVariance != null) {
-            config.setProperty("option.inbound.lengthVariance", _tunnelVariance);
-            config.setProperty("option.outbound.lengthVariance", _tunnelVariance);
-        }
-        if (_tunnelBackupQuantity != null) {
-            config.setProperty("option.inbound.backupQuantity", _tunnelBackupQuantity);
-            config.setProperty("option.outbound.backupQuantity", _tunnelBackupQuantity);
-        }
-        if (_connectDelay)
-            config.setProperty("option.i2p.streaming.connectDelay", "1000");
-        else
-            config.setProperty("option.i2p.streaming.connectDelay", "0");
-        if (TunnelUtil.isClient(_type) && _sharedClient) {
-            config.setProperty("option.inbound.nickname", CLIENT_NICKNAME);
-            config.setProperty("option.outbound.nickname", CLIENT_NICKNAME);
-        } else if (_name != null) {
-            config.setProperty("option.inbound.nickname", _name);
-            config.setProperty("option.outbound.nickname", _name);
-        }
-        if ("interactive".equals(_profile))
-            // This was 1 which doesn't make much sense
-            // The real way to make it interactive is to make the streaming lib
-            // MessageInputStream flush faster but there's no option for that yet,
-            // Setting it to 16 instead of the default but not sure what good that is either.
-            config.setProperty("option.i2p.streaming.maxWindowSize", "16");
-        else
-            config.remove("option.i2p.streaming.maxWindowSize");
-    }
-}

app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelLogic.java

@@ -0,0 +1,101 @@
+package net.i2p.android.i2ptunnel.util;
+
+/**
+ * Generic class for handling the composition of tunnel properties.
+ * <p/>
+ * See I2PTunnel's editClient.jsp and editServer.jsp for composition logic.
+ * <p/>
+ * Some of the abstract methods have boolean parameters. These are the methods
+ * where the corresponding tunnel properties may or may not exist, depending on
+ * the value of the boolean. In all other abstract methods, all corresponding
+ * tunnel properties always exist.
+ */
+public abstract class TunnelLogic {
+    protected String mType;
+
+    public TunnelLogic(String type) {
+        mType = type;
+    }
+
+    public void runLogic() {
+        boolean isProxy = "httpclient".equals(mType) ||
+                "connectclient".equals(mType) ||
+                "sockstunnel".equals(mType) ||
+                "socksirctunnel".equals(mType);
+
+        general();
+
+        if (TunnelUtil.isClient(mType)) {
+            generalClient();
+            generalClientStreamr("streamrclient".equals(mType));
+
+            generalClientPort();
+            generalClientPortStreamr("streamrclient".equals(mType));
+
+            generalClientProxy(isProxy);
+            if (isProxy)
+                generalClientProxyHttp("httpclient".equals(mType));
+
+            generalClientStandardOrIrc("client".equals(mType) || "ircclient".equals(mType));
+            if ("ircclient".equals(mType))
+                generalClientIrc();
+        } else {
+            if ("httpserver".equals(mType) || "httpbidirserver".equals(mType))
+                generalServerHttp();
+            if ("httpbidirserver".equals(mType) || "streamrserver".equals(mType))
+                generalServerHttpBidirOrStreamr("streamrserver".equals(mType));
+
+            generalServerPort();
+            generalServerPortStreamr("streamrserver".equals(mType));
+        }
+
+        advanced();
+        advancedStreamr("streamrclient".equals(mType) || "streamrserver".equals(mType));
+        advancedServerOrStreamrClient(!TunnelUtil.isClient(mType) || "streamrclient".equals(mType));
+
+        if (!TunnelUtil.isClient(mType)) {
+            advancedServer();
+            advancedServerHttp("httpserver".equals(mType) || "httpbidirserver".equals(mType));
+        }
+
+        advancedIdle();
+        // streamr client sends pings so it will never be idle
+        advancedIdleServerOrStreamrClient(!TunnelUtil.isClient(mType) || "streamrclient".equals(mType));
+
+        if (TunnelUtil.isClient(mType)) {
+            advancedClient();
+            if ("httpclient".equals(mType))
+                advancedClientHttp();
+            if (isProxy)
+                advancedClientProxy();
+        }
+
+        advancedOther();
+    }
+
+    protected abstract void general();
+    protected abstract void generalClient();
+    protected abstract void generalClientStreamr(boolean isStreamr);
+    protected abstract void generalClientPort();
+    protected abstract void generalClientPortStreamr(boolean isStreamr);
+    protected abstract void generalClientProxy(boolean isProxy);
+    protected abstract void generalClientProxyHttp(boolean isHttp);
+    protected abstract void generalClientStandardOrIrc(boolean isStandardOrIrc);
+    protected abstract void generalClientIrc();
+    protected abstract void generalServerHttp();
+    protected abstract void generalServerHttpBidirOrStreamr(boolean isStreamr);
+    protected abstract void generalServerPort();
+    protected abstract void generalServerPortStreamr(boolean isStreamr);
+
+    protected abstract void advanced();
+    protected abstract void advancedStreamr(boolean isStreamr);
+    protected abstract void advancedServerOrStreamrClient(boolean isServerOrStreamrClient);
+    protected abstract void advancedServer();
+    protected abstract void advancedServerHttp(boolean isHttp);
+    protected abstract void advancedIdle();
+    protected abstract void advancedIdleServerOrStreamrClient(boolean isServerOrStreamrClient);
+    protected abstract void advancedClient();
+    protected abstract void advancedClientHttp();
+    protected abstract void advancedClientProxy();
+    protected abstract void advancedOther();
+}

app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelUtil.java

@@ -1,161 +1,27 @@
 package net.i2p.android.i2ptunnel.util;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
+import android.os.Bundle;
 
 import net.i2p.I2PAppContext;
 import net.i2p.android.router.R;
-import net.i2p.android.router.util.Util;
+import net.i2p.android.wizard.model.Page;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
-import net.i2p.util.FileUtil;
-import net.i2p.util.SecureFile;
+import net.i2p.i2ptunnel.ui.GeneralHelper;
+import net.i2p.i2ptunnel.ui.TunnelConfig;
 
-public abstract class TunnelUtil {
-    public static TunnelController getController(TunnelControllerGroup tcg, int tunnel) {
-        if (tunnel < 0) return null;
-        if (tcg == null) return null;
-        List<TunnelController> controllers = tcg.getControllers();
-        if (controllers.size() > tunnel)
-            return controllers.get(tunnel); 
-        else
-            return null;
+public class TunnelUtil extends GeneralHelper {
+    public static final String PREFERENCES_FILENAME_PREFIX = "tunnel.";
+
+    public TunnelUtil(I2PAppContext context, TunnelControllerGroup tcg) {
+        super(context, tcg);
     }
 
-    public static List<String> saveTunnel(Context ctx,
-            TunnelControllerGroup tcg,
-            int tunnelId,
-            Properties config) {
-        // Get current tunnel controller
-        TunnelController cur = getController(tcg, tunnelId);
-
-        if (config == null) {
-            List<String> ret = new ArrayList<String>();
-            ret.add("Invalid params");
-            return ret;
-        }
-        
-        if (cur == null) {
-            // creating new
-            cur = new TunnelController(config, "", true);
-            tcg.addController(cur);
-            if (cur.getStartOnLoad())
-                cur.startTunnelBackground();
-        } else {
-            cur.setConfig(config, "");
-        }
-        // Only modify other shared tunnels
-        // if the current tunnel is shared, and of supported type
-        if (Boolean.parseBoolean(cur.getSharedClient()) && isClient(cur.getType())) {
-            // all clients use the same I2CP session, and as such, use the same I2CP options
-            List<TunnelController> controllers = tcg.getControllers();
-
-            for (int i = 0; i < controllers.size(); i++) {
-                TunnelController c = controllers.get(i);
-
-                // Current tunnel modified by user, skip
-                if (c == cur) continue;
-
-                // Only modify this non-current tunnel
-                // if it belongs to a shared destination, and is of supported type
-                if (Boolean.parseBoolean(c.getSharedClient()) && isClient(c.getType())) {
-                    Properties cOpt = c.getConfig("");
-                    if (config.getProperty("option.inbound.quantity") != null)
-                        cOpt.setProperty("option.inbound.quantity", config.getProperty("option.inbound.quantity"));
-                    if (config.getProperty("option.outbound.quantity") != null)
-                        cOpt.setProperty("option.outbound.quantity", config.getProperty("option.outbound.quantity"));
-                    if (config.getProperty("option.inbound.length") != null)
-                        cOpt.setProperty("option.inbound.length", config.getProperty("option.inbound.length"));
-                    if (config.getProperty("option.outbound.length") != null)
-                        cOpt.setProperty("option.outbound.length", config.getProperty("option.outbound.length"));
-                    if (config.getProperty("option.inbound.lengthVariance") != null)
-                        cOpt.setProperty("option.inbound.lengthVariance", config.getProperty("option.inbound.lengthVariance"));
-                    if (config.getProperty("option.outbound.lengthVariance") != null)
-                        cOpt.setProperty("option.outbound.lengthVariance", config.getProperty("option.outbound.lengthVariance"));
-                    if (config.getProperty("option.inbound.backupQuantity") != null)
-                        cOpt.setProperty("option.inbound.backupQuantity", config.getProperty("option.inbound.backupQuantity"));
-                    if (config.getProperty("option.outbound.backupQuantity") != null)
-                        cOpt.setProperty("option.outbound.backupQuantity", config.getProperty("option.outbound.backupQuantity"));
-                    cOpt.setProperty("option.inbound.nickname", TunnelConfig.CLIENT_NICKNAME);
-                    cOpt.setProperty("option.outbound.nickname", TunnelConfig.CLIENT_NICKNAME);
-                    
-                    c.setConfig(cOpt, "");
-                }
-            }
-        }
-
-        return doSave(ctx, tcg);
-    }
-
-    /**
-     *  Stop the tunnel, delete from config,
-     *  rename the private key file if in the default directory
-     */
-    public static List<String> deleteTunnel(Context ctx, TunnelControllerGroup tcg, int tunnelId) {
-        List<String> msgs;        
-        TunnelController cur = getController(tcg, tunnelId);
-        if (cur == null) {
-            msgs = new ArrayList<String>();
-            msgs.add("Invalid tunnel number");
-            return msgs;
-        }
-        
-        msgs = tcg.removeController(cur);
-        msgs.addAll(doSave(ctx, tcg));
-
-        // Rename private key file if it was a default name in
-        // the default directory, so it doesn't get reused when a new
-        // tunnel is created.
-        // Use configured file name if available, not the one from the form.
-        String pk = cur.getPrivKeyFile();
-        //if (pk == null)
-        //    pk = _privKeyFile;
-        if (pk != null && pk.startsWith("i2ptunnel") && pk.endsWith("-privKeys.dat") &&
-            ((!isClient(cur.getType())) || cur.getPersistentClientKey())) {
-            I2PAppContext context = I2PAppContext.getGlobalContext();
-            File pkf = new File(context.getConfigDir(), pk);
-            if (pkf.exists()) {
-                String name = cur.getName();
-                if (name == null) {
-                    name = cur.getDescription();
-                    if (name == null) {
-                        name = cur.getType();
-                        if (name == null)
-                            name = Long.toString(context.clock().now());
-                    }
-                }
-                name = "i2ptunnel-deleted-" + name.replace(' ', '_') + '-' + context.clock().now() + "-privkeys.dat";
-                File backupDir = new SecureFile(context.getConfigDir(), TunnelController.KEY_BACKUP_DIR);
-                File to;
-                if (backupDir.isDirectory() || backupDir.mkdir())
-                    to = new File(backupDir, name);
-                else
-                    to = new File(context.getConfigDir(), name);
-                boolean success = FileUtil.rename(pkf, to);
-                if (success)
-                    msgs.add("Private key file " + pkf.getAbsolutePath() +
-                             " renamed to " + to.getAbsolutePath());
-            }
-        }
-        return msgs;
-    }
-
-    private static List<String> doSave(Context ctx, TunnelControllerGroup tcg) { 
-        List<String> rv = tcg.clearAllMessages();
-        try {
-            tcg.saveConfig();
-            rv.add(0, ctx.getResources().getString(R.string.i2ptunnel_msg_config_saved));
-        } catch (IOException ioe) {
-            Util.e("Failed to save config file", ioe);
-            rv.add(0, ctx.getResources().getString(R.string.i2ptunnel_msg_config_save_failed) + ": " + ioe.toString());
-        }
-        return rv;
+    public TunnelUtil(TunnelControllerGroup tcg) {
+        super(tcg);
     }
 
     /* General tunnel data for any type */
@@ -192,50 +58,725 @@ public abstract class TunnelUtil {
 
     public static String getTypeName(String type, Context context) {
         Resources res = context.getResources();
-        if ("client".equals(type))
-            return res.getString(R.string.i2ptunnel_type_client);
-        else if ("httpclient".equals(type))
-            return res.getString(R.string.i2ptunnel_type_httpclient);
-        else if ("ircclient".equals(type))
-            return res.getString(R.string.i2ptunnel_type_ircclient);
-        else if ("server".equals(type))
-            return res.getString(R.string.i2ptunnel_type_server);
-        else if ("httpserver".equals(type))
-            return res.getString(R.string.i2ptunnel_type_httpserver);
-        else if ("sockstunnel".equals(type))
-            return res.getString(R.string.i2ptunnel_type_sockstunnel);
-        else if ("socksirctunnel".equals(type))
-            return res.getString(R.string.i2ptunnel_type_socksirctunnel);
-        else if ("connectclient".equals(type))
-            return res.getString(R.string.i2ptunnel_type_connectclient);
-        else if ("ircserver".equals(type))
-            return res.getString(R.string.i2ptunnel_type_ircserver);
-        else if ("streamrclient".equals(type))
-            return res.getString(R.string.i2ptunnel_type_streamrclient);
-        else if ("streamrserver".equals(type))
-            return res.getString(R.string.i2ptunnel_type_streamrserver);
-        else if ("httpbidirserver".equals(type))
-            return res.getString(R.string.i2ptunnel_type_httpbidirserver);
-        else
-            return type;
+        switch (type) {
+            case "client":
+                return res.getString(R.string.i2ptunnel_type_client);
+            case "httpclient":
+                return res.getString(R.string.i2ptunnel_type_httpclient);
+            case "ircclient":
+                return res.getString(R.string.i2ptunnel_type_ircclient);
+            case "server":
+                return res.getString(R.string.i2ptunnel_type_server);
+            case "httpserver":
+                return res.getString(R.string.i2ptunnel_type_httpserver);
+            case "sockstunnel":
+                return res.getString(R.string.i2ptunnel_type_sockstunnel);
+            case "socksirctunnel":
+                return res.getString(R.string.i2ptunnel_type_socksirctunnel);
+            case "connectclient":
+                return res.getString(R.string.i2ptunnel_type_connectclient);
+            case "ircserver":
+                return res.getString(R.string.i2ptunnel_type_ircserver);
+            case "streamrclient":
+                return res.getString(R.string.i2ptunnel_type_streamrclient);
+            case "streamrserver":
+                return res.getString(R.string.i2ptunnel_type_streamrserver);
+            case "httpbidirserver":
+                return res.getString(R.string.i2ptunnel_type_httpbidirserver);
+            default:
+                return type;
+        }
     }
 
     public static boolean isClient(String type) {
-        return ( ("client".equals(type)) ||
-                 ("httpclient".equals(type)) ||
-                 ("sockstunnel".equals(type)) ||
-                 ("socksirctunnel".equals(type)) ||
-                 ("connectclient".equals(type)) ||
-                 ("streamrclient".equals(type)) ||
-                 ("ircclient".equals(type)));
+        return TunnelController.isClient(type);
     }
 
-    public static String getPrivateKeyFile(TunnelControllerGroup tcg, int tunnel) {
-        TunnelController tun = getController(tcg, tunnel);
-        if (tun != null && tun.getPrivKeyFile() != null)
-            return tun.getPrivKeyFile();
-        if (tunnel < 0)
-            tunnel = tcg == null ? 999 : tcg.getControllers().size();
-        return "i2ptunnel" + tunnel + "-privKeys.dat";
+    public static String getPreferencesFilename(int tunnel) {
+        return PREFERENCES_FILENAME_PREFIX + tunnel;
+    }
+
+    public static void writeTunnelToPreferences(Context ctx, TunnelControllerGroup tcg, int tunnel) {
+        new TunnelUtil(tcg).writeTunnelToPreferences(ctx, tunnel);
+    }
+    public void writeTunnelToPreferences(Context ctx, int tunnel) {
+        Resources res = ctx.getResources();
+
+        if (getController(tunnel) == null)
+            throw new IllegalArgumentException("Cannot write non-existent tunnel to Preferences");
+
+        // Get the current preferences for this tunnel
+        SharedPreferences preferences = ctx.getSharedPreferences(
+                getPreferencesFilename(tunnel), Context.MODE_PRIVATE);
+
+        // Clear all previous values
+        SharedPreferences.Editor ed = preferences.edit().clear();
+
+        // Load the tunnel config into the preferences
+        String type = getTunnelType(tunnel);
+        ed.putString(res.getString(R.string.TUNNEL_TYPE), type);
+
+        new TunnelToPreferences(ed, res, tunnel, type).runLogic();
+
+        ed.apply();
+    }
+
+    class TunnelToPreferences extends TunnelLogic {
+        SharedPreferences.Editor ed;
+        Resources res;
+        int tunnel;
+
+        public TunnelToPreferences(SharedPreferences.Editor ed, Resources res, int tunnel, String type) {
+            super(type);
+            this.ed = ed;
+            this.res = res;
+            this.tunnel = tunnel;
+        }
+
+        @Override
+        protected void general() {
+            ed.putString(res.getString(R.string.TUNNEL_NAME), getTunnelName(tunnel));
+            ed.putString(res.getString(R.string.TUNNEL_DESCRIPTION), getTunnelDescription(tunnel));
+            ed.putBoolean(res.getString(R.string.TUNNEL_START_ON_LOAD), shouldStartAutomatically(tunnel));
+            if (!isClient(mType) || getPersistentClientKey(tunnel))
+                ed.putString(res.getString(R.string.TUNNEL_PRIV_KEY_FILE), getPrivateKeyFile(tunnel));
+        }
+
+        @Override
+        protected void generalClient() {
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_PERSISTENT_KEY), getPersistentClientKey(tunnel));
+        }
+
+        @Override
+        protected void generalClientStreamr(boolean isStreamr) {
+            if (isStreamr)
+                ed.putString(res.getString(R.string.TUNNEL_TARGET_HOST), getTargetHost(tunnel));
+            else
+                ed.putBoolean(res.getString(R.string.TUNNEL_SHARED_CLIENT), isSharedClient(tunnel));
+        }
+
+        @Override
+        protected void generalClientPort() {
+            ed.putInt(res.getString(R.string.TUNNEL_LISTEN_PORT), getClientPort(tunnel));
+        }
+
+        @Override
+        protected void generalClientPortStreamr(boolean isStreamr) {
+            if (!isStreamr)
+                ed.putString(res.getString(R.string.TUNNEL_INTERFACE), getClientInterface(tunnel));
+        }
+
+        @Override
+        protected void generalClientProxy(boolean isProxy) {
+            if (isProxy)
+                ed.putString(res.getString(R.string.TUNNEL_PROXIES), getClientDestination(tunnel));
+            else
+                ed.putString(res.getString(R.string.TUNNEL_DEST), getClientDestination(tunnel));
+        }
+
+        @Override
+        protected void generalClientProxyHttp(boolean isHttp) {
+            if (isHttp)
+                ed.putString(res.getString(R.string.TUNNEL_HTTPCLIENT_SSL_OUTPROXIES), getSslProxies(tunnel));
+        }
+
+        @Override
+        protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            if (isStandardOrIrc)
+                ed.putBoolean(res.getString(R.string.TUNNEL_USE_SSL), isSSLEnabled(tunnel));
+        }
+
+        @Override
+        protected void generalClientIrc() {
+            ed.putBoolean(res.getString(R.string.TUNNEL_IRCCLIENT_ENABLE_DCC), getDCC(tunnel));
+        }
+
+        @Override
+        protected void generalServerHttp() {
+            ed.putString(res.getString(R.string.TUNNEL_SPOOFED_HOST), getSpoofedHost(tunnel));
+        }
+
+        @Override
+        protected void generalServerHttpBidirOrStreamr(boolean isStreamr) {
+            ed.putString(res.getString(R.string.TUNNEL_INTERFACE), getClientInterface(tunnel));
+            if (!isStreamr)
+                ed.putInt(res.getString(R.string.TUNNEL_LISTEN_PORT), getClientPort(tunnel));
+        }
+
+        @Override
+        protected void generalServerPort() {
+            ed.putInt(res.getString(R.string.TUNNEL_TARGET_PORT), getTargetPort(tunnel));
+        }
+
+        @Override
+        protected void generalServerPortStreamr(boolean isStreamr) {
+            if (!isStreamr) {
+                ed.putString(res.getString(R.string.TUNNEL_TARGET_HOST), getTargetHost(tunnel));
+                ed.putBoolean(res.getString(R.string.TUNNEL_USE_SSL), isSSLEnabled(tunnel));
+            }
+        }
+
+        @Override
+        protected void advanced() {
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_LENGTH),
+                    getTunnelDepth(tunnel, res.getInteger(R.integer.DEFAULT_TUNNEL_LENGTH)));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_VARIANCE),
+                    getTunnelVariance(tunnel, res.getInteger(R.integer.DEFAULT_TUNNEL_VARIANCE)));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_QUANTITY),
+                    getTunnelQuantity(tunnel, res.getInteger(R.integer.DEFAULT_TUNNEL_QUANTITY)));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_BACKUP_QUANTITY),
+                    getTunnelQuantity(tunnel, res.getInteger(R.integer.DEFAULT_TUNNEL_BACKUP_QUANTITY)));
+        }
+
+        @Override
+        protected void advancedStreamr(boolean isStreamr) {
+            if (!isStreamr)
+                ed.putString(res.getString(R.string.TUNNEL_OPT_PROFILE),
+                        isInteractive(tunnel) ? "interactive" : "bulk");
+        }
+
+        @Override
+        protected void advancedServerOrStreamrClient(boolean isServerOrStreamrClient) {
+            if (!isServerOrStreamrClient)
+                ed.putBoolean(res.getString(R.string.TUNNEL_OPT_DELAY_CONNECT),
+                        shouldDelayConnect(tunnel));
+        }
+
+        @Override
+        protected void advancedServer() {
+            //ed.putBoolean(res.getString(R.string.TUNNEL_OPT_ENCRYPT), getEncrypt(tunnel));
+            //ed.putString(res.getString(R.string.TUNNEL_OPT_ENCRYPT_KEY), getEncryptKey(tunnel));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_ACCESS_MODE), getAccessMode(tunnel));
+            ed.putString(res.getString(R.string.TUNNEL_OPT_ACCESS_LIST), getAccessList(tunnel));
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_UNIQUE_LOCAL), getUniqueLocal(tunnel));
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_MULTIHOME), getMultihome(tunnel));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_LIMIT_MINUTE), getLimitMinute(tunnel));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_LIMIT_HOUR), getLimitHour(tunnel));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_LIMIT_DAY), getLimitDay(tunnel));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_TOTAL_MINUTE), getTotalMinute(tunnel));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_TOTAL_HOUR), getTotalHour(tunnel));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_TOTAL_DAY), getTotalDay(tunnel));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_MAX_STREAMS), getMaxStreams(tunnel));
+        }
+
+        @Override
+        protected void advancedServerHttp(boolean isHttp) {
+            if (isHttp) {
+                ed.putBoolean(res.getString(R.string.TUNNEL_OPT_REJECT_INPROXY), getRejectInproxy(tunnel));
+                ed.putInt(res.getString(R.string.TUNNEL_OPT_POST_CHECK_TIME), getPostCheckTime(tunnel));
+                ed.putInt(res.getString(R.string.TUNNEL_OPT_POST_MAX), getPostMax(tunnel));
+                ed.putInt(res.getString(R.string.TUNNEL_OPT_POST_BAN_TIME), getPostBanTime(tunnel));
+                ed.putInt(res.getString(R.string.TUNNEL_OPT_POST_TOTAL_MAX), getPostTotalMax(tunnel));
+                ed.putInt(res.getString(R.string.TUNNEL_OPT_POST_TOTAL_BAN_TIME), getPostTotalBanTime(tunnel));
+            }
+        }
+
+        @Override
+        protected void advancedIdle() {
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_REDUCE_IDLE),
+                    getReduceOnIdle(tunnel, res.getBoolean(R.bool.DEFAULT_REDUCE_ON_IDLE)));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_REDUCE_QUANTITY),
+                    getReduceCount(tunnel, res.getInteger(R.integer.DEFAULT_REDUCE_COUNT)));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_REDUCE_TIME),
+                    getReduceTime(tunnel, res.getInteger(R.integer.DEFAULT_REDUCE_TIME)));
+        }
+
+        @Override
+        protected void advancedIdleServerOrStreamrClient(boolean isServerOrStreamrClient) {
+            if (!isServerOrStreamrClient)
+                ed.putBoolean(res.getString(R.string.TUNNEL_OPT_DELAY_OPEN), getDelayOpen(tunnel));
+        }
+
+        @Override
+        protected void advancedClient() {
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_CLOSE_IDLE),
+                    getCloseOnIdle(tunnel, res.getBoolean(R.bool.DEFAULT_CLOSE_ON_IDLE)));
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_CLOSE_TIME),
+                    getCloseTime(tunnel, res.getInteger(R.integer.DEFAULT_CLOSE_TIME)));
+            ed.putBoolean(res.getString(R.string.TUNNEL_OTP_NEW_KEYS), getNewDest(tunnel));
+        }
+
+        @Override
+        protected void advancedClientHttp() {
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_HTTPCLIENT_PASS_UA), getAllowUserAgent(tunnel));
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_HTTPCLIENT_PASS_REFERER), getAllowReferer(tunnel));
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_HTTPCLIENT_PASS_ACCEPT), getAllowAccept(tunnel));
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_HTTPCLIENT_ALLOW_SSL), getAllowInternalSSL(tunnel));
+            ed.putString(res.getString(R.string.TUNNEL_OPT_JUMP_LIST), getJumpList(tunnel));
+        }
+
+        @Override
+        protected void advancedClientProxy() {
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_LOCAL_AUTH), !"false".equals(getProxyAuth(tunnel)));
+            ed.putString(res.getString(R.string.TUNNEL_OPT_LOCAL_USERNAME), "");
+            ed.putString(res.getString(R.string.TUNNEL_OPT_LOCAL_PASSWORD), "");
+            ed.putBoolean(res.getString(R.string.TUNNEL_OPT_OUTPROXY_AUTH), getOutproxyAuth(tunnel));
+            ed.putString(res.getString(R.string.TUNNEL_OPT_OUTPROXY_USERNAME), getOutproxyUsername(tunnel));
+            ed.putString(res.getString(R.string.TUNNEL_OPT_OUTPROXY_PASSWORD), getOutproxyPassword(tunnel));
+        }
+
+        @Override
+        protected void advancedOther() {
+            ed.putInt(res.getString(R.string.TUNNEL_OPT_SIGTYPE), getSigType(tunnel, mType));
+            ed.putString(res.getString(R.string.TUNNEL_OPT_CUSTOM_OPTIONS), getCustomOptionsString(tunnel));
+        }
+    }
+
+    public static TunnelConfig createConfigFromPreferences(Context ctx, TunnelControllerGroup tcg, int tunnel) {
+        return new TunnelUtil(tcg).createConfigFromPreferences(ctx, tunnel);
+    }
+    public TunnelConfig createConfigFromPreferences(Context ctx, int tunnel) {
+        Resources res = ctx.getResources();
+
+        // Get the current preferences for this tunnel
+        SharedPreferences prefs = ctx.getSharedPreferences(
+                getPreferencesFilename(tunnel), Context.MODE_PRIVATE);
+
+        // Create the TunnelConfig
+        TunnelConfig cfg = new TunnelConfig();
+
+        // Update the TunnelConfig from the preferences
+        cfg.setType(prefs.getString(res.getString(R.string.TUNNEL_TYPE), null));
+        String type = cfg.getType();
+
+        new TunnelConfigFromPreferences(cfg, prefs, res, _group, tunnel, type).runLogic();
+
+        return cfg;
+    }
+
+    class TunnelConfigFromPreferences extends TunnelLogic {
+        TunnelConfig cfg;
+        SharedPreferences prefs;
+        Resources res;
+        TunnelControllerGroup tcg;
+        int tunnel;
+
+        public TunnelConfigFromPreferences(TunnelConfig cfg, SharedPreferences prefs, Resources res,
+                                           TunnelControllerGroup tcg, int tunnel, String type) {
+            super(type);
+            this.cfg = cfg;
+            this.prefs = prefs;
+            this.res = res;
+            this.tcg = tcg;
+            this.tunnel = tunnel;
+        }
+
+        @Override
+        protected void general() {
+            cfg.setName(prefs.getString(res.getString(R.string.TUNNEL_NAME), null));
+            cfg.setDescription(prefs.getString(res.getString(R.string.TUNNEL_DESCRIPTION), null));
+            cfg.setStartOnLoad(prefs.getBoolean(res.getString(R.string.TUNNEL_START_ON_LOAD),
+                    res.getBoolean(R.bool.DEFAULT_START_ON_LOAD)));
+            if (!isClient(mType) || prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_PERSISTENT_KEY),
+                    res.getBoolean(R.bool.DEFAULT_PERSISTENT_KEY)))
+                cfg.setPrivKeyFile(prefs.getString(res.getString(R.string.TUNNEL_PRIV_KEY_FILE),
+                        getPrivateKeyFile(tcg, tunnel)));
+        }
+
+        @Override
+        protected void generalClient() {
+            // See advancedClient() for persistent key handling
+        }
+
+        @Override
+        protected void generalClientStreamr(boolean isStreamr) {
+            if (isStreamr)
+                cfg.setTargetHost(prefs.getString(res.getString(R.string.TUNNEL_TARGET_HOST), null));
+            else
+                cfg.setShared(prefs.getBoolean(res.getString(R.string.TUNNEL_SHARED_CLIENT),
+                        res.getBoolean(R.bool.DEFAULT_SHARED_CLIENTS)));
+        }
+
+        @Override
+        protected void generalClientPort() {
+            cfg.setPort(prefs.getInt(res.getString(R.string.TUNNEL_LISTEN_PORT), -1));
+        }
+
+        @Override
+        protected void generalClientPortStreamr(boolean isStreamr) {
+            if (!isStreamr)
+                cfg.setReachableBy(prefs.getString(res.getString(R.string.TUNNEL_INTERFACE), "127.0.0.1"));
+        }
+
+        @Override
+        protected void generalClientProxy(boolean isProxy) {
+            if (isProxy)
+                cfg.setProxyList(prefs.getString(res.getString(R.string.TUNNEL_PROXIES), null));
+            else
+                cfg.setTargetDestination(prefs.getString(res.getString(R.string.TUNNEL_DEST), null));
+        }
+
+        @Override
+        protected void generalClientProxyHttp(boolean isHttp) {
+            if (isHttp)
+                cfg.setSslProxies(prefs.getString(res.getString(R.string.TUNNEL_HTTPCLIENT_SSL_OUTPROXIES), null));
+        }
+
+        @Override
+        protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            if (isStandardOrIrc)
+                cfg.setUseSSL(prefs.getBoolean(res.getString(R.string.TUNNEL_USE_SSL), false));
+        }
+
+        @Override
+        protected void generalClientIrc() {
+            cfg.setDCC(prefs.getBoolean(res.getString(R.string.TUNNEL_IRCCLIENT_ENABLE_DCC), false));
+        }
+
+        @Override
+        protected void generalServerHttp() {
+            cfg.setSpoofedHost(prefs.getString(res.getString(R.string.TUNNEL_SPOOFED_HOST), null));
+        }
+
+        @Override
+        protected void generalServerHttpBidirOrStreamr(boolean isStreamr) {
+            cfg.setReachableBy(prefs.getString(res.getString(R.string.TUNNEL_INTERFACE), "127.0.0.1"));
+            if (!isStreamr)
+                cfg.setPort(prefs.getInt(res.getString(R.string.TUNNEL_LISTEN_PORT), -1));
+        }
+
+        @Override
+        protected void generalServerPort() {
+            cfg.setTargetPort(prefs.getInt(res.getString(R.string.TUNNEL_TARGET_PORT), -1));
+        }
+
+        @Override
+        protected void generalServerPortStreamr(boolean isStreamr) {
+            if (!isStreamr) {
+                cfg.setTargetHost(prefs.getString(res.getString(R.string.TUNNEL_TARGET_HOST), "127.0.0.1"));
+                cfg.setUseSSL(prefs.getBoolean(res.getString(R.string.TUNNEL_USE_SSL), false));
+            }
+        }
+
+        @Override
+        protected void advanced() {
+            cfg.setTunnelDepth(prefs.getInt(res.getString(R.string.TUNNEL_OPT_LENGTH),
+                    res.getInteger(R.integer.DEFAULT_TUNNEL_LENGTH)));
+            cfg.setTunnelVariance(prefs.getInt(res.getString(R.string.TUNNEL_OPT_VARIANCE),
+                    res.getInteger(R.integer.DEFAULT_TUNNEL_VARIANCE)));
+            cfg.setTunnelQuantity(prefs.getInt(res.getString(R.string.TUNNEL_OPT_QUANTITY),
+                    res.getInteger(R.integer.DEFAULT_TUNNEL_QUANTITY)));
+            cfg.setTunnelBackupQuantity(prefs.getInt(res.getString(R.string.TUNNEL_OPT_BACKUP_QUANTITY),
+                    res.getInteger(R.integer.DEFAULT_TUNNEL_BACKUP_QUANTITY)));
+        }
+
+        @Override
+        protected void advancedStreamr(boolean isStreamr) {
+            if (!isStreamr)
+                cfg.setProfile(prefs.getString(res.getString(R.string.TUNNEL_OPT_PROFILE), "bulk"));
+        }
+
+        @Override
+        protected void advancedServerOrStreamrClient(boolean isServerOrStreamrClient) {
+            if (!isServerOrStreamrClient)
+                cfg.setConnectDelay(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_DELAY_CONNECT), false));
+        }
+
+        @Override
+        protected void advancedServer() {
+            //cfg.setEncrypt(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_ENCRYPT), false));
+            //cfg.setEncryptKey(prefs.getString(res.getString(R.string.TUNNEL_OPT_ENCRYPT_KEY), ""));
+            cfg.setAccessMode(prefs.getInt(res.getString(R.string.TUNNEL_OPT_ACCESS_MODE), 0));
+            cfg.setAccessList(prefs.getString(res.getString(R.string.TUNNEL_OPT_ACCESS_LIST), ""));
+            cfg.setUniqueLocal(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_UNIQUE_LOCAL), false));
+            cfg.setMultihome(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_MULTIHOME), false));
+            cfg.setLimitMinute(prefs.getInt(res.getString(R.string.TUNNEL_OPT_LIMIT_MINUTE), 0));
+            cfg.setLimitHour(prefs.getInt(res.getString(R.string.TUNNEL_OPT_LIMIT_HOUR), 0));
+            cfg.setLimitDay(prefs.getInt(res.getString(R.string.TUNNEL_OPT_LIMIT_DAY), 0));
+            cfg.setTotalMinute(prefs.getInt(res.getString(R.string.TUNNEL_OPT_TOTAL_MINUTE), 0));
+            cfg.setTotalHour(prefs.getInt(res.getString(R.string.TUNNEL_OPT_TOTAL_HOUR), 0));
+            cfg.setTotalDay(prefs.getInt(res.getString(R.string.TUNNEL_OPT_TOTAL_DAY), 0));
+            cfg.setMaxStreams(prefs.getInt(res.getString(R.string.TUNNEL_OPT_MAX_STREAMS), 0));
+        }
+
+        @Override
+        protected void advancedServerHttp(boolean isHttp) {
+            if (isHttp) {
+                cfg.setRejectInproxy(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_REJECT_INPROXY), false));
+                cfg.setPostCheckTime(prefs.getInt(res.getString(R.string.TUNNEL_OPT_POST_CHECK_TIME), 0));
+                cfg.setPostMax(prefs.getInt(res.getString(R.string.TUNNEL_OPT_POST_MAX), 0));
+                cfg.setPostBanTime(prefs.getInt(res.getString(R.string.TUNNEL_OPT_POST_BAN_TIME), 0));
+                cfg.setPostTotalMax(prefs.getInt(res.getString(R.string.TUNNEL_OPT_POST_TOTAL_MAX), 0));
+                cfg.setPostTotalBanTime(prefs.getInt(res.getString(R.string.TUNNEL_OPT_POST_TOTAL_BAN_TIME), 0));
+            }
+        }
+
+        @Override
+        protected void advancedIdle() {
+            cfg.setReduce(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_REDUCE_IDLE),
+                    res.getBoolean(R.bool.DEFAULT_REDUCE_ON_IDLE)));
+            cfg.setReduceCount(prefs.getInt(res.getString(R.string.TUNNEL_OPT_REDUCE_QUANTITY),
+                    res.getInteger(R.integer.DEFAULT_REDUCE_COUNT)));
+            cfg.setReduceTime(prefs.getInt(res.getString(R.string.TUNNEL_OPT_REDUCE_TIME),
+                    res.getInteger(R.integer.DEFAULT_REDUCE_TIME)));
+        }
+
+        @Override
+        protected void advancedIdleServerOrStreamrClient(boolean isServerOrStreamrClient) {
+            if (!isServerOrStreamrClient)
+                cfg.setDelayOpen(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_DELAY_OPEN),
+                        res.getBoolean(R.bool.DEFAULT_DELAY_OPEN)));
+        }
+
+        @Override
+        protected void advancedClient() {
+            cfg.setClose(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_CLOSE_IDLE),
+                    res.getBoolean(R.bool.DEFAULT_CLOSE_ON_IDLE)));
+            cfg.setCloseTime(prefs.getInt(res.getString(R.string.TUNNEL_OPT_CLOSE_TIME),
+                    res.getInteger(R.integer.DEFAULT_CLOSE_TIME)));
+            cfg.setNewDest(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_PERSISTENT_KEY),
+                    res.getBoolean(R.bool.DEFAULT_PERSISTENT_KEY)) ? 2 :
+                    prefs.getBoolean(res.getString(R.string.TUNNEL_OTP_NEW_KEYS), res.getBoolean(R.bool.DEFAULT_NEW_KEYS)) ? 1 : 0);
+        }
+
+        @Override
+        protected void advancedClientHttp() {
+            cfg.setAllowUserAgent(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_HTTPCLIENT_PASS_UA), false));
+            cfg.setAllowReferer(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_HTTPCLIENT_PASS_REFERER), false));
+            cfg.setAllowAccept(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_HTTPCLIENT_PASS_ACCEPT), false));
+            cfg.setAllowInternalSSL(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_HTTPCLIENT_ALLOW_SSL), false));
+            cfg.setJumpList(prefs.getString(res.getString(R.string.TUNNEL_OPT_JUMP_LIST),
+                    res.getString(R.string.DEFAULT_JUMP_LIST)));
+        }
+
+        @Override
+        protected void advancedClientProxy() {
+            cfg.setProxyAuth(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_LOCAL_AUTH), false) ? "digest" : "false");
+            String username = prefs.getString(res.getString(R.string.TUNNEL_OPT_LOCAL_USERNAME), "");
+            if (!username.isEmpty()) {
+                cfg.setProxyUsername(username);
+                cfg.setProxyPassword(prefs.getString(res.getString(R.string.TUNNEL_OPT_LOCAL_PASSWORD), ""));
+            }
+            cfg.setOutproxyAuth(prefs.getBoolean(res.getString(R.string.TUNNEL_OPT_OUTPROXY_AUTH), false));
+            cfg.setOutproxyUsername(prefs.getString(res.getString(R.string.TUNNEL_OPT_OUTPROXY_USERNAME), ""));
+            cfg.setOutproxyPassword(prefs.getString(res.getString(R.string.TUNNEL_OPT_OUTPROXY_PASSWORD), ""));
+        }
+
+        @Override
+        protected void advancedOther() {
+            cfg.setSigType(Integer.toString(prefs.getInt(res.getString(R.string.TUNNEL_OPT_SIGTYPE),
+                    res.getInteger(R.integer.DEFAULT_SIGTYPE))));
+            cfg.setCustomOptions(prefs.getString(res.getString(R.string.TUNNEL_OPT_CUSTOM_OPTIONS), null));
+        }
+    }
+
+    public static TunnelConfig createConfigFromWizard(
+            Context ctx, TunnelControllerGroup tcg, Bundle data) {
+        return new TunnelUtil(tcg).createConfigFromWizard(ctx, data);
+    }
+    public TunnelConfig createConfigFromWizard(Context ctx, Bundle data) {
+        // Get the Bundle keys
+        Resources res = ctx.getResources();
+
+        // Create the TunnelConfig
+        TunnelConfig cfg = new TunnelConfig();
+
+        // Update the TunnelConfig from the tunnel wizard settings
+        String kClientServer = res.getString(R.string.i2ptunnel_wizard_k_client_server);
+        String kType = res.getString(R.string.i2ptunnel_wizard_k_type);
+        String clientServer = data.getBundle(kClientServer).getString(Page.SIMPLE_DATA_KEY);
+        String typeName = data.getBundle(clientServer + ":" + kType).getString(Page.SIMPLE_DATA_KEY);
+        String type = getTypeFromName(typeName, ctx);
+        cfg.setType(type);
+
+        new TunnelConfigFromWizard(cfg, data, res, _group, type).runLogic();
+
+        return cfg;
+    }
+
+    class TunnelConfigFromWizard extends TunnelLogic {
+        TunnelConfig cfg;
+        Bundle data;
+        Resources res;
+        TunnelControllerGroup tcg;
+
+        public TunnelConfigFromWizard(TunnelConfig cfg, Bundle data, Resources res,
+                                           TunnelControllerGroup tcg, String type) {
+            super(type);
+            this.cfg = cfg;
+            this.data = data;
+            this.res = res;
+            this.tcg = tcg;
+        }
+
+        @Override
+        protected void general() {
+            cfg.setName(data.getBundle(res.getString(R.string.i2ptunnel_wizard_k_name)).getString(Page.SIMPLE_DATA_KEY));
+            cfg.setDescription(data.getBundle(res.getString(R.string.i2ptunnel_wizard_k_desc)).getString(Page.SIMPLE_DATA_KEY));
+            cfg.setStartOnLoad(data.getBundle(res.getString(R.string.i2ptunnel_wizard_k_auto_start)).getBoolean(Page.SIMPLE_DATA_KEY));
+
+            if (!isClient(mType) || res.getBoolean(R.bool.DEFAULT_PERSISTENT_KEY))
+                cfg.setPrivKeyFile(getPrivateKeyFile(tcg, -1));
+        }
+
+        @Override
+        protected void generalClient() {
+            // See advancedClient() for persistent key handling
+        }
+
+        @Override
+        protected void generalClientStreamr(boolean isStreamr) {
+            if (isStreamr)
+                cfg.setTargetHost(data.getBundle(res.getString(R.string.i2ptunnel_wizard_k_target_host)).getString(Page.SIMPLE_DATA_KEY));
+            else
+                cfg.setShared(res.getBoolean(R.bool.DEFAULT_SHARED_CLIENTS));
+
+            // Only set default tunnel parameters if this is not going to be a shared tunnel
+            if (isStreamr || res.getBoolean(R.bool.DEFAULT_SHARED_CLIENTS)) {
+                cfg.setTunnelDepth(res.getInteger(R.integer.DEFAULT_TUNNEL_LENGTH));
+                cfg.setTunnelVariance(res.getInteger(R.integer.DEFAULT_TUNNEL_VARIANCE));
+                cfg.setTunnelQuantity(res.getInteger(R.integer.DEFAULT_TUNNEL_QUANTITY));
+                cfg.setTunnelBackupQuantity(res.getInteger(R.integer.DEFAULT_TUNNEL_BACKUP_QUANTITY));
+            }
+        }
+
+        @Override
+        protected void generalClientPort() {
+            cfg.setPort(Integer.parseInt(data.getBundle(
+                    res.getString(R.string.i2ptunnel_wizard_k_binding_port)).getString(Page.SIMPLE_DATA_KEY)));
+        }
+
+        @Override
+        protected void generalClientPortStreamr(boolean isStreamr) {
+            if (!isStreamr)
+                cfg.setReachableBy(data.getBundle(res.getString(R.string.i2ptunnel_wizard_k_reachable_on)).getString(Page.SIMPLE_DATA_KEY));
+        }
+
+        @Override
+        protected void generalClientProxy(boolean isProxy) {
+            if (isProxy)
+                cfg.setProxyList(data.getBundle(res.getString(R.string.i2ptunnel_wizard_k_outproxies)).getString(Page.SIMPLE_DATA_KEY));
+            else
+                cfg.setTargetDestination(data.getBundle(res.getString(R.string.i2ptunnel_wizard_k_dest)).getString(Page.SIMPLE_DATA_KEY));
+        }
+
+        @Override
+        protected void generalClientProxyHttp(boolean isHttp) {
+            if (isHttp)
+                cfg.setSslProxies(null);
+        }
+
+        @Override
+        protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            if (isStandardOrIrc)
+                cfg.setUseSSL(false);
+        }
+
+        @Override
+        protected void generalClientIrc() {
+            cfg.setDCC(false);
+        }
+
+        @Override
+        protected void generalServerHttp() {
+            cfg.setSpoofedHost(null);
+        }
+
+        @Override
+        protected void generalServerHttpBidirOrStreamr(boolean isStreamr) {
+            cfg.setReachableBy(data.getBundle(res.getString(R.string.i2ptunnel_wizard_k_reachable_on)).getString(Page.SIMPLE_DATA_KEY));
+            if (!isStreamr)
+                cfg.setPort(Integer.parseInt(data.getBundle(
+                        res.getString(R.string.i2ptunnel_wizard_k_binding_port)).getString(Page.SIMPLE_DATA_KEY)));
+        }
+
+        @Override
+        protected void generalServerPort() {
+            cfg.setTargetPort(Integer.parseInt(data.getBundle(
+                    res.getString(R.string.i2ptunnel_wizard_k_target_port)).getString(Page.SIMPLE_DATA_KEY)));
+        }
+
+        @Override
+        protected void generalServerPortStreamr(boolean isStreamr) {
+            if (!isStreamr) {
+                cfg.setTargetHost(data.getBundle(res.getString(R.string.i2ptunnel_wizard_k_target_host)).getString(Page.SIMPLE_DATA_KEY));
+                cfg.setUseSSL(false);
+            }
+        }
+
+        @Override
+        protected void advanced() {
+            // Tunnel parameters handled in generalClientStreamr()
+        }
+
+        @Override
+        protected void advancedStreamr(boolean isStreamr) {
+            if (!isStreamr)
+                cfg.setProfile("bulk");
+        }
+
+        @Override
+        protected void advancedServerOrStreamrClient(boolean isServerOrStreamrClient) {
+            if (!isServerOrStreamrClient)
+                cfg.setConnectDelay(false);
+        }
+
+        @Override
+        protected void advancedServer() {
+            cfg.setEncrypt(false);
+            cfg.setAccessMode(0);
+            cfg.setUniqueLocal(false);
+            cfg.setMultihome(false);
+            cfg.setLimitMinute(0);
+            cfg.setLimitHour(0);
+            cfg.setLimitDay(0);
+            cfg.setTotalMinute(0);
+            cfg.setTotalHour(0);
+            cfg.setTotalDay(0);
+            cfg.setMaxStreams(0);
+        }
+
+        @Override
+        protected void advancedServerHttp(boolean isHttp) {
+            if (isHttp) {
+                cfg.setRejectInproxy(false);
+                cfg.setPostCheckTime(0);
+                cfg.setPostMax(0);
+                cfg.setPostBanTime(0);
+                cfg.setPostTotalMax(0);
+                cfg.setPostTotalBanTime(0);
+            }
+        }
+
+        @Override
+        protected void advancedIdle() {
+            cfg.setReduce(res.getBoolean(R.bool.DEFAULT_REDUCE_ON_IDLE));
+            cfg.setReduceCount(res.getInteger(R.integer.DEFAULT_REDUCE_COUNT));
+            cfg.setReduceTime(res.getInteger(R.integer.DEFAULT_REDUCE_TIME));
+        }
+
+        @Override
+        protected void advancedIdleServerOrStreamrClient(boolean isServerOrStreamrClient) {
+            if (!isServerOrStreamrClient)
+                cfg.setDelayOpen(res.getBoolean(R.bool.DEFAULT_DELAY_OPEN));
+        }
+
+        @Override
+        protected void advancedClient() {
+            cfg.setClose(res.getBoolean(R.bool.DEFAULT_CLOSE_ON_IDLE));
+            cfg.setCloseTime(res.getInteger(R.integer.DEFAULT_CLOSE_TIME));
+            cfg.setNewDest(res.getBoolean(R.bool.DEFAULT_PERSISTENT_KEY) ? 2 :
+                    res.getBoolean(R.bool.DEFAULT_NEW_KEYS) ? 1 : 0);
+        }
+
+        @Override
+        protected void advancedClientHttp() {
+            cfg.setAllowUserAgent(false);
+            cfg.setAllowReferer(false);
+            cfg.setAllowAccept(false);
+            cfg.setAllowInternalSSL(false);
+            cfg.setJumpList(res.getString(R.string.DEFAULT_JUMP_LIST));
+        }
+
+        @Override
+        protected void advancedClientProxy() {
+            cfg.setProxyAuth("false");
+            cfg.setOutproxyAuth(false);
+        }
+
+        @Override
+        protected void advancedOther() {
+            cfg.setSigType(Integer.toString(res.getInteger(R.integer.DEFAULT_SIGTYPE)));
+        }
     }
 }

app/src/main/java/net/i2p/android/router/HelpActivity.java

@@ -1,52 +0,0 @@
-package net.i2p.android.router;
-
-import net.i2p.android.router.R;
-import net.i2p.android.router.dialog.TextResourceDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.Menu;
-import android.view.MenuItem;
-
-public class HelpActivity extends I2PActivityBase {
-    public static final String REFERRER = "help_referrer";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mDrawerToggle.setDrawerIndicatorEnabled(false);
-        /*if (savedInstanceState == null) {
-            HelpFragment f = new HelpFragment();
-            f.setArguments(getIntent().getExtras());
-            getSupportFragmentManager().beginTransaction()
-                    .add(R.id.main_fragment, f).commit();
-        }*/
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.activity_help_actions, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        case R.id.menu_help_licenses:
-            Intent lic = new Intent(HelpActivity.this, LicenseActivity.class);
-            startActivity(lic);
-            return true;
-        case R.id.menu_help_release_notes:
-            TextResourceDialog dialog = new TextResourceDialog();
-            Bundle args = new Bundle();
-            args.putString(TextResourceDialog.TEXT_DIALOG_TITLE,
-                    getResources().getString(R.string.label_release_notes));
-            args.putInt(TextResourceDialog.TEXT_RESOURCE_ID, R.raw.releasenotes_txt);
-            dialog.setArguments(args);
-            dialog.show(getSupportFragmentManager(), "release_notes");
-            return true;
-        default:
-            return super.onOptionsItemSelected(item);
-        }
-    }
-}

app/src/main/java/net/i2p/android/router/I2PActivityBase.java

@@ -8,7 +8,6 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.GravityCompat;
@@ -16,6 +15,8 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBar.Tab;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -51,7 +52,6 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
     /**
      * Router variables
      */
-    protected String _myDir;
     protected boolean _isBound;
     protected boolean _triedBind;
     protected ServiceConnection _connection;
@@ -60,13 +60,16 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
 
     private static final String SHARED_PREFS = "net.i2p.android.router";
     protected static final String PREF_AUTO_START = "autoStart";
-    /** true leads to a poor install experience, very slow to paint the screen */
+    /**
+     * true leads to a poor install experience, very slow to paint the screen
+     */
     protected static final boolean DEFAULT_AUTO_START = false;
     protected static final String PREF_NAV_DRAWER_OPENED = "navDrawerOpened";
 
     /**
      * Override this in subclasses that need a ViewPager, such as a
      * category view.
+     *
      * @return whether this Activity needs a ViewPager.
      */
     protected boolean useViewPager() {
@@ -76,20 +79,21 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
     /**
      * Override this in subclasses that can use two panes, such as a
      * list/detail class.
+     *
      * @return whether this Activity can use a two-pane layout.
      */
     protected boolean canUseTwoPanes() {
         return false;
     }
 
-    /** Called when the activity is first created. */
+    /**
+     * Called when the activity is first created.
+     */
     @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
+    public void onCreate(Bundle savedInstanceState) {
         Util.d(this + " onCreate called");
         super.onCreate(savedInstanceState);
         _sharedPrefs = getSharedPreferences(SHARED_PREFS, 0);
-        _myDir = getFilesDir().getAbsolutePath();
 
         // If the Activity wants to use a ViewPager, provide it.
         // If the Activity can make use of two panes (if available),
@@ -102,6 +106,10 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
         else
             setContentView(R.layout.activity_navdrawer_onepane);
 
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+
         mTitle = mDrawerTitle = getTitle();
         String[] activityTitles = getResources().getStringArray(R.array.navdrawer_activity_titles);
         if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("i2pandroid.main.showStats", false)) {
@@ -118,17 +126,13 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
         mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
         mDrawerList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
         // Set the adapter for the list view
-        mDrawerList.setAdapter(new ArrayAdapter<String>(this,
-                android.R.layout.simple_list_item_1, activityTitles));
+        mDrawerList.setAdapter(new ArrayAdapter<>(this,
+                R.layout.listitem_navdrawer, activityTitles));
         // Set the list's click listener
         mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
 
-        // Enable ActionBar app icon to behave as action to toggle nav drawer
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeButtonEnabled(true);
-
         mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,
-                R.drawable.ic_drawer, R.string.drawer_open, R.string.drawer_close) {
+                R.string.drawer_open, R.string.drawer_close) {
             private boolean wasDragged = false;
 
             /** Called when a drawer has settled in a completely closed state. */
@@ -167,57 +171,63 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
 
     private void selectItem(int pos) {
         switch (pos) {
-        case 1:
-            Intent news = new Intent(I2PActivityBase.this, NewsActivity.class);
-            startActivity(news);
-            break;
-        case 2:
-            Intent ab = new Intent(I2PActivityBase.this, AddressbookActivity.class);
-            startActivity(ab);
-            break;
-        case 3:
-            Intent itb = new Intent(I2PActivityBase.this, TunnelListActivity.class);
-            startActivity(itb);
-            break;
-        case 4:
-            Intent log = new Intent(I2PActivityBase.this, LogActivity.class);
-            startActivity(log);
-            break;
-        case 5:
-            Intent wp = new Intent(I2PActivityBase.this, WebActivity.class);
-            wp.putExtra(WebFragment.HTML_RESOURCE_ID, R.raw.welcome_html);
-            startActivity(wp);
-            break;
-        case 6:
-            Intent active = new Intent(I2PActivityBase.this, RateGraphActivity.class);
-            startActivity(active);
-            break;
-        case 7:
-            Intent peers = new Intent(I2PActivityBase.this, PeersActivity.class);
-            startActivity(peers);
-            break;
-        case 8:
-            Intent netdb = new Intent(I2PActivityBase.this, NetDbActivity.class);
-            startActivity(netdb);
-            break;
-        default:
-            Intent main = new Intent(I2PActivityBase.this, MainActivity.class);
-            startActivity(main);
-            break;
+            case 1:
+                if (!(this instanceof NewsActivity)) {
+                    Intent news = new Intent(I2PActivityBase.this, NewsActivity.class);
+                    startActivity(news);
+                }
+                break;
+            case 2:
+                Intent ab = new Intent(I2PActivityBase.this, AddressbookActivity.class);
+                startActivity(ab);
+                break;
+            case 3:
+                Intent itb = new Intent(I2PActivityBase.this, TunnelListActivity.class);
+                startActivity(itb);
+                break;
+            case 4:
+                if (!(this instanceof LogActivity)) {
+                    Intent log = new Intent(I2PActivityBase.this, LogActivity.class);
+                    startActivity(log);
+                }
+                break;
+            case 5:
+                Intent wp = new Intent(I2PActivityBase.this, WebActivity.class);
+                wp.putExtra(WebFragment.HTML_RESOURCE_ID, R.raw.welcome_html);
+                startActivity(wp);
+                break;
+            case 6:
+                if (!(this instanceof RateGraphActivity)) {
+                    Intent active = new Intent(I2PActivityBase.this, RateGraphActivity.class);
+                    startActivity(active);
+                }
+                break;
+            case 7:
+                Intent peers = new Intent(I2PActivityBase.this, PeersActivity.class);
+                startActivity(peers);
+                break;
+            case 8:
+                if (!(this instanceof NetDbActivity)) {
+                    Intent netdb = new Intent(I2PActivityBase.this, NetDbActivity.class);
+                    startActivity(netdb);
+                }
+                break;
+            default:
+                Intent main = new Intent(I2PActivityBase.this, MainActivity.class);
+                startActivity(main);
+                break;
         }
         mDrawerLayout.closeDrawer(mDrawerList);
     }
 
     @Override
-    public void onRestart()
-    {
+    public void onRestart() {
         Util.d(this + " onRestart called");
         super.onRestart();
     }
 
     @Override
-    public void onStart()
-    {
+    public void onStart() {
         Util.d(this + " onStart called");
         super.onStart();
         if (_sharedPrefs.getBoolean(PREF_AUTO_START, DEFAULT_AUTO_START))
@@ -226,24 +236,32 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
             bindRouter(false);
     }
 
-    /** @param def default */
+    /**
+     * @param def default
+     */
     public boolean getPref(String pref, boolean def) {
         return _sharedPrefs.getBoolean(pref, def);
     }
 
-    /** @param def default */
+    /**
+     * @param def default
+     */
     public String getPref(String pref, String def) {
         return _sharedPrefs.getString(pref, def);
     }
 
-    /** @return success */
+    /**
+     * @return success
+     */
     public boolean setPref(String pref, boolean val) {
         SharedPreferences.Editor edit = _sharedPrefs.edit();
         edit.putBoolean(pref, val);
         return edit.commit();
     }
 
-    /** @return success */
+    /**
+     * @return success
+     */
     public boolean setPref(String pref, String val) {
         SharedPreferences.Editor edit = _sharedPrefs.edit();
         edit.putString(pref, val);
@@ -251,37 +269,32 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
     }
 
     @Override
-    public void onResume()
-    {
+    public void onResume() {
         Util.d(this + " onResume called");
         super.onResume();
     }
 
     @Override
-    public void onPause()
-    {
+    public void onPause() {
         Util.d(this + " onPause called");
         super.onPause();
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState)
-    {
+    public void onSaveInstanceState(Bundle outState) {
         Util.d(this + " onSaveInstanceState called");
         super.onSaveInstanceState(outState);
     }
 
     @Override
-    public void onStop()
-    {
+    public void onStop() {
         Util.d(this + " onStop called");
         unbindRouter();
         super.onStop();
     }
 
     @Override
-    public void onDestroy()
-    {
+    public void onDestroy() {
         Util.d(this + " onDestroy called");
         super.onDestroy();
     }
@@ -301,6 +314,7 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
     /**
      * Override in subclass with e.g.
      * menu.findItem(R.id.action_add_to_addressbook).setVisible(!drawerOpen);
+     *
      * @param drawerOpen true if the drawer is open
      */
     protected void onDrawerChange(boolean drawerOpen) {
@@ -310,8 +324,11 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
     public boolean onOptionsItemSelected(MenuItem item) {
         // The action bar home/up action should open or close the drawer.
         // ActionBarDrawerToggle will take care of this.
-        if(mDrawerToggle.onOptionsItemSelected(item)) {
+        if (mDrawerToggle.onOptionsItemSelected(item))
             return true;
+        else if (item.getItemId() == android.R.id.home) {
+            // This happens when mDrawerToggle.setDrawerIndicatorEnabled(false)
+            onBackPressed();
         }
 
         // Handle action buttons and overflow
@@ -361,7 +378,7 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
     ////// Service stuff
 
     /**
-     *  Start the service and bind to it
+     * Start the service and bind to it
      */
     protected boolean startRouter() {
         Intent intent = new Intent();
@@ -378,7 +395,7 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
     }
 
     /**
-     *  Bind only
+     * Bind only
      */
     protected boolean bindRouter(boolean autoCreate) {
         Intent intent = new Intent(RouterBinder.class.getName());
@@ -393,7 +410,7 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
     protected void unbindRouter() {
         Util.d(this + " unbindRouter called with _isBound:" + _isBound + " _connection:" + _connection + " _triedBind:" + _triedBind);
         if (_triedBind && _connection != null)
-                unbindService(_connection);
+            unbindService(_connection);
 
         _triedBind = false;
         _connection = null;
@@ -424,7 +441,9 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
         }
     }
 
-    /** callback from ServiceConnection, override as necessary */
+    /**
+     * callback from ServiceConnection, override as necessary
+     */
     protected void onRouterBind(RouterService svc) {
         Fragment f = getSupportFragmentManager().findFragmentById(R.id.main_fragment);
         if (f instanceof I2PFragmentBase)
@@ -441,8 +460,11 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
         }
     }
 
-    /** callback from ServiceConnection, override as necessary */
-    protected void onRouterUnbind() {}
+    /**
+     * callback from ServiceConnection, override as necessary
+     */
+    protected void onRouterUnbind() {
+    }
 
     // I2PFragmentBase.RouterContextProvider
 

app/src/main/java/net/i2p/android/router/I2PConstants.java

@@ -0,0 +1,5 @@
+package net.i2p.android.router;
+
+public interface I2PConstants {
+    public static final String ANDROID_PREF_PREFIX = "i2pandroid.";
+}

app/src/main/java/net/i2p/android/router/InitActivities.java

@@ -4,9 +4,12 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.Build;
 
+import net.i2p.android.router.util.Util;
+import net.i2p.data.DataHelper;
+import net.i2p.util.FileUtil;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,12 +18,6 @@ import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import net.i2p.android.router.R;
-import net.i2p.android.router.util.Util;
-import net.i2p.data.DataHelper;
-import net.i2p.util.FileUtil;
-import net.i2p.util.OrderedProperties;
-
 //  Wouldn't this be better as a private class in MainActivity?
 
 class InitActivities {
@@ -36,8 +33,7 @@ class InitActivities {
 
     public InitActivities(Context c) {
         ctx = c;
-        // This needs to be changed so that we can have an alternative place
-        myDir = c.getFilesDir().getAbsolutePath();
+        myDir = Util.getFileDir(c);
         _ourVersion = Util.getOurVersion(c);
     }
 
@@ -128,8 +124,7 @@ class InitActivities {
             File certificates = new File(myDir, "certificates");
             File[] allcertificates = certificates.listFiles();
             if ( allcertificates != null) {
-                for (int i = 0; i < allcertificates.length; i++) {
-                    File f = allcertificates[i];
+                for (File f : allcertificates) {
                     Util.d("Deleting old certificate file/dir " + f);
                     FileUtil.rmdir(f, false);
                 }
@@ -231,41 +226,13 @@ class InitActivities {
     /**
      *  Load defaults from resource,
      *  then add props from settings,
-     *  and write back
+     *  and write back.
      *
      *  @param f relative to base dir
      *  @param overrides local overrides or null
      */
-    public void mergeResourceToFile(int resID, String f, Properties overrides) {
-        InputStream in = null;
-        InputStream fin = null;
-
-        try {
-            in = ctx.getResources().openRawResource(resID);
-            Properties props = new OrderedProperties();
-            try {
-                fin = new FileInputStream(new File(myDir, f));
-                DataHelper.loadProps(props,  fin);
-                Util.d("Merging resource into file " + f);
-            } catch (IOException ioe) {
-                Util.d("Creating file " + f + " from resource");
-            }
-
-            // write in default settings
-            DataHelper.loadProps(props,  in);
-
-            // override with user settings
-            if (overrides != null)
-                props.putAll(overrides);
-            File path = new File(myDir, f);
-            DataHelper.storeProps(props, path);
-            Util.d("Saved " + props.size() +" properties in " + f);
-        } catch (IOException ioe) {
-        } catch (Resources.NotFoundException nfe) {
-        } finally {
-            if (in != null) try { in.close(); } catch (IOException ioe) {}
-            if (fin != null) try { fin.close(); } catch (IOException ioe) {}
-        }
+    private void mergeResourceToFile(int resID, String f, Properties overrides) {
+        Util.mergeResourceToFile(ctx, myDir, f, resID, overrides, null);
     }
 
     /**

app/src/main/java/net/i2p/android/router/LicenseActivity.java

@@ -1,6 +1,5 @@
 package net.i2p.android.router;
 
-import net.i2p.android.router.R;
 import android.os.Bundle;
 
 public class LicenseActivity extends I2PActivityBase {

app/src/main/java/net/i2p/android/router/LicenseFragment.java

@@ -5,7 +5,7 @@ import android.support.v4.app.ListFragment;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
-import net.i2p.android.router.R;
+
 import net.i2p.android.router.dialog.TextResourceDialog;
 
 public class LicenseFragment extends ListFragment {
@@ -28,7 +28,7 @@ public class LicenseFragment extends ListFragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        setListAdapter(new ArrayAdapter<String>(getActivity(), android.R.layout.simple_list_item_1, names));
+        setListAdapter(new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1, names));
     }
 
     @Override

app/src/main/java/net/i2p/android/router/MainActivity.java

@@ -1,40 +1,27 @@
 package net.i2p.android.router;
 
-import java.io.File;
-import java.util.List;
-import java.util.Properties;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.ComponentName;
-import android.content.DialogInterface;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
+import android.content.IntentFilter;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-import android.os.RemoteException;
-import android.preference.PreferenceManager;
-import android.support.v4.app.DialogFragment;
+import android.support.v4.content.LocalBroadcastManager;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import net.i2p.android.help.HelpActivity;
 import net.i2p.android.router.dialog.AboutDialog;
 import net.i2p.android.router.dialog.TextResourceDialog;
-import net.i2p.android.router.service.IRouterState;
-import net.i2p.android.router.service.IRouterStateCallback;
 import net.i2p.android.router.service.RouterService;
 import net.i2p.android.router.service.State;
+import net.i2p.android.router.util.Connectivity;
 import net.i2p.android.router.util.Util;
-import net.i2p.router.RouterContext;
-import net.i2p.util.OrderedProperties;
+
+import java.io.File;
 
 public class MainActivity extends I2PActivityBase implements
         MainFragment.RouterControlListener {
-    IRouterState mStateService = null;
     MainFragment mMainFragment = null;
     private boolean mAutoStartFromIntent = false;
 
@@ -88,7 +75,7 @@ public class MainActivity extends I2PActivityBase implements
 
     private void autoStart() {
         if (canStart()) {
-            if (Util.isConnected(this)) {
+            if (Connectivity.isConnected(this)) {
                 mAutoStartFromIntent = true;
                 onStartRouterClicked();
             } else {
@@ -101,24 +88,40 @@ public class MainActivity extends I2PActivityBase implements
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        if (mStateService != null) {
-            try {
-                if (mStateService.isStarted()) {
-                    // Update for the current state.
-                    Util.d("Fetching state.");
-                    State curState = mStateService.getState();
-                    Message msg = mHandler.obtainMessage(STATE_MSG);
-                    msg.getData().putParcelable(MSG_DATA, curState);
-                    mHandler.sendMessage(msg);
-                } else {
-                    Util.d("StateService not started yet");
-                }
-            } catch (RemoteException e) {}
-        }
+    public void onStart() {
+        super.onStart();
+
+        LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(RouterService.LOCAL_BROADCAST_STATE_NOTIFICATION);
+        filter.addAction(RouterService.LOCAL_BROADCAST_STATE_CHANGED);
+        lbm.registerReceiver(onStateChange, filter);
+
+        lbm.sendBroadcast(new Intent(RouterService.LOCAL_BROADCAST_REQUEST_STATE));
     }
 
+    private State lastRouterState = null;
+    private BroadcastReceiver onStateChange = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            State state = intent.getParcelableExtra(RouterService.LOCAL_BROADCAST_EXTRA_STATE);
+            if (lastRouterState == null || lastRouterState != state) {
+                if (mMainFragment == null)
+                    mMainFragment = (MainFragment) getSupportFragmentManager().findFragmentById(R.id.main_fragment);
+                if (mMainFragment != null) {
+                    mMainFragment.updateState(state);
+                    lastRouterState = state;
+                }
+
+                if (state == State.RUNNING && mAutoStartFromIntent) {
+                    MainActivity.this.setResult(RESULT_OK);
+                    finish();
+                }
+            }
+        }
+    };
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
@@ -140,18 +143,11 @@ public class MainActivity extends I2PActivityBase implements
             dialog.show(getSupportFragmentManager(), "about");
             return true;
 
-        // TODO: Unhide when Help page finished
-        //case R.id.menu_help:
-        //    Intent hi = new Intent(MainActivity.this, HelpActivity.class);
-        //    hi.putExtra(HelpActivity.REFERRER, "main");
-        //    startActivity(hi);
-        //    return true;
-
-        // TODO: Remove when help page finished
-        case R.id.menu_help_licenses:
-            Intent lic = new Intent(MainActivity.this, LicenseActivity.class);
-            startActivity(lic);
+        case R.id.menu_help:
+            Intent hi = new Intent(MainActivity.this, HelpActivity.class);
+            startActivity(hi);
             return true;
+
         case R.id.menu_help_release_notes:
             TextResourceDialog rDdialog = new TextResourceDialog();
             Bundle args = new Bundle();
@@ -169,113 +165,11 @@ public class MainActivity extends I2PActivityBase implements
 
     @Override
     public void onStop() {
-        if (mStateService != null) {
-            try {
-                mStateService.unregisterCallback(mStateCallback);
-            } catch (RemoteException e) {}
-        }
-        if (mTriedBindState)
-            unbindService(mStateConnection);
-        mTriedBindState = false;
         super.onStop();
+
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(onStateChange);
     }
 
-    @Override
-    protected void onRouterBind(RouterService svc) {
-        if (mStateService == null) {
-            // Try binding for state updates.
-            // Don't auto-create the RouterService.
-            Intent intent = new Intent(IRouterState.class.getName());
-            intent.setClassName(this, "net.i2p.android.router.service.RouterService");
-            mTriedBindState = bindService(intent,
-                    mStateConnection, 0);
-            Util.d("Bind to IRouterState successful: " + mTriedBindState);
-        }
-
-        super.onRouterBind(svc);
-    }
-
-    private boolean mTriedBindState;
-    private ServiceConnection mStateConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className,
-                IBinder service) {
-            mStateService = IRouterState.Stub.asInterface(service);
-            Util.d("StateService bound");
-            try {
-                if (mStateService.isStarted()) {
-                    mStateService.registerCallback(mStateCallback);
-                    // Update for the current state.
-                    Util.d("Fetching state.");
-                    State curState = mStateService.getState();
-                    Message msg = mHandler.obtainMessage(STATE_MSG);
-                    msg.getData().putParcelable(MSG_DATA, curState);
-                    mHandler.sendMessage(msg);
-                } else {
-                    // Unbind
-                    unbindService(mStateConnection);
-                    mStateService = null;
-                    mTriedBindState = false;
-                }
-            } catch (RemoteException e) {
-                // In this case the service has crashed before we could even
-                // do anything with it; we can count on soon being
-                // disconnected (and then reconnected if it can be restarted)
-                // so there is no need to do anything here.
-            }
-        }
-
-        public void onServiceDisconnected(ComponentName className) {
-            // This is called when the connection with the service has been
-            // unexpectedly disconnected -- that is, its process crashed.
-            mStateService = null;
-        }
-    };
-
-    private IRouterStateCallback mStateCallback = new IRouterStateCallback.Stub() {
-        /**
-         * This is called by the RouterService regularly to tell us about
-         * new states.  Note that IPC calls are dispatched through a thread
-         * pool running in each process, so the code executing here will
-         * NOT be running in our main thread like most other things -- so,
-         * to update the UI, we need to use a Handler to hop over there.
-         */
-        public void stateChanged(State newState) throws RemoteException {
-            Message msg = mHandler.obtainMessage(STATE_MSG);
-            msg.getData().putParcelable(MSG_DATA, newState);
-            mHandler.sendMessage(msg);
-        }
-    };
-
-    private static final int STATE_MSG = 1;
-    private static final String MSG_DATA = "state";
-
-    private Handler mHandler = new Handler() {
-        private State lastRouterState = null;
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-            case STATE_MSG:
-                State state = msg.getData().getParcelable(MSG_DATA);
-                if (lastRouterState == null || lastRouterState != state) {
-                    if (mMainFragment == null)
-                        mMainFragment = (MainFragment) getSupportFragmentManager().findFragmentById(R.id.main_fragment);
-                    if (mMainFragment != null) {
-                        mMainFragment.updateState(state);
-                        lastRouterState = state;
-                    }
-
-                    if (state == State.RUNNING && mAutoStartFromIntent) {
-                        setResult(RESULT_OK);
-                        finish();
-                    }
-                }
-                break;
-            default:
-                super.handleMessage(msg);
-            }
-        }
-    };
-
     private boolean canStart() {
         RouterService svc = _routerService;
         return (svc == null) || (!_isBound) || svc.canManualStart();
@@ -289,7 +183,7 @@ public class MainActivity extends I2PActivityBase implements
     // MainFragment.RouterControlListener
 
     public boolean shouldShowOnOff() {
-        return (canStart() && Util.isConnected(this)) || canStop();
+        return (canStart() && Connectivity.isConnected(this)) || (canStop() && !isGracefulShutdownInProgress());
     }
 
     public boolean shouldBeOn() {
@@ -304,7 +198,7 @@ public class MainActivity extends I2PActivityBase implements
             setPref(PREF_AUTO_START, true);
             svc.manualStart();
         } else {
-            (new File(_myDir, "wrapper.log")).delete();
+            (new File(Util.getFileDir(this), "wrapper.log")).delete();
             startRouter();
         }
     }
@@ -318,4 +212,32 @@ public class MainActivity extends I2PActivityBase implements
         }
         return false;
     }
+
+    /** @since 0.9.19 */
+    public boolean isGracefulShutdownInProgress() {
+        RouterService svc = _routerService;
+        return svc != null && svc.isGracefulShutdownInProgress();
+    }
+
+    /** @since 0.9.19 */
+    public boolean onGracefulShutdownClicked() {
+        RouterService svc = _routerService;
+        if(svc != null && _isBound) {
+            setPref(PREF_AUTO_START, false);
+            svc.gracefulShutdown();
+            return true;
+        }
+        return false;
+    }
+
+    /** @since 0.9.19 */
+    public boolean onCancelGracefulShutdownClicked() {
+        RouterService svc = _routerService;
+        if(svc != null && _isBound) {
+            setPref(PREF_AUTO_START, false);
+            svc.cancelGracefulShutdown();
+            return true;
+        }
+        return false;
+    }
 }

app/src/main/java/net/i2p/android/router/MainFragment.java

@@ -1,13 +1,15 @@
 package net.i2p.android.router;
 
 import android.app.Activity;
-import android.graphics.Color;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
@@ -16,9 +18,10 @@ import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
+import net.i2p.android.router.dialog.ConfigureBrowserDialog;
 import net.i2p.android.router.dialog.FirstStartDialog;
-import net.i2p.android.router.dialog.VersionDialog;
 import net.i2p.android.router.service.State;
+import net.i2p.android.router.util.Connectivity;
 import net.i2p.android.router.util.LongToggleButton;
 import net.i2p.android.router.util.Util;
 import net.i2p.data.DataHelper;
@@ -44,6 +47,7 @@ public class MainFragment extends I2PFragmentBase {
     private String _savedStatus;
     private boolean _keep = true;
     private boolean _startPressed = false;
+    private static final String PREF_CONFIGURE_BROWSER = "app.dialog.configureBrowser";
     private static final String PREF_FIRST_START = "app.router.firstStart";
     private static final String PREF_SHOW_STATS = "i2pandroid.main.showStats";
     protected static final String PROP_NEW_INSTALL = "i2p.newInstall";
@@ -56,6 +60,12 @@ public class MainFragment extends I2PFragmentBase {
         public boolean shouldBeOn();
         public void onStartRouterClicked();
         public boolean onStopRouterClicked();
+        /** @since 0.9.19 */
+        public boolean isGracefulShutdownInProgress();
+        /** @since 0.9.19 */
+        public boolean onGracefulShutdownClicked();
+        /** @since 0.9.19 */
+        public boolean onCancelGracefulShutdownClicked();
     }
 
     @Override
@@ -112,11 +122,29 @@ public class MainFragment extends I2PFragmentBase {
                     mCallback.onStartRouterClicked();
                     updateOneShot();
                     checkFirstStart();
-                } else {
-                    if(mCallback.onStopRouterClicked()) {
+                } else if(mCallback.onGracefulShutdownClicked())
+                    updateOneShot();
+                return true;
+            }
+        });
+
+        Button gb = (Button) v.findViewById(R.id.button_shutdown_now);
+        gb.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View view) {
+                if (mCallback.isGracefulShutdownInProgress())
+                    if(mCallback.onStopRouterClicked())
+                        updateOneShot();
+                return true;
+            }
+        });
+        gb = (Button) v.findViewById(R.id.button_cancel_graceful);
+        gb.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View view) {
+                if (mCallback.isGracefulShutdownInProgress())
+                    if(mCallback.onCancelGracefulShutdownClicked())
                         updateOneShot();
-                    }
-                }
                 return true;
             }
         });
@@ -188,11 +216,28 @@ public class MainFragment extends I2PFragmentBase {
     private void updateVisibility() {
         boolean showOnOff = mCallback.shouldShowOnOff();
         ToggleButton b = (ToggleButton) getActivity().findViewById(R.id.router_onoff_button);
-        b.setVisibility(showOnOff ? View.VISIBLE : View.INVISIBLE);
+        b.setVisibility(showOnOff ? View.VISIBLE : View.GONE);
 
         boolean isOn = mCallback.shouldBeOn();
         b.setChecked(isOn);
 
+        boolean isGraceful = mCallback.isGracefulShutdownInProgress();
+        LinearLayout gv = (LinearLayout) getActivity().findViewById(R.id.router_graceful_buttons);
+        gv.setVisibility(isGraceful ? View.VISIBLE : View.GONE);
+        if (isOn && isGraceful) {
+            RouterContext ctx = getRouterContext();
+            if (ctx != null) {
+                TextView tv = (TextView) gv.findViewById(R.id.router_graceful_status);
+                long ms = ctx.router().getShutdownTimeRemaining();
+                if (ms > 1000) {
+                    tv.setText(getActivity().getResources().getString(R.string.button_router_graceful,
+                            DataHelper.formatDuration(ms)));
+                } else {
+                    tv.setText("Stopping I2P");
+                }
+            }
+        }
+
         if (showOnOff && !isOn) {
             // Sometimes the final state message from the RouterService
             // is not received. Ensure that the state image is correct.
@@ -205,7 +250,7 @@ public class MainFragment extends I2PFragmentBase {
     public boolean onBackPressed() {
         RouterContext ctx = getRouterContext();
         // RouterService svc = _routerService; Which is better to use?!
-        _keep = Util.isConnected(getActivity()) && (ctx != null || _startPressed);
+        _keep = Connectivity.isConnected(getActivity()) && (ctx != null || _startPressed);
         Util.d("*********************************************************");
         Util.d("Back pressed, Keep? " + _keep);
         Util.d("*********************************************************");
@@ -244,6 +289,7 @@ public class MainFragment extends I2PFragmentBase {
                 newState == State.NETWORK_STOPPED) {
             lightImage.setImageResource(R.drawable.routerlogo_0);
         } else if (newState == State.STARTING ||
+                newState == State.GRACEFUL_SHUTDOWN ||
                 newState == State.STOPPING ||
                 newState == State.MANUAL_STOPPING ||
                 newState == State.MANUAL_QUITTING ||
@@ -264,7 +310,7 @@ public class MainFragment extends I2PFragmentBase {
         LinearLayout vStatus = (LinearLayout) getActivity().findViewById(R.id.main_status);
         TextView vStatusText = (TextView) getActivity().findViewById(R.id.main_status_text);
 
-        if(!Util.isConnected(getActivity())) {
+        if(!Connectivity.isConnected(getActivity())) {
             // Manually set state, RouterService won't be running
             updateState(State.WAITING);
             vStatusText.setText("No Internet connection is available");
@@ -397,24 +443,24 @@ public class MainFragment extends I2PFragmentBase {
                 String name = getName(ctx, client);
                 Hash h = client.calculateHash();
                 TableRow dest = new TableRow(getActivity());
-                //dest.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
+                dest.setPadding(16, 4, 0, 4);
 
                 // Client or server
-                ImageView type = new ImageView(getActivity());
-                type.setPadding(6, 6, 6, 6);
+                TextView type = new TextView(getActivity());
+                type.setTextColor(getResources().getColor(android.R.color.primary_text_light));
+                type.setTypeface(Typeface.DEFAULT_BOLD);
+                type.setGravity(Gravity.CENTER);
                 if (ctx.clientManager().shouldPublishLeaseSet(h))
-                    type.setImageDrawable(getActivity().getResources()
-                            .getDrawable(R.drawable.server));
+                    type.setText(R.string.char_server_tunnel);
                 else
-                    type.setImageDrawable(getActivity().getResources()
-                            .getDrawable(R.drawable.client));
+                    type.setText(R.string.char_client_tunnel);
                 dest.addView(type);
 
                 // Name
                 TextView destName = new TextView(getActivity());
-                destName.setPadding(6, 0, 0, 0);
+                destName.setPadding(16, 0, 0, 0);
+                destName.setGravity(Gravity.CENTER_VERTICAL);
                 destName.setText(name);
-                //destName.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT));
                 dest.addView(destName);
 
                 // Status
@@ -423,14 +469,14 @@ public class MainFragment extends I2PFragmentBase {
                     long timeToExpire = ls.getEarliestLeaseDate() - ctx.clock().now();
                     if (timeToExpire < 0) {
                         // red or yellow light
-                        type.setBackgroundColor(Color.TRANSPARENT);
+                        type.setBackgroundResource(R.drawable.tunnel_yellow);
                     } else {
                         // green light
-                        type.setBackgroundColor(Color.GREEN);
+                        type.setBackgroundResource(R.drawable.tunnel_green);
                     }
                 } else {
                     // yellow light
-                    type.setBackgroundColor(Color.TRANSPARENT);
+                    type.setBackgroundResource(R.drawable.tunnel_yellow);
                 }
 
                 dests.addView(dest);
@@ -438,7 +484,7 @@ public class MainFragment extends I2PFragmentBase {
         } else {
             TableRow empty = new TableRow(getActivity());
             TextView emptyText = new TextView(getActivity());
-            emptyText.setText("No client tunnels are running yet.");
+            emptyText.setText(R.string.no_client_tunnels_running);
             empty.addView(emptyText);
             dests.addView(empty);
         }
@@ -487,14 +533,23 @@ public class MainFragment extends I2PFragmentBase {
     }
 
     private void checkDialog() {
-        VersionDialog dialog = new VersionDialog();
+        I2PActivityBase ab = (I2PActivityBase) getActivity();
+        boolean configureBrowser = ab.getPref(PREF_CONFIGURE_BROWSER, true);
+        if (configureBrowser) {
+            ConfigureBrowserDialog dialog = new ConfigureBrowserDialog();
+            dialog.show(getActivity().getSupportFragmentManager(), "configurebrowser");
+            ab.setPref(PREF_CONFIGURE_BROWSER, false);
+        }
+        /*VersionDialog dialog = new VersionDialog();
         String oldVersion = ((I2PActivityBase) getActivity()).getPref(PREF_INSTALLED_VERSION, "??");
         if(oldVersion.equals("??")) {
+            // TODO Don't show this dialog until it is reworked
             Bundle args = new Bundle();
             args.putInt(VersionDialog.DIALOG_TYPE, VersionDialog.DIALOG_NEW_INSTALL);
             dialog.setArguments(args);
             dialog.show(getActivity().getSupportFragmentManager(), "newinstall");
         } else {
+            // TODO Don't show dialog on new version until we have something new to tell them
             String currentVersion = Util.getOurVersion(getActivity());
             if(!oldVersion.equals(currentVersion)) {
                 Bundle args = new Bundle();
@@ -502,7 +557,7 @@ public class MainFragment extends I2PFragmentBase {
                 dialog.setArguments(args);
                 dialog.show(getActivity().getSupportFragmentManager(), "newversion");
             }
-        }
+        }*/
     }
 
     private void checkFirstStart() {

app/src/main/java/net/i2p/android/router/NewsActivity.java

@@ -1,6 +1,5 @@
 package net.i2p.android.router;
 
-import net.i2p.android.router.R;
 import android.os.Bundle;
 
 public class NewsActivity extends I2PActivityBase {

app/src/main/java/net/i2p/android/router/NewsFragment.java

@@ -2,77 +2,57 @@ package net.i2p.android.router;
 
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.Html;
+import android.text.SpannableStringBuilder;
+import android.text.method.LinkMovementMethod;
+import android.text.style.URLSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.WebView;
 import android.widget.TextView;
+
+import net.i2p.android.apps.NewsFetcher;
+import net.i2p.android.router.util.Util;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import net.i2p.android.apps.NewsFetcher;
-import net.i2p.android.router.R;
-import net.i2p.android.router.web.I2PWebViewClient;
 
 public class NewsFragment extends I2PFragmentBase {
-
-    private I2PWebViewClient _wvClient;
     private long _lastChanged;
 
-    private static final String WARNING = "Warning - while the news is fetched over I2P, " +
-               "any non-I2P links visited in this window are fetched over the regular internet and are " +
-               "not anonymous.\n";
-
-
-    // TODO add some inline style
-    private static final String HEADER = "<html><head></head><body>";
-    private static final String FOOTER = "</body></html>";
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.fragment_news, container, false);
-        WebView wv = (WebView) v.findViewById(R.id.news_webview);
-        wv.getSettings().setLoadsImagesAutomatically(false);
-        // http://stackoverflow.com/questions/2369310/webview-double-tap-zoom-not-working-on-a-motorola-droid-a855
-        wv.getSettings().setUseWideViewPort(true);
-        _wvClient = new I2PWebViewClient();
-        wv.setWebViewClient(_wvClient);
-        wv.getSettings().setBuiltInZoomControls(true);
-        return v;
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_news, container, false);
     }
 
     @Override
-    public void onResume()
-    {
+    public void onResume() {
         super.onResume();
         NewsFetcher nf = NewsFetcher.getInstance();
         if (nf != null) {
-            // always update the text
+            // Always update the status
             TextView tv = (TextView) getActivity().findViewById(R.id.news_status);
-            tv.setText(WARNING + nf.status().replace("&nbsp;", " "));
+            tv.setText(nf.status().replace("&nbsp;", " "));
+            tv.setVisibility(View.VISIBLE);
         }
 
-        // only update the webview if we need to
-        // XXX Gets dir directly instead of the one stored in the Activity (for now)
-        File newsFile = new File(getActivity().getFilesDir().getAbsolutePath(), "docs/news.xml");
+        // Only update the content if we need to
+        File newsFile = new File(Util.getFileDir(getActivity()), "docs/news.xml");
         boolean newsExists = newsFile.exists();
         if (_lastChanged > 0 && ((!newsExists) || newsFile.lastModified() < _lastChanged))
             return;
         _lastChanged = System.currentTimeMillis();
 
-        WebView wv = (WebView) getActivity().findViewById(R.id.news_webview);
-
         InputStream in = null;
         ByteArrayOutputStream out = new ByteArrayOutputStream(2048);
         byte buf[] = new byte[1024];
         try {
             if (newsExists) {
-                out.write(HEADER.getBytes());
                 in = new FileInputStream(newsFile);
             } else {
                 in = getResources().openRawResource(R.raw.initialnews_html);
@@ -82,30 +62,34 @@ public class NewsFragment extends I2PFragmentBase {
             while ( (read = in.read(buf)) != -1)
                 out.write(buf, 0, read);
 
-            if (newsExists)
-                out.write(FOOTER.getBytes());
-
         } catch (IOException ioe) {
             System.err.println("news error " + ioe);
         } catch (Resources.NotFoundException nfe) {
         } finally {
             if (in != null) try { in.close(); } catch (IOException ioe) {}
         }
+
+        String news = "";
         try {
-            String news = out.toString("UTF-8");
-            wv.loadData(news, "text/html", "UTF-8");
+            news = out.toString("UTF-8");
         } catch (UnsupportedEncodingException uee) {
         }
-    }
 
-    public boolean onBackPressed() {
-        WebView wv = (WebView) getActivity().findViewById(R.id.news_webview);
-        _wvClient.cancelAll();
-        wv.stopLoading();
-        if (wv.canGoBack()) {
-            wv.goBack();
-            return true;
+        // Get SpannableStringBuilder object from HTML code
+        CharSequence sequence = Html.fromHtml(news);
+        SpannableStringBuilder strBuilder = new SpannableStringBuilder(sequence);
+
+        // Get an array of URLSpan from SpannableStringBuilder object
+        URLSpan[] urlSpans = strBuilder.getSpans(0, strBuilder.length(), URLSpan.class);
+
+        // Remove URLSpans with relative paths, which can't be clicked on
+        for (final URLSpan span : urlSpans) {
+            if (span.getURL().startsWith("/"))
+                strBuilder.removeSpan(span);
         }
-        return false;
+
+        TextView tv = (TextView) getActivity().findViewById(R.id.news_content);
+        tv.setText(strBuilder);
+        tv.setMovementMethod(LinkMovementMethod.getInstance());
     }
 }

app/src/main/java/net/i2p/android/router/SettingsActivity.java

@@ -6,24 +6,21 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
+import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
 
 import net.i2p.I2PAppContext;
-import net.i2p.android.router.R;
 import net.i2p.android.router.service.StatSummarizer;
+import net.i2p.android.router.util.PortPreference;
 import net.i2p.android.router.util.Util;
 import net.i2p.router.RouterContext;
 import net.i2p.stat.FrequencyStat;
@@ -31,7 +28,12 @@ import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
 import net.i2p.stat.StatManager;
 import net.i2p.util.LogManager;
-import net.i2p.util.OrderedProperties;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.SortedSet;
 
 public class SettingsActivity extends PreferenceActivity {
     // Actions for legacy settings
@@ -40,6 +42,8 @@ public class SettingsActivity extends PreferenceActivity {
     private static final String ACTION_PREFS_LOGGING = "net.i2p.android.router.PREFS_LOGGING";
     private static final String ACTION_PREFS_ADVANCED = "net.i2p.android.router.PREFS_ADVANCED";
 
+    private Toolbar mToolbar;
+
     @SuppressWarnings("deprecation")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,31 +51,59 @@ public class SettingsActivity extends PreferenceActivity {
 
         String action = getIntent().getAction();
         if (action != null) {
-            if (ACTION_PREFS_NET.equals(action)) {
-                addPreferencesFromResource(R.xml.settings_net);
-            } else if (ACTION_PREFS_GRAPHS.equals(action)){
-                addPreferencesFromResource(R.xml.settings_graphs);
-                setupGraphSettings(this, getPreferenceScreen(), getRouterContext());
-            } else if (ACTION_PREFS_LOGGING.equals(action)) {
-                addPreferencesFromResource(R.xml.settings_logging);
-                RouterContext ctx = getRouterContext();
-                if (ctx != null)
-                    setupLoggingSettings(this, getPreferenceScreen(), ctx);
-            } else if (ACTION_PREFS_ADVANCED.equals(action)) {
-                addPreferencesFromResource(R.xml.settings_advanced);
+            switch (action) {
+                case ACTION_PREFS_NET:
+                    addPreferencesFromResource(R.xml.settings_net);
+                    break;
+                case ACTION_PREFS_GRAPHS:
+                    addPreferencesFromResource(R.xml.settings_graphs);
+                    setupGraphSettings(this, getPreferenceScreen(), Util.getRouterContext());
+                    break;
+                case ACTION_PREFS_LOGGING:
+                    addPreferencesFromResource(R.xml.settings_logging);
+                    setupLoggingSettings(this, getPreferenceScreen(), Util.getRouterContext());
+                    break;
+                case ACTION_PREFS_ADVANCED:
+                    addPreferencesFromResource(R.xml.settings_advanced);
+                    setupAdvancedSettings(this, getPreferenceScreen());
+                    break;
+            }
+        } else {
+            // Load any properties that the router might have changed on us.
+            setupPreferences(this, Util.getRouterContext());
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+                // Load the legacy preferences headers
+                addPreferencesFromResource(R.xml.settings_headers_legacy);
             }
-        } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
-            // Load the legacy preferences headers
-            addPreferencesFromResource(R.xml.settings_headers_legacy);
         }
+
+        mToolbar.setTitle(getTitle());
     }
 
-    protected static RouterContext getRouterContext() {
-        List<RouterContext> contexts = RouterContext.listContexts();
-        if ( !((contexts == null) || (contexts.isEmpty())) ) {
-            return contexts.get(0);
+    protected static void setupPreferences(Context context, RouterContext ctx) {
+        if (ctx != null) {
+            final String udpPortKey = context.getString(R.string.PROP_UDP_INTERNAL_PORT);
+            final String ntcpPortKey = context.getString(R.string.PROP_I2NP_NTCP_PORT);
+            final String ntcpAutoPortKey = context.getString(R.string.PROP_I2NP_NTCP_AUTO_PORT);
+
+            int udpPort = ctx.getProperty(udpPortKey, -1);
+            int ntcpPort = ctx.getProperty(ntcpPortKey, -1);
+            boolean ntcpAutoPort = ctx.getBooleanPropertyDefaultTrue(ntcpAutoPortKey);
+            if (ntcpPort < 0 && ntcpAutoPort)
+                ntcpPort = udpPort;
+
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            if (prefs.getInt(udpPortKey, -1) != udpPort ||
+                    prefs.getInt(ntcpPortKey, -1) != ntcpPort) {
+                SharedPreferences.Editor editor = prefs.edit();
+                editor.putInt(udpPortKey, udpPort);
+                editor.putInt(ntcpPortKey, ntcpPort);
+                // commit() instead of apply() because this needs to happen
+                // before SettingsActivity loads its Preferences.
+                editor.commit();
+            }
         }
-        return null;
     }
 
     protected static void setupGraphSettings(Context context, PreferenceScreen ps, RouterContext ctx) {
@@ -153,13 +185,74 @@ public class SettingsActivity extends PreferenceActivity {
                 buf.append(prefix).append('=').append(level).append('\n');
             }
             */
+            /* Don't show, there are no settings that require the router
         } else {
             PreferenceCategory noRouter = new PreferenceCategory(context);
             noRouter.setTitle(R.string.router_not_running);
             ps.addPreference(noRouter);
+            */
         }
     }
 
+    protected static void setupAdvancedSettings(final Context context, PreferenceScreen ps) {
+        final String udpEnableKey = context.getString(R.string.PROP_ENABLE_UDP);
+        final String ntcpEnableKey = context.getString(R.string.PROP_ENABLE_NTCP);
+        final String udpPortKey = context.getString(R.string.PROP_UDP_INTERNAL_PORT);
+        final String ntcpPortKey = context.getString(R.string.PROP_I2NP_NTCP_PORT);
+        final String ntcpAutoPortKey = context.getString(R.string.PROP_I2NP_NTCP_AUTO_PORT);
+
+        final CheckBoxPreference udpEnable = (CheckBoxPreference) ps.findPreference(udpEnableKey);
+        final CheckBoxPreference ntcpEnable = (CheckBoxPreference) ps.findPreference(ntcpEnableKey);
+        final PortPreference udpPort = (PortPreference) ps.findPreference(udpPortKey);
+        final PortPreference ntcpPort = (PortPreference) ps.findPreference(ntcpPortKey);
+        final CheckBoxPreference ntcpAutoPort = (CheckBoxPreference) ps.findPreference(ntcpAutoPortKey);
+
+        udpEnable.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final Boolean checked = (Boolean) newValue;
+                if (checked || ntcpEnable.isChecked())
+                    return true;
+                else {
+                    Toast.makeText(context, R.string.settings_need_transport_enabled, Toast.LENGTH_LONG).show();
+                    return false;
+                }
+            }
+        });
+
+        ntcpEnable.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final Boolean checked = (Boolean) newValue;
+                if (checked || udpEnable.isChecked())
+                    return true;
+                else {
+                    Toast.makeText(context, R.string.settings_need_transport_enabled, Toast.LENGTH_LONG).show();
+                    return false;
+                }
+            }
+        });
+
+        udpPort.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (ntcpAutoPort.isChecked())
+                    ntcpPort.setText((String) newValue);
+                return true;
+            }
+        });
+
+        ntcpAutoPort.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final Boolean checked = (Boolean) newValue;
+                if (checked)
+                    ntcpPort.setText(udpPort.getText());
+                return true;
+            }
+        });
+    }
+
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @Override
     public void onBuildHeaders(List<Header> target) {
@@ -170,24 +263,48 @@ public class SettingsActivity extends PreferenceActivity {
         loadHeadersFromResource(R.xml.settings_headers, target);
     }
 
+    @Override
+    public void setContentView(int layoutResID) {
+        ViewGroup contentView = (ViewGroup) LayoutInflater.from(this).inflate(
+                R.layout.activity_settings,
+                (ViewGroup) getWindow().getDecorView().getRootView(), false);
+
+        mToolbar = (Toolbar) contentView.findViewById(R.id.main_toolbar);
+        mToolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp));
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressed();
+            }
+        });
+
+        ViewGroup contentWrapper = (ViewGroup) contentView.findViewById(R.id.content_wrapper);
+        LayoutInflater.from(this).inflate(layoutResID, contentWrapper, true);
+
+        getWindow().setContentView(contentView);
+    }
+
     @Override
     protected void onPause() {
         List<Properties> lProps = Util.getPropertiesFromPreferences(this);
         Properties props = lProps.get(0);
-        Properties logSettings = lProps.get(1);
+        Properties propsToRemove = lProps.get(1);
+        Properties logSettings = lProps.get(2);
+
+        Set toRemove = propsToRemove.keySet();
+
+        boolean restartRequired = Util.checkAndCorrectRouterConfig(this, props, toRemove);
 
         // Apply new config if we are running.
-        List<RouterContext> contexts = RouterContext.listContexts();
-        if ( !((contexts == null) || (contexts.isEmpty())) ) {
-            RouterContext _context = contexts.get(0);
-            _context.router().saveConfig(props, null);
+        RouterContext rCtx = Util.getRouterContext();
+        if (rCtx != null) {
+            rCtx.router().saveConfig(props, toRemove);
 
             // Merge in new log settings
-            saveLoggingChanges(_context, logSettings);
+            saveLoggingChanges(rCtx, logSettings);
         } else {
             // Merge in new config settings, write the file.
-            InitActivities init = new InitActivities(this);
-            init.mergeResourceToFile(R.raw.router_config, "router.config", props);
+            Util.mergeResourceToFile(this, Util.getFileDir(this), "router.config", R.raw.router_config, props, toRemove);
 
             // Merge in new log settings
             saveLoggingChanges(I2PAppContext.getGlobalContext(), logSettings);
@@ -195,6 +312,9 @@ public class SettingsActivity extends PreferenceActivity {
 
         // Store the settings in Android
         super.onPause();
+
+        if (restartRequired)
+            Toast.makeText(this, R.string.settings_router_restart_required, Toast.LENGTH_LONG).show();
     }
 
     private void saveLoggingChanges(I2PAppContext ctx, Properties logSettings) {
@@ -223,20 +343,22 @@ public class SettingsActivity extends PreferenceActivity {
             super.onCreate(savedInstanceState);
 
             String settings = getArguments().getString("settings");
-            if ("net".equals(settings)) {
-                addPreferencesFromResource(R.xml.settings_net);
-            } else if ("graphs".equals(settings)) {
-                addPreferencesFromResource(R.xml.settings_graphs);
-                RouterContext ctx = getRouterContext();
-                if (ctx != null)
-                    setupGraphSettings(getActivity(), getPreferenceScreen(), ctx);
-            } else if ("logging".equals(settings)) {
-                addPreferencesFromResource(R.xml.settings_logging);
-                RouterContext ctx = getRouterContext();
-                if (ctx != null)
-                    setupLoggingSettings(getActivity(), getPreferenceScreen(), ctx);
-            } else if ("advanced".equals(settings)) {
-                addPreferencesFromResource(R.xml.settings_advanced);
+            switch (settings) {
+                case "net":
+                    addPreferencesFromResource(R.xml.settings_net);
+                    break;
+                case "graphs":
+                    addPreferencesFromResource(R.xml.settings_graphs);
+                    setupGraphSettings(getActivity(), getPreferenceScreen(), Util.getRouterContext());
+                    break;
+                case "logging":
+                    addPreferencesFromResource(R.xml.settings_logging);
+                    setupLoggingSettings(getActivity(), getPreferenceScreen(), Util.getRouterContext());
+                    break;
+                case "advanced":
+                    addPreferencesFromResource(R.xml.settings_advanced);
+                    setupAdvancedSettings(getActivity(), getPreferenceScreen());
+                    break;
             }
         }
     }

app/src/main/java/net/i2p/android/router/addressbook/AddressEntryAdapter.java

@@ -14,7 +14,7 @@ public class AddressEntryAdapter extends ArrayAdapter<AddressEntry> {
     private final LayoutInflater mInflater;
 
     public AddressEntryAdapter(Context context) {
-        super(context, R.layout.addressbook_list_item);
+        super(context, R.layout.listitem_text);
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
 
@@ -29,7 +29,7 @@ public class AddressEntryAdapter extends ArrayAdapter<AddressEntry> {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        View v = mInflater.inflate(R.layout.addressbook_list_item, parent, false);
+        View v = mInflater.inflate(R.layout.listitem_text, parent, false);
         AddressEntry address = getItem(position);
 
         TextView text = (TextView) v.findViewById(R.id.text);

app/src/main/java/net/i2p/android/router/addressbook/AddressEntryLoader.java

@@ -1,42 +1,47 @@
 package net.i2p.android.router.addressbook;
 
+import android.content.Context;
+import android.support.v4.content.AsyncTaskLoader;
+
+import net.i2p.android.router.I2PFragmentBase;
+import net.i2p.android.router.util.NamingServiceUtil;
+import net.i2p.android.router.util.Util;
+import net.i2p.client.naming.NamingService;
+import net.i2p.data.Destination;
+import net.i2p.router.RouterContext;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
 
-import net.i2p.android.router.util.NamingServiceUtil;
-import net.i2p.android.router.util.Util;
-import net.i2p.client.naming.NamingService;
-import net.i2p.data.Destination;
-import net.i2p.router.RouterContext;
-
-import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
-
 public class AddressEntryLoader extends AsyncTaskLoader<List<AddressEntry>> {
-    private RouterContext mRContext;
+    private I2PFragmentBase.RouterContextProvider mRContextProvider;
     private String mBook;
     private String mFilter;
     private List<AddressEntry> mData;
 
-    public AddressEntryLoader(Context context, RouterContext rContext,
+    public AddressEntryLoader(Context context, I2PFragmentBase.RouterContextProvider rContextProvider,
             String book, String filter) {
         super(context);
-        mRContext = rContext;
+        mRContextProvider = rContextProvider;
         mBook = book;
         mFilter = filter;
     }
 
     @Override
     public List<AddressEntry> loadInBackground() {
+        RouterContext routerContext = mRContextProvider.getRouterContext();
+        if (routerContext == null)
+            return null;
+
         // get the names
-        NamingService ns = NamingServiceUtil.getNamingService(mRContext, mBook);
+        NamingService ns = NamingServiceUtil.getNamingService(routerContext, mBook);
         Util.d("NamingService: " + ns.getName());
         // After router shutdown we get nothing... why?
-        List<AddressEntry> ret = new ArrayList<AddressEntry>();
-        Map<String, Destination> names = new TreeMap<String, Destination>();
+        List<AddressEntry> ret = new ArrayList<>();
+        Map<String, Destination> names = new TreeMap<>();
 
         Properties searchProps = new Properties();
         // Needed for HostsTxtNamingService

app/src/main/java/net/i2p/android/router/addressbook/AddressbookActivity.java

@@ -1,9 +1,5 @@
 package net.i2p.android.router.addressbook;
 
-import net.i2p.android.router.I2PActivityBase;
-import net.i2p.android.router.R;
-import net.i2p.android.router.web.WebActivity;
-import net.i2p.android.router.web.WebFragment;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Context;
@@ -12,11 +8,16 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBar.Tab;
 import android.support.v7.widget.SearchView;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+
+import net.i2p.android.router.I2PActivityBase;
+import net.i2p.android.router.R;
 
 public class AddressbookActivity extends I2PActivityBase
         implements AddressbookFragment.OnAddressSelectedListener,
@@ -27,47 +28,36 @@ public class AddressbookActivity extends I2PActivityBase
      */
     private boolean mTwoPane;
 
-    private static final String SELECTED_TAB = "selected_tab";
+    private static final String SELECTED_PAGE = "selected_page";
+    private static final int PAGE_ROUTER = 0;
+
+    private Spinner mSpinner;
 
     @Override
     protected boolean canUseTwoPanes() {
-        return true;
+        return false;
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // Set up action bar for tabs
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        mSpinner = (Spinner) findViewById(R.id.main_spinner);
+        mSpinner.setVisibility(View.VISIBLE);
 
-        // Router book tab
-        AddressbookFragment rf = new AddressbookFragment();
-        Bundle args = new Bundle();
-        args.putString(AddressbookFragment.BOOK_NAME,
-                AddressbookFragment.ROUTER_BOOK);
-        rf.setArguments(args);
-        Tab tab = actionBar.newTab()
-                .setText("Router")
-                .setTabListener(new TabListener(rf));
-        actionBar.addTab(tab);
+        mSpinner.setAdapter(ArrayAdapter.createFromResource(this,
+                R.array.addressbook_pages, android.R.layout.simple_spinner_dropdown_item));
 
-        // Private book tab
-        AddressbookFragment pf = new AddressbookFragment();
-        args = new Bundle();
-        args.putString(AddressbookFragment.BOOK_NAME,
-                AddressbookFragment.PRIVATE_BOOK);
-        pf.setArguments(args);
-        tab = actionBar.newTab()
-                .setText("Private")
-                .setTabListener(new TabListener(pf));
-        actionBar.addTab(tab);
+        mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                selectPage(i);
+            }
 
-        if (savedInstanceState != null) {
-            int selected = savedInstanceState.getInt(SELECTED_TAB);
-            actionBar.setSelectedNavigationItem(selected);
-        }
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+            }
+        });
 
         if (findViewById(R.id.detail_fragment) != null) {
             // The detail container view will be present only in the
@@ -76,13 +66,30 @@ public class AddressbookActivity extends I2PActivityBase
             // activity should be in two-pane mode.
             mTwoPane = true;
         }
+
+        if (savedInstanceState != null) {
+            int selected = savedInstanceState.getInt(SELECTED_PAGE);
+            mSpinner.setSelection(selected);
+        } else
+            selectPage(PAGE_ROUTER);
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt(SELECTED_TAB,
-                getSupportActionBar().getSelectedNavigationIndex());
+        outState.putInt(SELECTED_PAGE, mSpinner.getSelectedItemPosition());
+    }
+
+    private void selectPage(int page) {
+        AddressbookFragment f = new AddressbookFragment();
+        Bundle args = new Bundle();
+        args.putString(AddressbookFragment.BOOK_NAME,
+                page == PAGE_ROUTER ?
+                        AddressbookFragment.ROUTER_BOOK :
+                        AddressbookFragment.PRIVATE_BOOK);
+        f.setArguments(args);
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.main_fragment, f).commit();
     }
 
     @Override
@@ -105,12 +112,8 @@ public class AddressbookActivity extends I2PActivityBase
             setResult(Activity.RESULT_OK, result);
             finish();
         } else {
-            //Intent i = new Intent(Intent.ACTION_VIEW);
-            //i.setData(Uri.parse("http://" + host));
-            // XXX: Temporarily reverting to inbuilt browser
-            // until an alternative browser is ready.
-            Intent i = new Intent(this, WebActivity.class);
-            i.putExtra(WebFragment.HTML_URI, "http://" + host + '/');
+            Intent i = new Intent(Intent.ACTION_VIEW);
+            i.setData(Uri.parse("http://" + host));
             startActivity(i);
         }
     }

app/src/main/java/net/i2p/android/router/addressbook/AddressbookAddWizardActivity.java

@@ -6,6 +6,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import net.i2p.android.wizard.model.AbstractWizardModel;
 import net.i2p.android.wizard.ui.AbstractWizardActivity;
@@ -19,6 +20,7 @@ public class AddressbookAddWizardActivity extends AbstractWizardActivity {
     @Override
     protected DialogFragment onGetFinishWizardDialog() {
         return new DialogFragment() {
+            @NonNull
             @Override
             public Dialog onCreateDialog(Bundle savedInstanceState) {
                 return new AlertDialog.Builder(getActivity())

app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java

@@ -7,25 +7,29 @@ import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.text.TextUtils;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.util.List;
-
 import net.i2p.addressbook.Daemon;
-import net.i2p.android.router.HelpActivity;
+import net.i2p.android.help.HelpActivity;
 import net.i2p.android.router.I2PFragmentBase;
-import net.i2p.android.router.R;
 import net.i2p.android.router.I2PFragmentBase.RouterContextProvider;
+import net.i2p.android.router.R;
 import net.i2p.android.router.util.NamingServiceUtil;
 import net.i2p.client.naming.NamingService;
 import net.i2p.router.RouterContext;
 
+import java.util.List;
+
 public class AddressbookFragment extends ListFragment implements
         I2PFragmentBase.RouterContextUser,
         LoaderManager.LoaderCallbacks<List<AddressEntry>> {
@@ -46,6 +50,8 @@ public class AddressbookFragment extends ListFragment implements
     private String mBook;
     private String mCurFilter;
 
+    private ImageButton mAddToAddressbook;
+
     // Set in onActivityResult()
     private Intent mAddWizardData;
 
@@ -84,6 +90,27 @@ public class AddressbookFragment extends ListFragment implements
         setHasOptionsMenu(true);
     }
 
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // Create the list fragment's content view by calling the super method
+        final View listFragmentView = super.onCreateView(inflater, container, savedInstanceState);
+
+        View v = inflater.inflate(R.layout.fragment_list_with_add, container, false);
+        FrameLayout listContainer = (FrameLayout) v.findViewById(R.id.list_container);
+        listContainer.addView(listFragmentView);
+
+        mAddToAddressbook = (ImageButton) v.findViewById(R.id.promoted_action);
+        mAddToAddressbook.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent wi = new Intent(getActivity(), AddressbookAddWizardActivity.class);
+                startActivityForResult(wi, ADD_WIZARD_REQUEST);
+            }
+        });
+
+        return v;
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -111,8 +138,8 @@ public class AddressbookFragment extends ListFragment implements
         // Show actions
         if (mSearchAddressbook != null)
             mSearchAddressbook.setVisible(true);
-        if (mAddToAddressbook != null)
-            mAddToAddressbook.setVisible(false);
+        if (mAddToAddressbook != null && mAddToAddressbook.getVisibility() != View.VISIBLE)
+            mAddToAddressbook.setVisibility(View.VISIBLE);
 
         if (mAddWizardData != null) {
             // Save the new entry
@@ -140,24 +167,26 @@ public class AddressbookFragment extends ListFragment implements
     }
 
     private MenuItem mSearchAddressbook;
-    private MenuItem mAddToAddressbook;
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.fragment_addressbook_actions, menu);
 
         mSearchAddressbook = menu.findItem(R.id.action_search_addressbook);
-        mAddToAddressbook = menu.findItem(R.id.action_add_to_addressbook);
+    }
 
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
         // Hide until needed
         if (getRouterContext() == null) {
             mSearchAddressbook.setVisible(false);
-            mAddToAddressbook.setVisible(false);
+            if (mAddToAddressbook != null)
+                mAddToAddressbook.setVisibility(View.GONE);
         }
 
         // Only allow adding to private book 
-        if (!PRIVATE_BOOK.equals(mBook)) {
-            mAddToAddressbook.setVisible(false);
+        if (!PRIVATE_BOOK.equals(mBook) && mAddToAddressbook != null) {
+            mAddToAddressbook.setVisibility(View.GONE);
             mAddToAddressbook = null;
         }
     }
@@ -167,27 +196,22 @@ public class AddressbookFragment extends ListFragment implements
         // Handle presses on the action bar items
 
         switch (item.getItemId()) {
-        case R.id.action_add_to_addressbook:
-            Intent wi = new Intent(getActivity(), AddressbookAddWizardActivity.class);
-            startActivityForResult(wi, ADD_WIZARD_REQUEST);
-            return true;
-        case R.id.action_reload_subscriptions:
-            Daemon.wakeup();
-            Toast.makeText(getActivity(), "Reloading subscriptions...",
-                    Toast.LENGTH_SHORT).show();
-            return true;
-        case R.id.action_addressbook_settings:
-            Intent si = new Intent(getActivity(), AddressbookSettingsActivity.class);
-            startActivity(si);
-            return true;
-        // TODO: Enable when Help page finished
-        //case R.id.action_addressbook_help:
-        //    Intent hi = new Intent(getActivity(), HelpActivity.class);
-        //    hi.putExtra(HelpActivity.REFERRER, "addressbook");
-        //    startActivity(hi);
-        //    return true;
-        default:
-            return super.onOptionsItemSelected(item);
+            case R.id.action_reload_subscriptions:
+                Daemon.wakeup();
+                Toast.makeText(getActivity(), "Reloading subscriptions...",
+                        Toast.LENGTH_SHORT).show();
+                return true;
+            case R.id.action_addressbook_settings:
+                Intent si = new Intent(getActivity(), AddressbookSettingsActivity.class);
+                startActivity(si);
+                return true;
+            case R.id.action_addressbook_help:
+                Intent hi = new Intent(getActivity(), HelpActivity.class);
+                hi.putExtra(HelpActivity.CATEGORY, HelpActivity.CAT_ADDRESSBOOK);
+                startActivity(hi);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
         }
     }
 
@@ -225,27 +249,32 @@ public class AddressbookFragment extends ListFragment implements
 
     public Loader<List<AddressEntry>> onCreateLoader(int id, Bundle args) {
         return new AddressEntryLoader(getActivity(),
-                getRouterContext(), mBook, mCurFilter);
+                mRouterContextProvider, mBook, mCurFilter);
     }
 
     public void onLoadFinished(Loader<List<AddressEntry>> loader,
-            List<AddressEntry> data) {
+                               List<AddressEntry> data) {
         if (loader.getId() == (PRIVATE_BOOK.equals(mBook) ?
                 PRIVATE_LOADER_ID : ROUTER_LOADER_ID)) {
-            mAdapter.setData(data);
+            if (data == null)
+                setEmptyText(getResources().getString(
+                        R.string.router_not_running));
+            else {
+                mAdapter.setData(data);
 
-            TextView v = (TextView) getListView().findViewWithTag("addressbook_header");
-            if (mCurFilter != null)
-                v.setText(getActivity().getResources().getString(
-                        R.string.addressbook_search_header,
-                        data.size()));
-            else
-                v.setText("");
+                TextView v = (TextView) getListView().findViewWithTag("addressbook_header");
+                if (mCurFilter != null)
+                    v.setText(getActivity().getResources().getString(
+                            R.string.addressbook_search_header,
+                            data.size()));
+                else
+                    v.setText("");
 
-            if (isResumed()) {
-                setListShown(true);
-            } else {
-                setListShownNoAnimation(true);
+                if (isResumed()) {
+                    setListShown(true);
+                } else {
+                    setListShownNoAnimation(true);
+                }
             }
         }
     }

app/src/main/java/net/i2p/android/router/addressbook/AddressbookSettingsActivity.java

@@ -1,20 +1,22 @@
 package net.i2p.android.router.addressbook;
 
-import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.view.Menu;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+
 import net.i2p.android.router.R;
 import net.i2p.util.FileUtil;
 
-public class AddressbookSettingsActivity extends Activity {
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class AddressbookSettingsActivity extends ActionBarActivity {
 
     private EditText text_content_subscriptions;
     private Button btn_save_subscriptions;
@@ -25,6 +27,12 @@ public class AddressbookSettingsActivity extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_addressbook_settings);
+
+        // Set the action bar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
         text_content_subscriptions = (EditText) findViewById(R.id.subscriptions_content);
         btn_save_subscriptions = (Button) findViewById(R.id.button_save_subscriptions);
         init_actions();
@@ -32,12 +40,6 @@ public class AddressbookSettingsActivity extends Activity {
         load();
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.activity_addressbook_settings, menu);
-        return true;
-    }
-
     private void init_actions() {
         btn_save_subscriptions.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {

app/src/main/java/net/i2p/android/router/dialog/AboutDialog.java

@@ -1,18 +1,24 @@
 package net.i2p.android.router.dialog;
 
-import net.i2p.android.router.R;
-import net.i2p.android.router.util.I2Patterns;
-import net.i2p.android.router.util.Util;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import net.i2p.android.router.LicenseActivity;
+import net.i2p.android.router.R;
+import net.i2p.android.router.util.I2Patterns;
+import net.i2p.android.router.util.Util;
+
 public class AboutDialog extends DialogFragment {
+    @NonNull
     @Override
     public Dialog onCreateDialog(Bundle SavedInstanceState) {
         LayoutInflater li = LayoutInflater.from(getActivity());
@@ -33,7 +39,14 @@ public class AboutDialog extends DialogFragment {
 
         AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
         b.setTitle(R.string.menu_about)
-        .setView(view);
+                .setView(view)
+                .setNeutralButton(R.string.label_licenses, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        Intent lic = new Intent(getActivity(), LicenseActivity.class);
+                        startActivity(lic);
+                    }
+                });
         return b.create();
     }
 }

app/src/main/java/net/i2p/android/router/dialog/ConfigureBrowserDialog.java

@@ -0,0 +1,38 @@
+package net.i2p.android.router.dialog;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+
+import net.i2p.android.help.BrowserConfigActivity;
+import net.i2p.android.router.R;
+
+public class ConfigureBrowserDialog extends DialogFragment {
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
+        b.setTitle(R.string.configure_browser_title)
+                .setMessage(R.string.configure_browser_for_i2p)
+                .setCancelable(false)
+                .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.dismiss();
+                        Intent hi = new Intent(getActivity(), BrowserConfigActivity.class);
+                        startActivity(hi);
+                    }
+                })
+                .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.cancel();
+                    }
+                });
+        return b.create();
+    }
+}

app/src/main/java/net/i2p/android/router/dialog/FirstStartDialog.java

@@ -1,19 +1,22 @@
 package net.i2p.android.router.dialog;
 
-import net.i2p.android.router.R;
-import net.i2p.android.router.util.I2Patterns;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import net.i2p.android.router.R;
+import net.i2p.android.router.util.I2Patterns;
+
 public class FirstStartDialog extends DialogFragment {
+    @NonNull
     @Override
-    public Dialog onCreateDialog(Bundle SavedInstanceState) {
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
         LayoutInflater li = LayoutInflater.from(getActivity());
         View view = li.inflate(R.layout.fragment_dialog_first_start, null);
 
@@ -24,7 +27,7 @@ public class FirstStartDialog extends DialogFragment {
 
         AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
         b.setTitle(R.string.first_start_title)
-        .setView(view);
+                .setView(view);
         return b.create();
     }
 }

app/src/main/java/net/i2p/android/router/dialog/TextResourceDialog.java

@@ -3,17 +3,18 @@ package net.i2p.android.router.dialog;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
-import android.text.method.ScrollingMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
+import net.i2p.android.router.R;
+import net.i2p.android.router.util.Util;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import net.i2p.android.router.R;
-import net.i2p.android.router.util.Util;
 
 /**
  *  Display a raw text resource.
@@ -30,7 +31,6 @@ public class TextResourceDialog extends DialogFragment {
     {
         View v = inflater.inflate(R.layout.fragment_dialog_text_resource, container, false);
         TextView tv = (TextView) v.findViewById(R.id.text_resource_text);
-        tv.setMovementMethod(ScrollingMovementMethod.getInstance());
         String title = getArguments().getString(TEXT_DIALOG_TITLE);
         if (title != null)
             getDialog().setTitle(title);
@@ -54,10 +54,8 @@ public class TextResourceDialog extends DialogFragment {
             while ( (read = in.read(buf)) != -1)
                 out.write(buf, 0, read);
             
-        } catch (IOException ioe) {
-            System.err.println("resource error " + ioe);
-        } catch (Resources.NotFoundException nfe) {
-            System.err.println("resource error " + nfe);
+        } catch (IOException | Resources.NotFoundException re) {
+            System.err.println("resource error " + re);
         } finally {
             if (in != null) try { in.close(); } catch (IOException ioe) {}
         }

app/src/main/java/net/i2p/android/router/dialog/VersionDialog.java

@@ -1,24 +1,27 @@
 package net.i2p.android.router.dialog;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+
 import net.i2p.android.router.I2PActivityBase;
 import net.i2p.android.router.MainFragment;
 import net.i2p.android.router.R;
 import net.i2p.android.router.util.Util;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 
 public class VersionDialog extends DialogFragment {
     public static final String DIALOG_TYPE = "dialog_type";
     public static final int DIALOG_NEW_INSTALL = 0;
     public static final int DIALOG_NEW_VERSION = 1;
 
+    @NonNull
     @Override
     public Dialog onCreateDialog(Bundle SavedInstanceState) {
         final String currentVersion = Util.getOurVersion(getActivity());
-        Dialog rv = null;
+        Dialog rv;
         AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
         int id = getArguments().getInt(DIALOG_TYPE);
         switch(id) {
@@ -53,6 +56,7 @@ public class VersionDialog extends DialogFragment {
                 break;
 
             case DIALOG_NEW_VERSION:
+            default:
                 b.setMessage(getResources().getString(R.string.welcome_new_version) +
                              " " + currentVersion)
                  .setCancelable(true)

app/src/main/java/net/i2p/android/router/log/LogActivity.java

@@ -1,17 +1,19 @@
 package net.i2p.android.router.log;
 
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+
 import net.i2p.android.router.I2PActivityBase;
 import net.i2p.android.router.R;
 import net.i2p.android.router.SettingsActivity;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.ArrayAdapter;
-import android.widget.SpinnerAdapter;
 
 public class LogActivity extends I2PActivityBase implements
         LogFragment.OnEntrySelectedListener {
@@ -23,6 +25,9 @@ public class LogActivity extends I2PActivityBase implements
 
     private static final String SELECTED_LEVEL = "selected_level";
 
+    private String[] mLevels;
+    private Spinner mSpinner;
+
     @Override
     protected boolean canUseTwoPanes() {
         return true;
@@ -32,9 +37,10 @@ public class LogActivity extends I2PActivityBase implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // Set up action bar for drop-down list
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+        mLevels = getResources().getStringArray(R.array.log_level_list);
+
+        mSpinner = (Spinner) findViewById(R.id.main_spinner);
+        mSpinner.setVisibility(View.VISIBLE);
 
         mDrawerToggle.setDrawerIndicatorEnabled(false);
 
@@ -46,31 +52,36 @@ public class LogActivity extends I2PActivityBase implements
             mTwoPane = true;
         }
 
-        SpinnerAdapter mSpinnerAdapter = ArrayAdapter.createFromResource(this,
-                R.array.log_level_list, android.R.layout.simple_spinner_dropdown_item);
+        mSpinner.setAdapter(ArrayAdapter.createFromResource(this,
+                R.array.log_level_list, android.R.layout.simple_spinner_dropdown_item));
 
-        ActionBar.OnNavigationListener mNavigationListener = new ActionBar.OnNavigationListener() {
-            String[] levels = getResources().getStringArray(R.array.log_level_list);
-            
-            public boolean onNavigationItemSelected(int position, long itemId) {
-                String level = levels[position];
-                LogFragment f = LogFragment.newInstance(level);
-                // In two-pane mode, list items should be given the
-                // 'activated' state when touched.
-                if (mTwoPane)
-                    f.setActivateOnItemClick(true);
-                getSupportFragmentManager().beginTransaction()
-                        .replace(R.id.main_fragment, f, levels[position]).commit();
-                return true;
+        mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                selectLevel(i);
             }
-        };
 
-        actionBar.setListNavigationCallbacks(mSpinnerAdapter, mNavigationListener);
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+            }
+        });
 
         if (savedInstanceState != null) {
             int selected = savedInstanceState.getInt(SELECTED_LEVEL);
-            actionBar.setSelectedNavigationItem(selected);
-        }
+            mSpinner.setSelection(selected);
+        } else
+            selectLevel(0);
+    }
+
+    private void selectLevel(int i) {
+        String level = mLevels[i];
+        LogFragment f = LogFragment.newInstance(level);
+        // In two-pane mode, list items should be given the
+        // 'activated' state when touched.
+        if (mTwoPane)
+            f.setActivateOnItemClick(true);
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.main_fragment, f, level).commit();
     }
 
     @Override
@@ -106,8 +117,7 @@ public class LogActivity extends I2PActivityBase implements
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt(SELECTED_LEVEL,
-                getSupportActionBar().getSelectedNavigationIndex());
+        outState.putInt(SELECTED_LEVEL, mSpinner.getSelectedItemPosition());
     }
 
     // LogFragment.OnEntrySelectedListener

app/src/main/java/net/i2p/android/router/log/LogDetailFragment.java

@@ -2,12 +2,19 @@ package net.i2p.android.router.log;
 
 import net.i2p.android.router.I2PFragmentBase;
 import net.i2p.android.router.R;
+
+import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.method.ScrollingMovementMethod;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 
 public class LogDetailFragment extends I2PFragmentBase {
     public static final String LOG_ENTRY = "log_entry";
@@ -22,6 +29,12 @@ public class LogDetailFragment extends I2PFragmentBase {
         return f;
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
@@ -34,4 +47,31 @@ public class LogDetailFragment extends I2PFragmentBase {
 
         return v;
     }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.fragment_log_actions, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle presses on the action bar items
+        switch (item.getItemId()) {
+            case R.id.action_copy_logs:
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+                    android.text.ClipboardManager clipboard = (android.text.ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+                    clipboard.setText(mEntry);
+                } else {
+                    android.content.ClipboardManager clipboard = (android.content.ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+                    android.content.ClipData clip = android.content.ClipData.newPlainText(
+                            getString(R.string.i2p_android_logs), mEntry);
+                    clipboard.setPrimaryClip(clip);
+                }
+
+                Toast.makeText(getActivity(), R.string.logs_copied_to_clipboard, Toast.LENGTH_SHORT).show();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 }

app/src/main/java/net/i2p/android/router/log/LogFragment.java

@@ -1,17 +1,26 @@
 package net.i2p.android.router.log;
 
 import android.app.Activity;
+import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
-import java.util.List;
+import android.widget.Toast;
+
 import net.i2p.I2PAppContext;
 import net.i2p.android.router.R;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class LogFragment extends ListFragment implements
         LoaderManager.LoaderCallbacks<List<String>> {
     public static final String LOG_LEVEL = "log_level";
@@ -25,6 +34,7 @@ public class LogFragment extends ListFragment implements
     private static final int LEVEL_ALL = 2;
 
     OnEntrySelectedListener mEntrySelectedCallback;
+    private final List<String> mLogEntries = new ArrayList<>();
     private LogAdapter mAdapter;
     private TextView mHeaderView;
     private String mLogLevel;
@@ -34,6 +44,8 @@ public class LogFragment extends ListFragment implements
     private int mActivatedPosition = ListView.INVALID_POSITION;
     private boolean mActivateOnItemClick = false;
 
+    private MenuItem mCopyLogs;
+
     // Container Activity must implement this interface
     public interface OnEntrySelectedListener {
         public void onEntrySelected(String entry);
@@ -62,6 +74,12 @@ public class LogFragment extends ListFragment implements
 
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -122,6 +140,53 @@ public class LogFragment extends ListFragment implements
         }
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.fragment_log_actions, menu);
+        mCopyLogs = menu.findItem(R.id.action_copy_logs);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        mCopyLogs.setVisible(I2PAppContext.getCurrentContext() != null);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle presses on the action bar items
+        switch (item.getItemId()) {
+            case R.id.action_copy_logs:
+                String logText = "";
+                synchronized (mLogEntries) {
+                    for (String logEntry : mLogEntries) {
+                        logText += logEntry;
+                    }
+                }
+
+                boolean isError = "ERROR".equals(mLogLevel);
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+                    android.text.ClipboardManager clipboard = (android.text.ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+                    clipboard.setText(logText);
+                } else {
+                    android.content.ClipboardManager clipboard = (android.content.ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+                    android.content.ClipData clip = android.content.ClipData.newPlainText(
+                            isError ? getString(R.string.i2p_android_error_logs) : getString(R.string.i2p_android_logs),
+                            logText);
+                    clipboard.setPrimaryClip(clip);
+                }
+
+                int textId;
+                if (isError)
+                    textId = R.string.error_logs_copied_to_clipboard;
+                else
+                    textId = R.string.logs_copied_to_clipboard;
+                Toast.makeText(getActivity(), textId, Toast.LENGTH_SHORT).show();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
     /**
      * Turns on activate-on-click mode. When this mode is on, list items will be
      * given the 'activated' state when touched.
@@ -167,6 +232,10 @@ public class LogFragment extends ListFragment implements
             List<String> data) {
         if (loader.getId() == ("ERROR".equals(mLogLevel) ?
                 LEVEL_ERROR : LEVEL_ALL)) {
+            synchronized (mLogEntries) {
+                mLogEntries.clear();
+                mLogEntries.addAll(data);
+            }
             mAdapter.setData(data);
             String header = getHeader(data.size(), ("ERROR".equals(mLogLevel)));
             mHeaderView.setText(header);

app/src/main/java/net/i2p/android/router/netdb/NetDbActivity.java

@@ -1,14 +1,16 @@
 package net.i2p.android.router.netdb;
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+
 import net.i2p.android.router.I2PActivityBase;
 import net.i2p.android.router.R;
 import net.i2p.data.Hash;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBar.Tab;
 
 public class NetDbActivity extends I2PActivityBase implements
         NetDbListFragment.OnEntrySelectedListener {
@@ -18,7 +20,11 @@ public class NetDbActivity extends I2PActivityBase implements
      */
     private boolean mTwoPane;
 
-    private static final String SELECTED_TAB = "selected_tab";
+    private static final String SELECTED_PAGE = "selected_page";
+    private static final int PAGE_STATS = 0;
+    private static final int PAGE_ROUTERS = 1;
+
+    private Spinner mSpinner;
 
     @Override
     protected boolean canUseTwoPanes() {
@@ -29,41 +35,22 @@ public class NetDbActivity extends I2PActivityBase implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // Set up action bar for tabs
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        mSpinner = (Spinner) findViewById(R.id.main_spinner);
+        mSpinner.setVisibility(View.VISIBLE);
 
-        // Statistics tab
-        NetDbSummaryPagerFragment sf = new NetDbSummaryPagerFragment();
-        actionBar.addTab(
-                actionBar.newTab()
-                        .setText("Statistics")
-                        .setTabListener(new NetDbSummaryPagerTabListener(sf)));
+        mSpinner.setAdapter(ArrayAdapter.createFromResource(this,
+                R.array.netdb_pages, android.R.layout.simple_spinner_dropdown_item));
 
-        // Routers tab
-        NetDbListFragment rf = new NetDbListFragment();
-        Bundle args = new Bundle();
-        args.putBoolean(NetDbListFragment.SHOW_ROUTERS, true);
-        rf.setArguments(args);
-        actionBar.addTab(
-                actionBar.newTab()
-                        .setText("Routers")
-                        .setTabListener(new TabListener(rf)));
+        mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                selectPage(i);
+            }
 
-        // LeaseSets tab
-        NetDbListFragment lf = new NetDbListFragment();
-        args = new Bundle();
-        args.putBoolean(NetDbListFragment.SHOW_ROUTERS, false);
-        lf.setArguments(args);
-        actionBar.addTab(
-                actionBar.newTab()
-                        .setText("LeaseSets")
-                        .setTabListener(new TabListener(lf)));
-
-        if (savedInstanceState != null) {
-            int selected = savedInstanceState.getInt(SELECTED_TAB);
-            actionBar.setSelectedNavigationItem(selected);
-        }
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+            }
+        });
 
         if (findViewById(R.id.detail_fragment) != null) {
             // The detail container view will be present only in the
@@ -71,38 +58,37 @@ public class NetDbActivity extends I2PActivityBase implements
             // res/values-sw600dp). If this view is present, then the
             // activity should be in two-pane mode.
             mTwoPane = true;
-
-            // In two-pane mode, list items should be given the
-            // 'activated' state when touched.
-            rf.setActivateOnItemClick(true);
-            lf.setActivateOnItemClick(true);
         }
+
+        if (savedInstanceState != null) {
+            int selected = savedInstanceState.getInt(SELECTED_PAGE);
+            mSpinner.setSelection(selected);
+        } else
+            selectPage(PAGE_STATS);
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt(SELECTED_TAB,
-                getSupportActionBar().getSelectedNavigationIndex());
+        outState.putInt(SELECTED_PAGE, mSpinner.getSelectedItemPosition());
     }
 
-    public static class NetDbSummaryPagerTabListener extends TabListener {
-        public NetDbSummaryPagerTabListener(Fragment fragment) {
-            super(fragment);
-        }
-
-        @Override
-        public void onTabSelected(Tab tab, FragmentTransaction ft) {
-            /**
-             * This is a work-around for Issue 42601
-             * https://code.google.com/p/android/issues/detail?id=42601
-             * 
-             * The method getChildFragmentManager() does not clear up
-             * when the Fragment is detached.
-             */
-            mFragment = new NetDbSummaryPagerFragment();
-            super.onTabSelected(tab, ft);
+    private void selectPage(int page) {
+        Fragment f;
+        if (page == PAGE_STATS)
+            f = new NetDbSummaryPagerFragment();
+        else {
+            f = new NetDbListFragment();
+            Bundle args = new Bundle();
+            args.putBoolean(NetDbListFragment.SHOW_ROUTERS, page == PAGE_ROUTERS);
+            f.setArguments(args);
+            // In two-pane mode, list items should be given the
+            // 'activated' state when touched.
+            if (mTwoPane)
+                ((NetDbListFragment) f).setActivateOnItemClick(true);
         }
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.main_fragment, f).commit();
     }
 
     // NetDbListFragment.OnEntrySelectedListener
@@ -115,12 +101,12 @@ public class NetDbActivity extends I2PActivityBase implements
             NetDbDetailFragment detailFrag = NetDbDetailFragment.newInstance(
                     isRouterInfo, entryHash);
             getSupportFragmentManager().beginTransaction()
-                .replace(R.id.detail_fragment, detailFrag).commit();
+                    .replace(R.id.detail_fragment, detailFrag).commit();
 
             // If we are coming from a LS to a RI, change the tab
-            int currentTab = getSupportActionBar().getSelectedNavigationIndex();
-            if (isRouterInfo && currentTab !=1)
-                getSupportActionBar().setSelectedNavigationItem(1);
+            int currentTab = mSpinner.getSelectedItemPosition();
+            if (isRouterInfo && currentTab != PAGE_ROUTERS)
+                selectPage(PAGE_ROUTERS);
         } else {
             // In single-pane mode, simply start the detail activity
             // for the selected item ID.

app/src/main/java/net/i2p/android/router/netdb/NetDbDetailFragment.java

@@ -21,8 +21,8 @@ import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.Lease;
 import net.i2p.data.LeaseSet;
-import net.i2p.data.RouterAddress;
-import net.i2p.data.RouterInfo;
+import net.i2p.data.router.RouterAddress;
+import net.i2p.data.router.RouterInfo;
 
 import java.util.Map;
 

app/src/main/java/net/i2p/android/router/netdb/NetDbEntry.java

@@ -7,7 +7,7 @@ import net.i2p.data.DatabaseEntry;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
-import net.i2p.data.RouterInfo;
+import net.i2p.data.router.RouterInfo;
 import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelPoolSettings;
 

app/src/main/java/net/i2p/android/router/netdb/NetDbEntryLoader.java

@@ -1,18 +1,19 @@
 package net.i2p.android.router.netdb;
 
+import android.content.Context;
+import android.support.v4.content.AsyncTaskLoader;
+
+import net.i2p.data.Destination;
+import net.i2p.data.LeaseSet;
+import net.i2p.data.router.RouterInfo;
+import net.i2p.router.RouterContext;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import net.i2p.data.Destination;
-import net.i2p.data.LeaseSet;
-import net.i2p.data.RouterInfo;
-import net.i2p.router.RouterContext;
-import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
-
 public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
     private RouterContext mRContext;
     private boolean mRouters;
@@ -44,17 +45,17 @@ public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
 
     @Override
     public List<NetDbEntry> loadInBackground() {
-        List<NetDbEntry> ret = new ArrayList<NetDbEntry>();
+        List<NetDbEntry> ret = new ArrayList<>();
         if (mRContext.netDb().isInitialized()) {
             if (mRouters) {
-                Set<RouterInfo> routers = new TreeSet<RouterInfo>(new RouterInfoComparator());
+                Set<RouterInfo> routers = new TreeSet<>(new RouterInfoComparator());
                 routers.addAll(mRContext.netDb().getRouters());
                 for (RouterInfo ri : routers) {
                     NetDbEntry entry = NetDbEntry.fromRouterInfo(mRContext, ri);
                     ret.add(entry);
                 }
             } else {
-                Set<LeaseSet> leases = new TreeSet<LeaseSet>(new LeaseSetComparator());
+                Set<LeaseSet> leases = new TreeSet<>(new LeaseSetComparator());
                 leases.addAll(mRContext.netDb().getLeases());
                 for (LeaseSet ls : leases) {
                     NetDbEntry entry = NetDbEntry.fromLeaseSet(mRContext, ls);

app/src/main/java/net/i2p/android/router/netdb/NetDbStatsLoader.java

@@ -1,19 +1,20 @@
 package net.i2p.android.router.netdb;
 
+import android.content.Context;
+import android.support.v4.content.AsyncTaskLoader;
+
+import net.i2p.data.Hash;
+import net.i2p.data.router.RouterAddress;
+import net.i2p.data.router.RouterInfo;
+import net.i2p.router.RouterContext;
+import net.i2p.util.ObjectCounter;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import net.i2p.data.Hash;
-import net.i2p.data.RouterAddress;
-import net.i2p.data.RouterInfo;
-import net.i2p.router.RouterContext;
-import net.i2p.util.ObjectCounter;
-import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
-
 public class NetDbStatsLoader extends AsyncTaskLoader<List<ObjectCounter<String>>> {
     private RouterContext mRContext;
     private List<ObjectCounter<String>> mData;
@@ -31,16 +32,16 @@ public class NetDbStatsLoader extends AsyncTaskLoader<List<ObjectCounter<String>
 
     @Override
     public List<ObjectCounter<String>> loadInBackground() {
-        List<ObjectCounter<String>> ret = new ArrayList<ObjectCounter<String>>();
+        List<ObjectCounter<String>> ret = new ArrayList<>();
 
-        ObjectCounter<String> versions = new ObjectCounter<String>();
-        ObjectCounter<String> countries = new ObjectCounter<String>();
-        ObjectCounter<String> transports = new ObjectCounter<String>();
+        ObjectCounter<String> versions = new ObjectCounter<>();
+        ObjectCounter<String> countries = new ObjectCounter<>();
+        ObjectCounter<String> transports = new ObjectCounter<>();
 
-        if (mRContext.netDb().isInitialized()) {
+        if (mRContext != null && mRContext.netDb() != null && mRContext.netDb().isInitialized()) {
             Hash us = mRContext.routerHash();
 
-            Set<RouterInfo> routers = new TreeSet<RouterInfo>(new RouterInfoComparator());
+            Set<RouterInfo> routers = new TreeSet<>(new RouterInfoComparator());
             routers.addAll(mRContext.netDb().getRouters());
             for (RouterInfo ri : routers) {
                 Hash key = ri.getHash();

app/src/main/java/net/i2p/android/router/netdb/NetDbSummaryTableFragment.java

@@ -1,12 +1,5 @@
 package net.i2p.android.router.netdb;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import net.i2p.android.router.R;
-import net.i2p.util.ObjectCounter;
-import net.i2p.util.VersionComparator;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -16,6 +9,14 @@ import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 
+import net.i2p.android.router.R;
+import net.i2p.util.ObjectCounter;
+import net.i2p.util.VersionComparator;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 public class NetDbSummaryTableFragment extends Fragment {
     private static final String CATEGORY = "category";
     private static final String COUNTS = "counts";
@@ -44,7 +45,7 @@ public class NetDbSummaryTableFragment extends Fragment {
 
         mTable = (TableLayout) v.findViewById(R.id.table);
 
-        List<String> objects = new ArrayList<String>(mCounts.objects());
+        List<String> objects = new ArrayList<>(mCounts.objects());
         if (!objects.isEmpty()) {
             createTableTitle();
 

app/src/main/java/net/i2p/android/router/provider/CacheProvider.java

@@ -6,6 +6,12 @@ import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
+
+import net.i2p.android.apps.EepGetFetcher;
+import net.i2p.android.router.BuildConfig;
+import net.i2p.android.router.util.AppCache;
+import net.i2p.android.router.util.Util;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -13,9 +19,6 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import net.i2p.android.apps.EepGetFetcher;
-import net.i2p.android.router.util.AppCache;
-import net.i2p.android.router.util.Util;
 
 /**
  *  Usage:  content://net.i2p.android.router/NONCE/ENCODED-SCHEME/ENCODED-AUTHORITY/ENCODED_PATH + QUERY_MARKER + ENCODED-QUERY
@@ -45,7 +48,7 @@ public class CacheProvider extends ContentProvider {
     //private static final String NONCE = Integer.toString(Math.abs((new java.util.Random()).nextInt()));
     private static final String NONCE = "0";
     private static final String SCHEME = "content";
-    public static final String AUTHORITY = "net.i2p.android";
+    public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".provider";
     /** includes the nonce */
     public static final Uri CONTENT_URI = Uri.parse(SCHEME + "://" + AUTHORITY + '/' + NONCE);
 
@@ -140,7 +143,7 @@ public class CacheProvider extends ContentProvider {
      *
      *  @param uri must contain a scheme, authority and path with nonce etc. as defined above
      *  @return non-null
-     *  @throws FNFE on error
+     *  @throws java.io.FileNotFoundException on error
      */
     public static Uri getI2PUri(Uri uri) throws FileNotFoundException {
         String resPath = uri.getEncodedPath();
@@ -242,8 +245,7 @@ public class CacheProvider extends ContentProvider {
             if (file.length() > 0) {
                 // this call will insert it back to us (don't set as current base)
                 Uri content = cache.addCacheFile(uri, false);
-                ParcelFileDescriptor parcel = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
-                return parcel;
+                return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
             } else {
                  Util.d("CacheProvider Sucess but no data " + uri);
             }
@@ -275,7 +277,7 @@ public class CacheProvider extends ContentProvider {
             put(uri, fileURI);
         }
         Boolean setAsCurrentBase = values.getAsBoolean(CURRENT_BASE);
-        if (setAsCurrentBase != null && setAsCurrentBase.booleanValue()) {
+        if (setAsCurrentBase != null && setAsCurrentBase) {
             Util.d("CacheProvider set current base " + uri);
             setCurrentBase(uri);
         }
@@ -302,7 +304,7 @@ public class CacheProvider extends ContentProvider {
 
     private void cleanup() {
         String pfx = CONTENT_URI.toString();
-        List<String> toDelete = new ArrayList<String>();
+        List<String> toDelete = new ArrayList<>();
         Map<String, ?> map = _sharedPrefs.getAll();
         for (Map.Entry<String, ?> e : map.entrySet()) {
             String path = (String) e.getValue();

app/src/main/java/net/i2p/android/router/receiver/I2PReceiver.java

@@ -11,6 +11,7 @@ import android.net.NetworkInfo;
 import android.os.IBinder;
 import net.i2p.android.router.service.RouterBinder;
 import net.i2p.android.router.service.RouterService;
+import net.i2p.android.router.util.Connectivity;
 import net.i2p.android.router.util.Util;
 
 public class I2PReceiver extends BroadcastReceiver {
@@ -33,7 +34,7 @@ public class I2PReceiver extends BroadcastReceiver {
         intents.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
         @SuppressWarnings("LeakingThisInConstructor")
         Intent registerReceiver = context.registerReceiver(this, intents);
-        _wasConnected = Util.isConnected(context);
+        _wasConnected = Connectivity.isConnected(context);
     }
 
     public void onReceive(Context context, Intent intent) {
@@ -57,7 +58,7 @@ public class I2PReceiver extends BroadcastReceiver {
 
         if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION) ||
             action.equals(Intent.ACTION_TIME_TICK)) {
-            boolean connected = Util.isConnected(context);
+            boolean connected = Connectivity.isConnected(context);
             if (_wasConnected && !connected) {
                 // notify + 2 timer ticks
                 if (++_unconnectedCount >= 3) {

app/src/main/java/net/i2p/android/router/receiver/OnBootReceiver.java

@@ -0,0 +1,25 @@
+package net.i2p.android.router.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import net.i2p.android.router.I2PConstants;
+import net.i2p.android.router.service.RouterService;
+
+public class OnBootReceiver extends BroadcastReceiver implements I2PConstants {
+    public static final String PREF_START_ON_BOOT = ANDROID_PREF_PREFIX + "startOnBoot";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean startOnBoot = prefs.getBoolean(PREF_START_ON_BOOT, false);
+
+        if (startOnBoot) {
+            Intent routerService = new Intent(context, RouterService.class);
+            context.startService(routerService);
+        }
+    }
+}

app/src/main/java/net/i2p/android/router/service/Init.java

@@ -1,10 +1,12 @@
 package net.i2p.android.router.service;
 
 import android.content.Context;
-import java.io.File;
+
 import net.i2p.android.router.util.Util;
 import net.i2p.util.FileUtil;
 
+import java.io.File;
+
 class Init {
 
     private final Context ctx;
@@ -32,8 +34,7 @@ class Init {
         File tmp = new File(myDir, "tmp");
         File[] files = tmp.listFiles();
         if (files != null) {
-            for (int i = 0; i < files.length; i++) {
-                File f = files[i];
+            for (File f : files) {
                 Util.d("Deleting old file/dir " + f);
                 FileUtil.rmdir(f, false);
             }

app/src/main/java/net/i2p/android/router/service/RouterService.java

@@ -1,25 +1,21 @@
 package net.i2p.android.router.service;
 
 import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
+import android.support.v4.content.LocalBroadcastManager;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.receiver.I2PReceiver;
+import net.i2p.android.router.util.Connectivity;
 import net.i2p.android.router.util.Notifications;
 import net.i2p.android.router.util.Util;
 import net.i2p.data.DataHelper;
@@ -27,13 +23,31 @@ import net.i2p.router.Job;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.router.RouterLaunch;
-import net.i2p.util.OrderedProperties;
+
+import java.lang.ref.WeakReference;
+import java.text.DecimalFormat;
 
 /**
  * Runs the router
  */
 public class RouterService extends Service {
 
+    /**
+     * A request to this service for the current router state. Broadcasting
+     * this will trigger a state notification.
+     */
+    public static final String LOCAL_BROADCAST_REQUEST_STATE = "net.i2p.android.LOCAL_BROADCAST_REQUEST_STATE";
+    /**
+     * A notification of the current state. This is informational; the state
+     * has not changed.
+     */
+    public static final String LOCAL_BROADCAST_STATE_NOTIFICATION = "net.i2p.android.LOCAL_BROADCAST_STATE_NOTIFICATION";
+    /**
+     * The state has just changed.
+     */
+    public static final String LOCAL_BROADCAST_STATE_CHANGED = "net.i2p.android.LOCAL_BROADCAST_STATE_CHANGED";
+    public static final String LOCAL_BROADCAST_EXTRA_STATE = "net.i2p.android.STATE";
+
     private RouterContext _context;
     private String _myDir;
     //private String _apkPath;
@@ -58,7 +72,7 @@ public class RouterService extends Service {
      * that it can be accessed more efficiently from inner classes.
      */
     final RemoteCallbackList<IRouterStateCallback> mStateCallbacks
-            = new RemoteCallbackList<IRouterStateCallback>();
+            = new RemoteCallbackList<>();
 
     @Override
     public void onCreate() {
@@ -82,11 +96,13 @@ public class RouterService extends Service {
         _binder = new RouterBinder(this);
         _handler = new Handler();
         _updater = new Updater();
+        LocalBroadcastManager.getInstance(this).registerReceiver(onStateRequested,
+                new IntentFilter(LOCAL_BROADCAST_REQUEST_STATE));
         if(lastState == State.RUNNING || lastState == State.ACTIVE) {
             Intent intent = new Intent(this, RouterService.class);
             intent.putExtra(EXTRA_RESTART, true);
             onStartCommand(intent, 12345, 67890);
-        } else if(lastState == State.MANUAL_QUITTING) {
+        } else if(lastState == State.MANUAL_QUITTING || lastState == State.GRACEFUL_SHUTDOWN) {
             synchronized(_stateLock) {
                 setState(State.MANUAL_QUITTED);
                 stopSelf(); // Die.
@@ -94,6 +110,16 @@ public class RouterService extends Service {
         }
     }
 
+    private BroadcastReceiver onStateRequested = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            // Broadcast the current state within this app.
+            Intent ni = new Intent(LOCAL_BROADCAST_STATE_NOTIFICATION);
+            ni.putExtra(LOCAL_BROADCAST_EXTRA_STATE, (android.os.Parcelable) _state);
+            LocalBroadcastManager.getInstance(RouterService.this).sendBroadcast(ni);
+        }
+    };
+
     /**
      * NOT called by system if it restarts us after a crash
      */
@@ -115,7 +141,7 @@ public class RouterService extends Service {
                 return START_NOT_STICKY;
             }
             _receiver = new I2PReceiver(this);
-            if(Util.isConnected(this)) {
+            if(Connectivity.isConnected(this)) {
                 if(restart) {
                     _statusBar.replace(StatusBar.ICON_STARTING, "I2P is restarting");
                 } else {
@@ -149,7 +175,7 @@ public class RouterService extends Service {
             Util.d(MARKER + this + " waiter handler"
                     + " Current state is: " + _state);
             if(_state == State.WAITING) {
-                if(Util.isConnected(RouterService.this)) {
+                if(Connectivity.isConnected(RouterService.this)) {
                     synchronized(_stateLock) {
                         if(_state != State.WAITING) {
                             return;
@@ -175,159 +201,18 @@ public class RouterService extends Service {
             //NativeBigInteger.main(null);
             //Util.d(MARKER + this + " JBigI speed test finished, launching router");
 
-
-            // Before we launch, fix up any settings that need to be fixed here.
-            // This should be done in the core, but as of this writing it isn't!
-
-            // Step one. Load the propertites.
-            Properties props = new OrderedProperties();
-            Properties oldprops = new OrderedProperties();
-            String wrapName = _myDir + "/router.config";
-            try {
-                InputStream fin = new FileInputStream(new File(wrapName));
-                DataHelper.loadProps(props, fin);
-            } catch(IOException ioe) {
-                // shouldn't happen...
-            }
-            oldprops.putAll(props);
-            // Step two, check for any port settings, and copy for those that are missing.
-            int UDPinbound;
-            int UDPinlocal;
-            int TCPinbound;
-            int TCPinlocal;
-            UDPinbound = Integer.parseInt(props.getProperty("i2np.udp.port", "-1"));
-            UDPinlocal = Integer.parseInt(props.getProperty("i2np.udp.internalPort", "-1"));
-            TCPinbound = Integer.parseInt(props.getProperty("i2np.ntcp.port", "-1"));
-            TCPinlocal = Integer.parseInt(props.getProperty("i2np.ntcp.internalPort", "-1"));
-            boolean hasUDPinbound = UDPinbound != -1;
-            boolean hasUDPinlocal = UDPinlocal != -1;
-            boolean hasTCPinbound = TCPinbound != -1;
-            boolean hasTCPinlocal = TCPinlocal != -1;
-
-            // check and clear values based on these:
-            boolean udp = Boolean.parseBoolean(props.getProperty("i2np.udp.enable", "false"));
-            boolean tcp = Boolean.parseBoolean(props.getProperty("i2np.ntcp.enable", "false"));
-
-            // Fix if both are false.
-            if(!(udp || tcp)) {
-                // If both are not on, turn them both on.
-                props.setProperty("i2np.udp.enable", "true");
-                props.setProperty("i2np.ntcp.enable", "true");
-            }
-
-            // Fix if we have local but no inbound
-            if(!hasUDPinbound && hasUDPinlocal) {
-                // if we got a local port and no external port, set it
-                hasUDPinbound = true;
-                UDPinbound = UDPinlocal;
-            }
-            if(!hasTCPinbound && hasTCPinlocal) {
-                // if we got a local port and no external port, set it
-                hasTCPinbound = true;
-                TCPinbound = TCPinlocal;
-            }
-
-            boolean anyUDP = hasUDPinbound || hasUDPinlocal;
-            boolean anyTCP = hasTCPinbound || hasTCPinlocal;
-            boolean anyport = anyUDP || anyTCP;
-
-            if(!anyport) {
-                // generate one for UDPinbound, and fall thru.
-                // FIX ME: Possibly not the best but should be OK.
-                Random generator = new Random(System.currentTimeMillis());
-                UDPinbound = generator.nextInt(55500) + 10000;
-                anyUDP = true;
-            }
-
-            // Copy missing port numbers
-            if(anyUDP && !anyTCP) {
-                TCPinbound = UDPinbound;
-                TCPinlocal = UDPinlocal;
-            }
-            if(anyTCP && !anyUDP) {
-                UDPinbound = TCPinbound;
-                UDPinlocal = TCPinlocal;
-            }
-            // reset for a retest.
-            hasUDPinbound = UDPinbound != -1;
-            hasUDPinlocal = UDPinlocal != -1;
-            hasTCPinbound = TCPinbound != -1;
-            hasTCPinlocal = TCPinlocal != -1;
-            anyUDP = hasUDPinbound || hasUDPinlocal;
-            anyTCP = hasTCPinbound || hasTCPinlocal;
-            boolean checkAnyUDP = anyUDP && udp;
-            boolean checkAnyTCP = anyTCP && tcp;
-
-            // Enable things that need to be enabled.
-            // Disable anything that needs to be disabled.
-            if(!checkAnyUDP && !checkAnyTCP) {
-                // enable the one(s) with values.
-                if(anyUDP) {
-                    udp = true;
-                }
-                if(anyTCP) {
-                    tcp = true;
-                }
-            }
-
-            if(!udp) {
-                props.setProperty("i2np.udp.enable", "false");
-                props.remove("i2np.udp.port");
-                props.remove("i2np.udp.internalPort");
-            } else {
-                props.setProperty("i2np.udp.enable", "true");
-                if(hasUDPinbound) {
-                    props.setProperty("i2np.udp.port", Integer.toString(UDPinbound));
-                } else {
-                    props.remove("i2np.udp.port");
-                }
-                if(hasUDPinlocal) {
-                    props.setProperty("i2np.udp.internalPort", Integer.toString(UDPinlocal));
-                } else {
-                    props.remove("i2np.udp.internalPort");
-                }
-            }
-
-            if(!tcp) {
-                props.setProperty("i2np.ntcp.enable", "false");
-                props.remove("i2np.ntcp.port");
-                props.remove("i2np.ntcp.internalPort");
-            } else {
-                props.setProperty("i2np.ntcp.enable", "true");
-                if(hasTCPinbound) {
-                    props.setProperty("i2np.ntcp.port", Integer.toString(TCPinbound));
-                } else {
-                    props.remove("i2np.ntcp.port");
-                }
-                if(hasTCPinlocal) {
-                    props.setProperty("i2np.ntcp.internalPort", Integer.toString(TCPinlocal));
-                } else {
-                    props.remove("i2np.ntcp.internalPort");
-                }
-            }
-            // WHEW! Now test for any changes.
-            if(!props.equals(oldprops)) {
-                // save fixed properties.
-                try {
-                    DataHelper.storeProps(props, new File(wrapName));
-                } catch(IOException ioe) {
-                    // shouldn't happen...
-                }
-            }
-
-            // _NOW_ launch the router!
+            // Launch the router!
             RouterLaunch.main(null);
             synchronized(_stateLock) {
                 if(_state != State.STARTING) {
                     return;
                 }
                 setState(State.RUNNING);
-                List<?> contexts = RouterContext.listContexts();
-                if((contexts == null) || (contexts.isEmpty())) {
+                _statusBar.replace(StatusBar.ICON_RUNNING, "I2P is running");
+                _context = Util.getRouterContext();
+                if (_context == null) {
                     throw new IllegalStateException("No contexts. This is usually because the router is either starting up or shutting down.");
                 }
-                _statusBar.replace(StatusBar.ICON_RUNNING, "I2P is running");
-                _context = (RouterContext) contexts.get(0);
                 _context.router().setKillVMOnEnd(false);
                 Job loadJob = new LoadClientsJob(_context, _notif);
                 _context.jobQueue().addJob(loadJob);
@@ -343,7 +228,7 @@ public class RouterService extends Service {
 
         public void run() {
             RouterContext ctx = _context;
-            if(ctx != null && (_state == State.RUNNING || _state == State.ACTIVE)) {
+            if(ctx != null && (_state == State.RUNNING || _state == State.ACTIVE || _state == State.GRACEFUL_SHUTDOWN)) {
                 Router router = ctx.router();
                 if(router.isAlive()) {
                     updateStatus(ctx);
@@ -390,7 +275,14 @@ public class RouterService extends Service {
                         inCl, outCl);
 
         boolean haveTunnels = inCl > 0 && outCl > 0;
-        if(haveTunnels != _hadTunnels) {
+        if (isGracefulShutdownInProgress()) {
+            long ms = ctx.router().getShutdownTimeRemaining();
+            if (ms > 1000) {
+                _currTitle = "Stopping I2P in " + DataHelper.formatDuration(ms);
+            } else {
+                _currTitle = "Stopping I2P";
+            }
+        } else if (haveTunnels != _hadTunnels) {
             if(haveTunnels) {
                 _currTitle = "Client tunnels are ready";
                 setState(State.ACTIVE);
@@ -457,7 +349,7 @@ public class RouterService extends Service {
 
     // ******** following methods may be accessed from Activities and Receivers ************
     /**
-     * @returns null if router is not running
+     * @return null if router is not running
      */
     public RouterContext getRouterContext() {
         RouterContext rv = _context;
@@ -472,7 +364,8 @@ public class RouterService extends Service {
                 && _state != State.STOPPING
                 && _state != State.MANUAL_STOPPING
                 && _state != State.MANUAL_QUITTING
-                && _state != State.NETWORK_STOPPING) {
+                && _state != State.NETWORK_STOPPING
+                && _state != State.GRACEFUL_SHUTDOWN) {
             return null;
         }
         return rv;
@@ -486,11 +379,15 @@ public class RouterService extends Service {
     }
 
     public boolean canManualStop() {
-        return _state == State.WAITING || _state == State.STARTING || _state == State.RUNNING || _state == State.ACTIVE;
+        return _state == State.WAITING || _state == State.STARTING ||
+               _state == State.RUNNING || _state == State.ACTIVE ||
+               _state == State.GRACEFUL_SHUTDOWN;
     }
 
     /**
      * Stop and don't restart the router, but keep the service
+     *
+     * Apparently unused - see manualQuit()
      */
     public void manualStop() {
         Util.d("manualStop called"
@@ -502,7 +399,8 @@ public class RouterService extends Service {
             if(_state == State.STARTING) {
                 _starterThread.interrupt();
             }
-            if(_state == State.STARTING || _state == State.RUNNING || _state == State.ACTIVE) {
+            if(_state == State.STARTING || _state == State.RUNNING ||
+               _state == State.ACTIVE || _state == State.GRACEFUL_SHUTDOWN) {
                 _statusBar.replace(StatusBar.ICON_STOPPING, "Stopping I2P");
                 Thread stopperThread = new Thread(new Stopper(State.MANUAL_STOPPING, State.MANUAL_STOPPED));
                 stopperThread.start();
@@ -523,7 +421,8 @@ public class RouterService extends Service {
             if(_state == State.STARTING) {
                 _starterThread.interrupt();
             }
-            if(_state == State.STARTING || _state == State.RUNNING || _state == State.ACTIVE) {
+            if(_state == State.STARTING || _state == State.RUNNING ||
+               _state == State.ACTIVE || _state == State.GRACEFUL_SHUTDOWN) {
                 _statusBar.replace(StatusBar.ICON_STOPPING, "Stopping I2P");
                 Thread stopperThread = new Thread(new Stopper(State.MANUAL_QUITTING, State.MANUAL_QUITTED));
                 stopperThread.start();
@@ -544,7 +443,8 @@ public class RouterService extends Service {
             if(_state == State.STARTING) {
                 _starterThread.interrupt();
             }
-            if(_state == State.STARTING || _state == State.RUNNING || _state == State.ACTIVE) {
+            if(_state == State.STARTING || _state == State.RUNNING ||
+               _state == State.ACTIVE || _state == State.GRACEFUL_SHUTDOWN) {
                 _statusBar.replace(StatusBar.ICON_STOPPING, "Network disconnected, stopping I2P");
                 // don't change state, let the shutdown hook do it
                 Thread stopperThread = new Thread(new Stopper(State.NETWORK_STOPPING, State.NETWORK_STOPPING));
@@ -572,6 +472,87 @@ public class RouterService extends Service {
         }
     }
 
+    /**
+     * Graceful Shutdown
+     *
+     * @since 0.9.19
+     */
+    public boolean isGracefulShutdownInProgress() {
+        if (_state == State.GRACEFUL_SHUTDOWN) {
+            RouterContext ctx = _context;
+            return ctx != null && ctx.router().gracefulShutdownInProgress();
+        }
+        return false;
+    }
+
+    private String _oldTitle;
+    /**
+     * Graceful Shutdown
+     *
+     * @since 0.9.19
+     */
+    public void gracefulShutdown() {
+        Util.d("gracefulShutdown called"
+                + " Current state is: " + _state);
+        synchronized(_stateLock) {
+            if(!canManualStop()) {
+                return;
+            }
+            if(_state == State.STARTING || _state == State.WAITING) {
+                manualQuit();
+                return;
+            }
+            if(_state == State.RUNNING || _state == State.ACTIVE) {
+                RouterContext ctx = _context;
+                if(ctx != null && ctx.router().isAlive()) {
+                    int part = ctx.tunnelManager().getParticipatingCount();
+                    if(part <= 0) {
+                        manualQuit();
+                    } else {
+                        ctx.router().shutdownGracefully();
+                        _oldTitle = _currTitle;
+                        long ms = ctx.router().getShutdownTimeRemaining();
+                        if (ms > 1000) {
+                            _statusBar.replace(StatusBar.ICON_STOPPING, "Stopping I2P in " + DataHelper.formatDuration(ms));
+                        } else {
+                            _statusBar.replace(StatusBar.ICON_STOPPING, "Stopping I2P");
+                        }
+                        setState(State.GRACEFUL_SHUTDOWN);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Cancel Graceful Shutdown
+     *
+     * @since 0.9.19
+     */
+    public void cancelGracefulShutdown() {
+        Util.d("cancelGracefulShutdown called"
+                + " Current state is: " + _state);
+        synchronized(_stateLock) {
+            if(_state != State.GRACEFUL_SHUTDOWN) {
+                return;
+            }
+            RouterContext ctx = _context;
+            if(ctx != null && ctx.router().isAlive()) {
+                ctx.router().cancelGracefulShutdown();
+                _currTitle = _oldTitle;
+                if (_hadTunnels) {
+                    setState(State.ACTIVE);
+                    _statusBar.replace(StatusBar.ICON_ACTIVE, "Shutdown cancelled");
+                } else {
+                    setState(State.RUNNING);
+                    _statusBar.replace(StatusBar.ICON_RUNNING, "Shutdown cancelled");
+                }
+            }
+        }
+    }
+
+
+
     // ******** end methods accessed from Activities and Receivers ************
 
     private static final int STATE_MSG = 1;
@@ -579,29 +560,40 @@ public class RouterService extends Service {
     /**
      * Our Handler used to execute operations on the main thread.
      */
-    private final Handler mHandler = new Handler() {
+    private final Handler mHandler = new StateHandler(new WeakReference<>(this));
+    private static class StateHandler extends Handler {
+        WeakReference<RouterService> mReference;
+
+        public StateHandler(WeakReference<RouterService> reference) {
+            mReference = reference;
+        }
+
         @Override
         public void handleMessage(Message msg) {
+            RouterService parent = mReference.get();
+            if (parent == null)
+                return;
+
             switch (msg.what) {
             case STATE_MSG:
-                final State state = _state;
+                final State state = parent._state;
                 // Broadcast to all clients the new state.
-                final int N = mStateCallbacks.beginBroadcast();
+                final int N = parent.mStateCallbacks.beginBroadcast();
                 for (int i = 0; i < N; i++) {
                     try {
-                        mStateCallbacks.getBroadcastItem(i).stateChanged(state);
+                        parent.mStateCallbacks.getBroadcastItem(i).stateChanged(state);
                     } catch (RemoteException e) {
                         // The RemoteCallbackList will take care of removing
                         // the dead object for us.
                     }
                 }
-                mStateCallbacks.finishBroadcast();
+                parent.mStateCallbacks.finishBroadcast();
                 break;
             default:
                 super.handleMessage(msg);
             }
         }
-    };
+    }
 
     /**
      * Turn off the status bar. Unregister the receiver. If we were running,
@@ -615,6 +607,8 @@ public class RouterService extends Service {
         _handler.removeCallbacks(_updater);
         _statusBar.remove();
 
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(onStateRequested);
+
         I2PReceiver rcvr = _receiver;
         if(rcvr != null) {
             synchronized(rcvr) {
@@ -631,7 +625,8 @@ public class RouterService extends Service {
             if(_state == State.STARTING) {
                 _starterThread.interrupt();
             }
-            if(_state == State.STARTING || _state == State.RUNNING || _state == State.ACTIVE) {
+            if(_state == State.STARTING || _state == State.RUNNING ||
+               _state == State.ACTIVE || _state == State.GRACEFUL_SHUTDOWN) {
                 // should this be in a thread?
                 _statusBar.replace(StatusBar.ICON_SHUTTING_DOWN, "I2P is shutting down");
                 Thread stopperThread = new Thread(new Stopper(State.STOPPING, State.STOPPED));
@@ -708,7 +703,8 @@ public class RouterService extends Service {
                     _starterThread.interrupt();
                 }
                 if(_state == State.WAITING || _state == State.STARTING
-                        || _state == State.RUNNING || _state == State.ACTIVE) {
+                        || _state == State.RUNNING || _state == State.ACTIVE
+                        || _state == State.GRACEFUL_SHUTDOWN) {
                     setState(State.STOPPING);
                 }
             }
@@ -750,7 +746,7 @@ public class RouterService extends Service {
                         mStateCallbacks.kill();
                         stopForeground(true);
                         stopSelf();
-                    } else if(_state == State.MANUAL_QUITTING) {
+                    } else if(_state == State.MANUAL_QUITTING || _state == State.GRACEFUL_SHUTDOWN) {
                         setState(State.MANUAL_QUITTED);
                         // Unregister all callbacks.
                         mStateCallbacks.kill();
@@ -777,6 +773,13 @@ public class RouterService extends Service {
     private void setState(State s) {
         _state = s;
         saveState();
+
+        // Broadcast the new state within this app.
+        Intent intent = new Intent(LOCAL_BROADCAST_STATE_CHANGED);
+        intent.putExtra(LOCAL_BROADCAST_EXTRA_STATE, (android.os.Parcelable) _state);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
+
+        // Notify other apps that the state has changed
         mHandler.sendEmptyMessage(STATE_MSG);
     }
 

app/src/main/java/net/i2p/android/router/service/StatSummarizer.java

@@ -1,14 +1,15 @@
 package net.i2p.android.router.service;
 
+import net.i2p.android.router.util.Util;
+import net.i2p.router.RouterContext;
+import net.i2p.stat.Rate;
+import net.i2p.stat.RateStat;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import net.i2p.router.RouterContext;
-import net.i2p.stat.Rate;
-import net.i2p.stat.RateStat;
-
 public class StatSummarizer implements Runnable {
     private final RouterContext _context;
     private final List<SummaryListener> _listeners;
@@ -18,15 +19,20 @@ public class StatSummarizer implements Runnable {
     private Thread _thread;
 
     public StatSummarizer() {
-        _context = RouterContext.listContexts().get(0);
-        _listeners = new CopyOnWriteArrayList<SummaryListener>();
+        _context = Util.getRouterContext();
+        _listeners = new CopyOnWriteArrayList<>();
         _instance = this;
-        _context.addShutdownTask(new Shutdown());
+        if (_context != null)
+            _context.addShutdownTask(new Shutdown());
     }
 
     public static StatSummarizer instance() { return _instance; }
 
     public void run() {
+        // We can't do anything without a RouterContext
+        if (_context == null)
+            return;
+
         _thread = Thread.currentThread();
         String specs = "";
         while (_isRunning && _context.router().isAlive()) {
@@ -103,7 +109,7 @@ public class StatSummarizer implements Runnable {
      */
     List<Rate> parseSpecs(String specs) {
         StringTokenizer tok = new StringTokenizer(specs, ",");
-        List<Rate> rv = new ArrayList<Rate>();
+        List<Rate> rv = new ArrayList<>();
         while (tok.hasMoreTokens()) {
             String spec = tok.nextToken();
             int split = spec.lastIndexOf('.');
@@ -111,7 +117,7 @@ public class StatSummarizer implements Runnable {
                 continue;
             String name = spec.substring(0, split);
             String per = spec.substring(split+1);
-            long period = -1;
+            long period;
             try {
                 period = Long.parseLong(per);
                 RateStat rs = _context.statManager().getRate(name);

app/src/main/java/net/i2p/android/router/stats/RateGraphActivity.java

@@ -1,8 +1,17 @@
 package net.i2p.android.router.stats;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.TreeSet;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
 
 import net.i2p.android.router.I2PActivityBase;
 import net.i2p.android.router.R;
@@ -10,20 +19,17 @@ import net.i2p.android.router.SettingsActivity;
 import net.i2p.android.router.service.StatSummarizer;
 import net.i2p.android.router.service.SummaryListener;
 import net.i2p.stat.Rate;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.ActionBar;
-import android.widget.ArrayAdapter;
-import android.widget.SpinnerAdapter;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
 
 public class RateGraphActivity extends I2PActivityBase {
     private static final String SELECTED_RATE = "selected_rate";
 
+    private String[] mRates;
+    private long[] mPeriods;
+    private Spinner mSpinner;
     private boolean mFinishOnResume;
 
     @Override
@@ -35,13 +41,13 @@ public class RateGraphActivity extends I2PActivityBase {
         if (StatSummarizer.instance() != null) {
             // Get the rates currently being graphed
             List<SummaryListener> listeners = StatSummarizer.instance().getListeners();
-            TreeSet<SummaryListener> ordered = new TreeSet<SummaryListener>(new AlphaComparator());
+            TreeSet<SummaryListener> ordered = new TreeSet<>(new AlphaComparator());
             ordered.addAll(listeners);
 
             if (ordered.size() > 0) {
                 // Extract the rates and periods
-                final String[] mRates = new String[ordered.size()];
-                final long[] mPeriods = new long[ordered.size()];
+                mRates = new String[ordered.size()];
+                mPeriods = new long[ordered.size()];
                 int i = 0;
                 for (SummaryListener listener : ordered) {
                     Rate r = listener.getRate();
@@ -50,35 +56,31 @@ public class RateGraphActivity extends I2PActivityBase {
                     i++;
                 }
 
-                // Set up action bar for drop-down list
-                ActionBar actionBar = getSupportActionBar();
-                actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+                mSpinner = (Spinner) findViewById(R.id.main_spinner);
+                mSpinner.setVisibility(View.VISIBLE);
 
-                SpinnerAdapter mSpinnerAdapter = new ArrayAdapter<String>(this,
-                        android.R.layout.simple_spinner_dropdown_item, mRates);
+                mSpinner.setAdapter(new ArrayAdapter<>(this,
+                        android.R.layout.simple_spinner_dropdown_item, mRates));
 
-                ActionBar.OnNavigationListener mNavigationListener = new ActionBar.OnNavigationListener() {
-                    String[] rates = mRates;
-                    long[] periods = mPeriods;
-
-                    public boolean onNavigationItemSelected(int position, long itemId) {
-                        String rateName = rates[position];
-                        long period = periods[position];
-                        RateGraphFragment f = RateGraphFragment.newInstance(rateName, period);
-                        getSupportFragmentManager().beginTransaction()
-                                .replace(R.id.main_fragment, f, rates[position]).commit();
-                        return true;
+                mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                    @Override
+                    public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                        selectRate(i);
                     }
-                };
 
-                actionBar.setListNavigationCallbacks(mSpinnerAdapter, mNavigationListener);
+                    @Override
+                    public void onNothingSelected(AdapterView<?> adapterView) {
+                    }
+                });
 
                 if (savedInstanceState != null) {
                     int selected = savedInstanceState.getInt(SELECTED_RATE);
-                    actionBar.setSelectedNavigationItem(selected);
-                }
+                    mSpinner.setSelection(selected);
+                } else
+                    selectRate(0);
             } else {
                 DialogFragment df = new DialogFragment() {
+                    @NonNull
                     @Override
                     public Dialog onCreateDialog(Bundle savedInstanceState) {
                         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -112,6 +114,7 @@ public class RateGraphActivity extends I2PActivityBase {
             }
         } else {
             DialogFragment df = new DialogFragment() {
+                @NonNull
                 @Override
                 public Dialog onCreateDialog(Bundle savedInstanceState) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -130,6 +133,14 @@ public class RateGraphActivity extends I2PActivityBase {
         }
     }
 
+    private void selectRate(int position) {
+        String rateName = mRates[position];
+        long period = mPeriods[position];
+        RateGraphFragment f = RateGraphFragment.newInstance(rateName, period);
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.main_fragment, f, rateName).commit();
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -142,8 +153,8 @@ public class RateGraphActivity extends I2PActivityBase {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt(SELECTED_RATE,
-                getSupportActionBar().getSelectedNavigationIndex());
+        if (mSpinner != null)
+            outState.putInt(SELECTED_RATE, mSpinner.getSelectedItemPosition());
     }
 
     private static class AlphaComparator implements Comparator<SummaryListener> {

app/src/main/java/net/i2p/android/router/stats/RateGraphFragment.java

@@ -1,11 +1,13 @@
 package net.i2p.android.router.stats;
 
-import java.text.DecimalFormat;
-import java.text.FieldPosition;
-import java.text.Format;
-import java.text.ParsePosition;
-import java.util.Observable;
-import java.util.Observer;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
 import com.androidplot.Plot;
 import com.androidplot.xy.BoundaryMode;
 import com.androidplot.xy.LineAndPointFormatter;
@@ -18,12 +20,13 @@ import net.i2p.android.router.R;
 import net.i2p.android.router.service.StatSummarizer;
 import net.i2p.android.router.service.SummaryListener;
 import net.i2p.android.router.util.Util;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+
+import java.text.DecimalFormat;
+import java.text.FieldPosition;
+import java.text.Format;
+import java.text.ParsePosition;
+import java.util.Observable;
+import java.util.Observer;
 
 public class RateGraphFragment extends I2PFragmentBase {
     // redraws a plot whenever an update is received:
@@ -131,8 +134,8 @@ public class RateGraphFragment extends I2PFragmentBase {
             _ratePlot.setRangeValueFormat(new Format() {
 
                 @Override
-                public StringBuffer format(Object obj, StringBuffer toAppendTo,
-                        FieldPosition pos) {
+                public StringBuffer format(Object obj, @NonNull StringBuffer toAppendTo,
+                        @NonNull FieldPosition pos) {
                     double val = ((Number) obj).doubleValue();
                     if (val >= 10 * 1000 * 1000)
                         return new DecimalFormat("0 M").format(val / (1000 * 1000), toAppendTo, pos);
@@ -147,7 +150,7 @@ public class RateGraphFragment extends I2PFragmentBase {
                 }
 
                 @Override
-                public Object parseObject(String source, ParsePosition pos) {
+                public Object parseObject(String source, @NonNull ParsePosition pos) {
                     return null;
                 }
 

app/src/main/java/net/i2p/android/router/util/AppCache.java

@@ -4,6 +4,9 @@ import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.net.Uri;
+
+import net.i2p.android.router.provider.CacheProvider;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -14,7 +17,6 @@ import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import net.i2p.android.router.provider.CacheProvider;
 
 /**
  *  A least recently used cache with a max number of entries
@@ -32,7 +34,7 @@ public class AppCache {
     /** the LRU cache */
     private final Map<Integer, Object> _cache;
 
-    private static final Integer DUMMY = Integer.valueOf(0);
+    private static final Integer DUMMY = 0;
     private static final String DIR_NAME = "appCache";
     /** fragment into this many subdirectories */
     private static final int NUM_DIRS = 32;
@@ -89,7 +91,7 @@ public class AppCache {
     public Uri addCacheFile(Uri key, boolean setAsCurrentBase) {
         int hash = toHash(key);
         synchronized(_cache) {
-            _cache.put(Integer.valueOf(hash), DUMMY);
+            _cache.put(hash, DUMMY);
         }
         // file:/// uri
         //return Uri.fromFile(toFile(hash)).toString();
@@ -104,7 +106,7 @@ public class AppCache {
     public void removeCacheFile(Uri key) {
         int hash = toHash(key);
         synchronized(_cache) {
-            _cache.remove(Integer.valueOf(hash));
+            _cache.remove(hash);
         }
         deleteContent(key);
     }
@@ -121,7 +123,7 @@ public class AppCache {
         // poke the LRU
         Object present;
         synchronized(_cache) {
-            present = _cache.get(Integer.valueOf(hash));
+            present = _cache.get(hash);
         }
         if (present != null)
             setAsCurrentBase(key);
@@ -173,17 +175,16 @@ public class AppCache {
         File[] files = dir.listFiles();
         if (files == null)
             return 0;
-        for (int i = 0; i < files.length; i++) {
-             File f = files[i];
-             if (f.isDirectory()) {
-                 rv += enumerate(f, fileList);
-             } else {
-                 long len = f.length();
-                 if (len > 0) {
-                     fileList.add(f);
-                     rv += len;
+        for (File f : files) {
+            if (f.isDirectory()) {
+                rv += enumerate(f, fileList);
+            } else {
+                long len = f.length();
+                if (len > 0) {
+                    fileList.add(f);
+                    rv += len;
                 } else {
-                     f.delete();
+                    f.delete();
                 }
             }
         }
@@ -195,7 +196,7 @@ public class AppCache {
         try {
             int hash = toHash(f);
             synchronized(_cache) {
-                _cache.put(Integer.valueOf(hash), DUMMY);
+                _cache.put(hash, DUMMY);
             }
         } catch (IllegalArgumentException iae) {
             Util.d("Huh bad file?" + iae);
@@ -294,7 +295,7 @@ public class AppCache {
         @Override
         public Object put(Integer key, Object value) {
             Object rv = super.put(key, value);
-            File f = toFile(key.intValue());
+            File f = toFile(key);
             if (f.exists()) {
                 _totalSize += f.length();
             }
@@ -306,7 +307,7 @@ public class AppCache {
         public Object remove(Object key) {
             Object rv = super.remove(key);
             if ( /* rv != null && */ key instanceof Integer) {
-                File f = toFile(((Integer)key).intValue());
+                File f = toFile((Integer) key);
                 if (f.exists()) {
                     _totalSize -= f.length();
                     f.delete();

app/src/main/java/net/i2p/android/router/util/BetterAsyncTaskLoader.java

@@ -0,0 +1,125 @@
+package net.i2p.android.router.util;
+
+import android.content.Context;
+import android.support.v4.content.AsyncTaskLoader;
+
+public abstract class BetterAsyncTaskLoader<T> extends AsyncTaskLoader<T> {
+    protected T mData;
+
+    public BetterAsyncTaskLoader(Context context) {
+        super(context);
+    }
+
+    /**
+     * Called when there is new data to deliver to the client.  The
+     * super class will take care of delivering it; the implementation
+     * here just adds a little more logic.
+     */
+    @Override
+    public void deliverResult(T data) {
+        if (isReset()) {
+            // An async query came in while the loader is stopped.  We
+            // don't need the result.
+            if (data != null) {
+                releaseResources(data);
+            }
+        }
+
+        // Hold a reference to the old data so it doesn't get garbage collected.
+        // We must protect it until the new data has been delivered.
+        T oldData = mData;
+        mData = data;
+
+        if (isStarted()) {
+            // If the Loader is currently started, we can immediately
+            // deliver its results.
+            super.deliverResult(data);
+        }
+
+        // Invalidate the old data as we don't need it any more.
+        if (oldData != null && oldData != data) {
+            releaseResources(oldData);
+        }
+    }
+
+    /**
+     * Handles a request to start the Loader.
+     */
+    @Override
+    protected void onStartLoading() {
+        if (mData != null) {
+            // Deliver any previously loaded data immediately.
+            deliverResult(mData);
+        }
+
+        // Start watching for changes
+        onStartMonitoring();
+
+        if (takeContentChanged() || mData == null) {
+            // When the observer detects a change, it should call onContentChanged()
+            // on the Loader, which will cause the next call to takeContentChanged()
+            // to return true. If this is ever the case (or if the current data is
+            // null), we force a new load.
+            forceLoad();
+        }
+    }
+
+    /**
+     * Handles a request to stop the Loader.
+     */
+    @Override
+    protected void onStopLoading() {
+        // The Loader is in a stopped state, so we should attempt to cancel the 
+        // current load (if there is one).
+        cancelLoad();
+
+        // Note that we leave the observer as is. Loaders in a stopped state
+        // should still monitor the data source for changes so that the Loader
+        // will know to force a new load if it is ever started again.
+    }
+
+    /**
+     * Handles a request to completely reset the Loader.
+     */
+    @Override
+    protected void onReset() {
+        super.onReset();
+
+        // Ensure the loader has been stopped.
+        onStopLoading();
+
+        // At this point we can release the resources associated with 'mData'.
+        if (mData != null) {
+            releaseResources(mData);
+            mData = null;
+        }
+
+        // Stop monitoring for changes.
+        onStopMonitoring();
+    }
+
+    /**
+     * Handles a request to cancel a load.
+     */
+    @Override
+    public void onCanceled(T data) {
+        // Attempt to cancel the current asynchronous load.
+        super.onCanceled(data);
+
+        // The load has been canceled, so we should release the resources
+        // associated with 'data'.
+        releaseResources(data);
+    }
+
+    protected abstract void onStartMonitoring();
+    protected abstract void onStopMonitoring();
+
+    /**
+     * Helper function to take care of releasing resources associated
+     * with an actively loaded data set.
+     * For a simple List, there is nothing to do. For something like a Cursor, we 
+     * would close it in this method. All resources associated with the Loader
+     * should be released here.
+     */
+    protected abstract void releaseResources(T data);
+}

app/src/main/java/net/i2p/android/router/util/ConnectionLimitPreference.java

@@ -0,0 +1,75 @@
+package net.i2p.android.router.util;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.preference.EditTextPreference;
+import android.text.InputType;
+import android.util.AttributeSet;
+
+import net.i2p.android.router.R;
+
+public class ConnectionLimitPreference extends EditTextPreference {
+    private boolean mValueInTitle;
+
+    public ConnectionLimitPreference(Context context) {
+        this(context, null);
+    }
+
+    public ConnectionLimitPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public ConnectionLimitPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context, attrs);
+    }
+
+    void init(Context context, AttributeSet attrs) {
+        getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED);
+        TypedArray attr = context.obtainStyledAttributes(attrs, R.styleable.ConnectionLimitPreference, 0, 0);
+        mValueInTitle = attr.getBoolean(R.styleable.ConnectionLimitPreference_clp_valueInTitle, false);
+        attr.recycle();
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        if (mValueInTitle)
+            return formatValue((String) super.getTitle());
+        else
+            return super.getTitle();
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (mValueInTitle)
+            return super.getSummary();
+        else
+            return formatValue((String) super.getSummary());
+    }
+
+    private CharSequence formatValue(String format) {
+        String text = getText();
+        if ("0".equals(text))
+            text = getContext().getString(R.string.unlimited);
+
+        if (format == null)
+            format = "%s";
+        return String.format(format, text);
+    }
+
+    @Override
+    protected String getPersistedString(String defaultReturnValue) {
+        if(getSharedPreferences().contains(getKey())) {
+            int intValue = getPersistedInt(0);
+            return String.valueOf(intValue);
+        } else {
+            return defaultReturnValue;
+        }
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        return value != null && persistInt(Integer.valueOf(value));
+    }
+}

app/src/main/java/net/i2p/android/router/util/Connectivity.java

@@ -0,0 +1,134 @@
+// License: MIT
+// http://opensource.org/licenses/MIT
+package net.i2p.android.router.util;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.telephony.TelephonyManager;
+
+/**
+ * Check device's network connectivity and speed.
+ *
+ * @author emil http://stackoverflow.com/users/220710/emil
+ * @author str4d
+ */
+public class Connectivity {
+    /**
+     * Get the network info.
+     *
+     * @param context the Context.
+     * @return the active NetworkInfo.
+     */
+    public static NetworkInfo getNetworkInfo(Context context) {
+        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        return cm.getActiveNetworkInfo();
+    }
+
+    /**
+     * Check if there is any connectivity at all.
+     *
+     * @param context the Context.
+     * @return true if we are connected to a network, false otherwise.
+     */
+    public static boolean isConnected(Context context) {
+        NetworkInfo info = Connectivity.getNetworkInfo(context);
+        // Works on emulator and devices.
+        // Note the use of isAvailable() - without this, isConnected() can
+        // return true when Wifi is disabled.
+        // http://stackoverflow.com/a/2937915
+        return (info != null && info.isAvailable() && info.isConnected());
+    }
+
+    /**
+     * Check if there is any connectivity to a Wifi network.
+     *
+     * @param context the Context.
+     * @return true if we are connected to a Wifi network, false otherwise.
+     */
+    public static boolean isConnectedWifi(Context context) {
+        NetworkInfo info = Connectivity.getNetworkInfo(context);
+        return (info != null && info.isAvailable() && info.isConnected() &&
+                info.getType() == ConnectivityManager.TYPE_WIFI);
+    }
+
+    /**
+     * Check if there is any connectivity to a mobile network.
+     *
+     * @param context the Context.
+     * @return true if we are connected to a mobile network, false otherwise.
+     */
+    public static boolean isConnectedMobile(Context context) {
+        NetworkInfo info = Connectivity.getNetworkInfo(context);
+        return (info != null && info.isAvailable() && info.isConnected() &&
+                info.getType() == ConnectivityManager.TYPE_MOBILE);
+    }
+
+    /**
+     * Check if there is fast connectivity.
+     *
+     * @param context the Context.
+     * @return true if we have "fast" connectivity, false otherwise.
+     */
+    public static boolean isConnectedFast(Context context) {
+        NetworkInfo info = Connectivity.getNetworkInfo(context);
+        return (info != null && info.isAvailable() && info.isConnected() &&
+                Connectivity.isConnectionFast(info.getType(), info.getSubtype()));
+    }
+
+    /**
+     * Check if the connection is fast.
+     *
+     * @param type the network type.
+     * @param subType the network subtype.
+     * @return true if the provided type/subtype combination is classified as fast.
+     */
+    public static boolean isConnectionFast(int type, int subType) {
+        if (type == ConnectivityManager.TYPE_WIFI) {
+            return true;
+        } else if (type == ConnectivityManager.TYPE_MOBILE) {
+            switch (subType) {
+                case TelephonyManager.NETWORK_TYPE_1xRTT:
+                    return false; // ~ 50-100 kbps
+                case TelephonyManager.NETWORK_TYPE_CDMA:
+                    return false; // ~ 14-64 kbps
+                case TelephonyManager.NETWORK_TYPE_EDGE:
+                    return false; // ~ 50-100 kbps
+                case TelephonyManager.NETWORK_TYPE_EVDO_0:
+                    return true; // ~ 400-1000 kbps
+                case TelephonyManager.NETWORK_TYPE_EVDO_A:
+                    return true; // ~ 600-1400 kbps
+                case TelephonyManager.NETWORK_TYPE_GPRS:
+                    return false; // ~ 100 kbps
+                case TelephonyManager.NETWORK_TYPE_HSDPA:
+                    return true; // ~ 2-14 Mbps
+                case TelephonyManager.NETWORK_TYPE_HSPA:
+                    return true; // ~ 700-1700 kbps
+                case TelephonyManager.NETWORK_TYPE_HSUPA:
+                    return true; // ~ 1-23 Mbps
+                case TelephonyManager.NETWORK_TYPE_UMTS:
+                    return true; // ~ 400-7000 kbps
+                /*
+                 * Above API level 7, make sure to set android:targetSdkVersion
+                 * to appropriate level to use these
+                 */
+                case TelephonyManager.NETWORK_TYPE_EHRPD: // API level 11
+                    return true; // ~ 1-2 Mbps
+                case TelephonyManager.NETWORK_TYPE_EVDO_B: // API level 9
+                    return true; // ~ 5 Mbps
+                case TelephonyManager.NETWORK_TYPE_HSPAP: // API level 13
+                    return true; // ~ 10-20 Mbps
+                case TelephonyManager.NETWORK_TYPE_IDEN: // API level 8
+                    return false; // ~25 kbps
+                case TelephonyManager.NETWORK_TYPE_LTE: // API level 11
+                    return true; // ~ 10+ Mbps
+                // Unknown
+                case TelephonyManager.NETWORK_TYPE_UNKNOWN:
+                default:
+                    return false;
+            }
+        } else {
+            return false;
+        }
+    }
+}

app/src/main/java/net/i2p/android/router/util/IntEditTextPreference.java

@@ -0,0 +1,47 @@
+package net.i2p.android.router.util;
+
+import android.content.Context;
+import android.preference.EditTextPreference;
+import android.text.InputType;
+import android.util.AttributeSet;
+
+public class IntEditTextPreference extends EditTextPreference {
+
+    public IntEditTextPreference(Context context) {
+        super(context);
+        getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED);
+    }
+
+    public IntEditTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED);
+    }
+
+    public IntEditTextPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        getEditText().setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        String summary = (String) super.getSummary();
+        if (summary == null)
+            summary = "%s";
+        return String.format(summary, getText());
+    }
+
+    @Override
+    protected String getPersistedString(String defaultReturnValue) {
+        if(getSharedPreferences().contains(getKey())) {
+            int intValue = getPersistedInt(0);
+            return String.valueOf(intValue);
+        } else {
+            return defaultReturnValue;
+        }
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        return value != null && persistInt(Integer.valueOf(value));
+    }
+}

app/src/main/java/net/i2p/android/router/util/IntListPreference.java

@@ -0,0 +1,34 @@
+package net.i2p.android.router.util;
+
+import android.content.Context;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+
+public class IntListPreference extends ListPreference {
+    public IntListPreference(Context context) {
+        super(context);
+    }
+
+    public IntListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        return value != null && persistInt(Integer.valueOf(value));
+    }
+
+    @Override
+    protected String getPersistedString(String defaultReturnValue) {
+        if(getSharedPreferences().contains(getKey())) {
+            try {
+                int intValue = getPersistedInt(0);
+                return String.valueOf(intValue);
+            } catch (ClassCastException e) {
+                return getPersistedString("0");
+            }
+        } else {
+            return defaultReturnValue;
+        }
+    }
+}

app/src/main/java/net/i2p/android/router/util/NamingServiceUtil.java

@@ -1,9 +1,5 @@
 package net.i2p.android.router.util;
 
-import java.net.IDN;
-import java.util.List;
-import java.util.Locale;
-
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
@@ -18,6 +14,10 @@ import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.router.RouterContext;
 
+import java.net.IDN;
+import java.util.List;
+import java.util.Locale;
+
 public class NamingServiceUtil {
     private static final String DEFAULT_NS = "BlockfileNamingService";
 
@@ -106,7 +106,7 @@ public class NamingServiceUtil {
      * Ref: java.net.IDN and RFC 3940
      * @param host will be converted to lower case
      * @return name converted to lower case and punycoded if necessary
-     * @throws IAE on various errors or if IDN is needed but not available
+     * @throws java.lang.IllegalArgumentException on various errors or if IDN is needed but not available
      * @since 0.8.7
      */
     @SuppressLint("NewApi")

app/src/main/java/net/i2p/android/router/util/PortPreference.java

@@ -0,0 +1,60 @@
+package net.i2p.android.router.util;
+
+import android.content.Context;
+import android.preference.EditTextPreference;
+import android.text.InputType;
+import android.util.AttributeSet;
+
+import net.i2p.android.router.R;
+
+public class PortPreference extends EditTextPreference {
+    public PortPreference(Context context) {
+        super(context);
+        getEditText().setInputType(InputType.TYPE_CLASS_NUMBER);
+    }
+
+    public PortPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        getEditText().setInputType(InputType.TYPE_CLASS_NUMBER);
+    }
+
+    public PortPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        getEditText().setInputType(InputType.TYPE_CLASS_NUMBER);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        int port = getPersistedInt(-1);
+        if (port < 0)
+            return getContext().getResources().getString(R.string.unset);
+        else
+            return String.valueOf(port);
+    }
+
+    @Override
+    protected String getPersistedString(String defaultReturnValue) {
+        int port = getPersistedInt(-1);
+        if (port < 0)
+            return defaultReturnValue;
+        else
+            return String.valueOf(port);
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        if (value == null || value.isEmpty())
+            return persistInt(-1);
+
+        int port;
+        try {
+            port = Integer.valueOf(value);
+            if (port < 0)
+                port = -1;
+        } catch (NumberFormatException e) {
+            port = -1;
+        }
+
+        return persistInt(port);
+    }
+}

app/src/main/java/net/i2p/android/router/util/SummaryEditTextPreference.java

@@ -0,0 +1,28 @@
+package net.i2p.android.router.util;
+
+import android.content.Context;
+import android.preference.EditTextPreference;
+import android.util.AttributeSet;
+
+public class SummaryEditTextPreference extends EditTextPreference {
+
+    public SummaryEditTextPreference(Context context) {
+        super(context);
+    }
+
+    public SummaryEditTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SummaryEditTextPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        String summary = (String) super.getSummary();
+        if (summary == null)
+            summary = "%s";
+        return String.format(summary, getText());
+    }
+}

app/src/main/java/net/i2p/android/router/util/Util.java

@@ -4,23 +4,31 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Build;
+import android.content.res.Resources;
 import android.preference.PreferenceManager;
 
 import net.i2p.I2PAppContext;
+import net.i2p.android.router.I2PConstants;
+import net.i2p.data.DataHelper;
+import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
+import net.i2p.router.transport.TransportManager;
+import net.i2p.router.transport.udp.UDPTransport;
 import net.i2p.util.OrderedProperties;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-public abstract class Util {
-    private static final boolean _isEmulator = Build.MODEL.equals("sdk");
-
+public abstract class Util implements I2PConstants {
     public static String getOurVersion(Context ctx) {
         PackageManager pm = ctx.getPackageManager();
         String us = ctx.getPackageName();
@@ -36,18 +44,17 @@ public abstract class Util {
         return "??";
     }
 
-    public static boolean isConnected(Context ctx) {
-        // emulator always returns null NetworkInfo
-        if (_isEmulator)
-            return true;
-        NetworkInfo current = getNetworkInfo(ctx);
-        return current != null && current.isConnected();
-    }
-
-    public static NetworkInfo getNetworkInfo(Context ctx) {
-        ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo current = cm.getActiveNetworkInfo();
-        return current;
+    /**
+     * Get the active RouterContext.
+     *
+     * @return the active RouterContext, or null
+     */
+    public static RouterContext getRouterContext() {
+        List<RouterContext> contexts = RouterContext.listContexts();
+        if ( !((contexts == null) || (contexts.isEmpty())) ) {
+            return contexts.get(0);
+        }
+        return null;
     }
 
     private static final String ANDROID_TAG = "I2P";
@@ -119,44 +126,46 @@ public abstract class Util {
         }
     }
 
+    /** copied from various private components */
+    final static String PROP_I2NP_NTCP_PORT = "i2np.ntcp.port";
+    final static String PROP_I2NP_NTCP_AUTO_PORT = "i2np.ntcp.autoport";
+
     public static List<Properties> getPropertiesFromPreferences(Context context) {
-        List<Properties> pList = new ArrayList<Properties>();
+        List<Properties> pList = new ArrayList<>();
 
         // Copy prefs
         Properties routerProps = new OrderedProperties();
 
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-
         // List to store stats for graphing
-        List<String> statSummaries = new ArrayList<String>();
+        List<String> statSummaries = new ArrayList<>();
+
+        // Properties to remove
+        Properties toRemove = new OrderedProperties();
 
         // List to store Log settings
         Properties logSettings = new OrderedProperties();
 
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
         Map<String, ?> all = preferences.getAll();
-        Iterator<String> iterator = all.keySet().iterator();
         // get values from the Map and make them strings.
         // This loop avoids needing to convert each one, or even know it's type, or if it exists yet.
-        while (iterator.hasNext()) {
-            String x = iterator.next();
-            if ( x.startsWith("i2pandroid.")) // Skip over UI-related I2P Android settings
-                continue;
-            else if ( x.startsWith("stat.summaries.")) {
+        for (String x : all.keySet()) {
+            if (x.startsWith("stat.summaries.")) {
                 String stat = x.substring("stat.summaries.".length());
                 String checked = all.get(x).toString();
                 if (checked.equals("true")) {
                     statSummaries.add(stat);
                 }
-            } else if ( x.startsWith("logger.")) {
+            } else if (x.startsWith("logger.")) {
                 logSettings.put(x, all.get(x).toString());
             } else if (
                     x.equals("router.hiddenMode") ||
-                    x.equals("i2cp.disableInterface")) {
+                            x.equals("i2cp.disableInterface")) {
                 // special exception, we must invert the bool for these properties only.
                 String string = all.get(x).toString();
                 String inverted = Boolean.toString(!Boolean.parseBoolean(string));
                 routerProps.setProperty(x, inverted);
-            } else {
+            } else if (!x.startsWith(ANDROID_PREF_PREFIX)) { // Skip over UI-related I2P Android settings
                 String string = all.get(x).toString();
                 routerProps.setProperty(x, string);
             }
@@ -172,9 +181,161 @@ public abstract class Util {
             routerProps.setProperty("stat.summaries", buf.toString());
         }
 
+        // See net.i2p.router.web.ConfigNetHandler.saveChanges()
+        int udpPort = Integer.parseInt(routerProps.getProperty(UDPTransport.PROP_INTERNAL_PORT, "-1"));
+        if (udpPort <= 0)
+            routerProps.remove(UDPTransport.PROP_INTERNAL_PORT);
+        int ntcpPort = Integer.parseInt(routerProps.getProperty(PROP_I2NP_NTCP_PORT, "-1"));
+        boolean ntcpAutoPort = Boolean.parseBoolean(
+                routerProps.getProperty(PROP_I2NP_NTCP_AUTO_PORT, "true"));
+        if (ntcpPort <= 0 || ntcpAutoPort) {
+            routerProps.remove(PROP_I2NP_NTCP_PORT);
+            toRemove.setProperty(PROP_I2NP_NTCP_PORT, "");
+        }
+
         pList.add(routerProps);
+        pList.add(toRemove);
         pList.add(logSettings);
 
         return pList;
     }
+
+    // propName -> defaultValue
+    private static HashMap<String, Boolean> booleanOptionsRequiringRestart = new HashMap<>();
+    private static HashMap<String, String> stringOptionsRequiringRestart = new HashMap<>();
+    static {
+        HashMap<String, Boolean> boolToAdd = new HashMap<>();
+        HashMap<String, String> strToAdd = new HashMap<>();
+
+        boolToAdd.put(TransportManager.PROP_ENABLE_UPNP, true);
+        boolToAdd.put(TransportManager.PROP_ENABLE_NTCP, true);
+        boolToAdd.put(TransportManager.PROP_ENABLE_UDP, true);
+        boolToAdd.put(PROP_I2NP_NTCP_AUTO_PORT, true);
+        boolToAdd.put(Router.PROP_HIDDEN, false);
+
+        strToAdd.put(UDPTransport.PROP_INTERNAL_PORT, "-1");
+        strToAdd.put(PROP_I2NP_NTCP_PORT, "-1");
+
+        booleanOptionsRequiringRestart.putAll(boolToAdd);
+        stringOptionsRequiringRestart.putAll(strToAdd);
+    }
+    /**
+     * This function performs two tasks:
+     * <ul><li>
+     * The Properties object is modified to ensure that all options are valid
+     * for the current state of the Android device (e.g. what type of network
+     * the device is connected to).
+     * </li><li>
+     * The Properties object is checked to determine whether any options have
+     * changed that will require a router restart.
+     * </li></ul>
+     *
+     * @param props a Properties object containing the router.config
+     * @param toRemove a Collection of properties that will be removed
+     * @return true if the router needs to be restarted.
+     */
+    public static boolean checkAndCorrectRouterConfig(Context context, Properties props, Collection<String> toRemove) {
+        // Disable UPnP on mobile networks, ignoring user's configuration
+        // TODO disabled until changes elsewhere are finished
+        //if (Connectivity.isConnectedMobile(context)) {
+        //    props.setProperty(TransportManager.PROP_ENABLE_UPNP, Boolean.toString(false));
+        //}
+
+        // Now check if a restart is required
+        boolean restartRequired = false;
+        RouterContext rCtx = getRouterContext();
+        if (rCtx != null) {
+            for (Map.Entry<String, Boolean> option : booleanOptionsRequiringRestart.entrySet()) {
+                String propName = option.getKey();
+                boolean defaultValue = option.getValue();
+                boolean currentValue = defaultValue ? rCtx.getBooleanPropertyDefaultTrue(propName) : rCtx.getBooleanProperty(propName);
+                boolean newValue = Boolean.parseBoolean(props.getProperty(propName, Boolean.toString(defaultValue)));
+                restartRequired |= (currentValue != newValue);
+            }
+            if (!restartRequired) { // Cut out now if we already know the answer
+                for (Map.Entry<String, String> option : stringOptionsRequiringRestart.entrySet()) {
+                    String propName = option.getKey();
+                    String defaultValue = option.getValue();
+                    String currentValue = rCtx.getProperty(propName, defaultValue);
+                    String newValue = props.getProperty(propName, defaultValue);
+                    restartRequired |= !currentValue.equals(newValue);
+                }
+            }
+        }
+        return restartRequired;
+    }
+
+    public static String getFileDir(Context context) {
+        // This needs to be changed so that we can have an alternative place
+        return context.getFilesDir().getAbsolutePath();
+    }
+
+    /**
+     *  Write properties to a file. If the file does not exist, it is created.
+     *  If the properties already exist in the file, they are updated.
+     *
+     *  @param dir the file directory
+     *  @param file relative to dir
+     *  @param props properties to set
+     */
+    public static void writePropertiesToFile(Context ctx, String dir, String file, Properties props) {
+        mergeResourceToFile(ctx, dir, file, 0, props, null);
+    }
+
+    /**
+     *  Load defaults from resource, then add props from settings, and write back.
+     *  If resID is 0, defaults are not written over the existing file content.
+     *
+     *  @param dir the file directory
+     *  @param file relative to dir
+     *  @param resID the ID of the default resource, or 0
+     *  @param userProps local properties or null
+     *  @param toRemove properties to remove, or null
+     */
+    public static void mergeResourceToFile(Context ctx, String dir, String file, int resID,
+                                           Properties userProps, Collection<String> toRemove) {
+        InputStream fin = null;
+        InputStream in = null;
+
+        try {
+            Properties props = new OrderedProperties();
+            try {
+                fin = new FileInputStream(new File(dir, file));
+                DataHelper.loadProps(props, fin);
+                if (resID > 0)
+                    Util.d("Merging resource into file " + file);
+                else
+                    Util.d("Merging properties into file " + file);
+            } catch (IOException ioe) {
+                if (resID > 0)
+                    Util.d("Creating file " + file + " from resource");
+                else
+                    Util.d("Creating file " + file + " from properties");
+            }
+
+            // write in default settings
+            if (resID > 0)
+                in = ctx.getResources().openRawResource(resID);
+            if (in != null)
+                DataHelper.loadProps(props,  in);
+
+            // override with user settings
+            if (userProps != null)
+                props.putAll(userProps);
+            if (toRemove != null) {
+                for (String key : toRemove) {
+                    props.remove(key);
+                }
+            }
+
+            File path = new File(dir, file);
+            DataHelper.storeProps(props, path);
+            Util.d("Saved " + props.size() +" properties in " + file);
+        } catch (IOException ioe) {
+        } catch (Resources.NotFoundException nfe) {
+        } finally {
+            if (in != null) try { in.close(); } catch (IOException ioe) {}
+            if (fin != null) try { fin.close(); } catch (IOException ioe) {}
+        }
+    }
 }

app/src/main/java/net/i2p/android/router/web/I2PWebViewClient.java

@@ -20,6 +20,7 @@ import java.io.OutputStream;
 import net.i2p.android.apps.EepGetFetcher;
 import net.i2p.android.router.provider.CacheProvider;
 import net.i2p.android.router.util.AppCache;
+import net.i2p.android.router.util.Connectivity;
 import net.i2p.android.router.util.Util;
 import net.i2p.data.DataHelper;
 import net.i2p.util.EepGet;
@@ -77,7 +78,7 @@ public class I2PWebViewClient extends WebViewClient {
                 return true;
             }
 
-            if (!Util.isConnected(view.getContext())) {
+            if (!Connectivity.isConnected(view.getContext())) {
                 fail(view, "No Internet connection is available");
                 return true;
             }
@@ -193,8 +194,7 @@ public class I2PWebViewClient extends WebViewClient {
     /**
      *  This should always be a content url
      */
-    void deleteCurrentPageCache(WebView view) {
-        String url = view.getUrl();
+    void deleteCurrentPageCache(WebView view, String url) {
         Uri uri = Uri.parse(url);
         if (CONTENT.equals(uri.getScheme())) {
             try {

app/src/main/java/net/i2p/android/router/web/WebFragment.java

@@ -22,6 +22,7 @@ import net.i2p.android.router.R;
 public class WebFragment extends I2PFragmentBase {
 
     private I2PWebViewClient _wvClient;
+    private String _uriStr;
 
     public final static String HTML_URI = "html_url";
     public final static String HTML_RESOURCE_ID = "html_resource_id";
@@ -48,9 +49,9 @@ public class WebFragment extends I2PFragmentBase {
         wv.getSettings().setBuiltInZoomControls(true);
         // http://stackoverflow.com/questions/2369310/webview-double-tap-zoom-not-working-on-a-motorola-droid-a855
         wv.getSettings().setUseWideViewPort(true);
-        String uriStr =  getArguments().getString(HTML_URI);
-        if (uriStr != null) {
-            Uri uri = Uri.parse(uriStr);
+        _uriStr =  getArguments().getString(HTML_URI);
+        if (_uriStr != null) {
+            Uri uri = Uri.parse(_uriStr);
             //wv.getSettings().setLoadsImagesAutomatically(true);
             //wv.loadUrl(uri.toString());
             // go thru the client so .i2p will work too
@@ -115,14 +116,18 @@ public class WebFragment extends I2PFragmentBase {
             _wvClient.cancelAll();
             wv.stopLoading();
             String url = wv.getUrl();
-            Uri uri = Uri.parse(url);
+            // If a resource, _uriStr == null but url != null (resource loads don't fail)
+            // If a URL, _uriStr != null and url might be null (if pageload failed)
+            if (url != null && (!url.equals(_uriStr)))
+                _uriStr = url;
+            Uri uri = Uri.parse(_uriStr);
             if ("data".equals(uri.getScheme())) {
                 // welcome page... or just do nothing ?
                 wv.reload();
             } else {
                 // wv.reload() doesn't call shouldOverrideUrlLoading(), so do it this way
-                _wvClient.deleteCurrentPageCache(wv);
-                _wvClient.shouldOverrideUrlLoading(wv, url);
+                _wvClient.deleteCurrentPageCache(wv, _uriStr);
+                _wvClient.shouldOverrideUrlLoading(wv, _uriStr);
             }
             return true;
 

app/src/main/java/net/i2p/i2ptunnel/I2PTunnelGUI.java

@@ -1,9 +0,0 @@
-package net.i2p.i2ptunnel;
-
-/**
- *  Stub since no AWT in Android
- */
-public class I2PTunnelGUI {
-
-    public I2PTunnelGUI(I2PTunnel t) {}
-}

app/src/main/java/org/sufficientlysecure/htmltextview/HtmlTagHandler.java

@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2013-2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2013 Mohammed Lakkadshaw
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.htmltextview;
+
+import java.util.Vector;
+
+import org.xml.sax.XMLReader;
+
+import android.text.Editable;
+import android.text.Html;
+import android.text.Layout;
+import android.text.Spannable;
+import android.text.style.AlignmentSpan;
+import android.text.style.BulletSpan;
+import android.text.style.LeadingMarginSpan;
+import android.text.style.TypefaceSpan;
+import android.util.Log;
+
+/**
+ * Some parts of this code are based on android.text.Html
+ */
+public class HtmlTagHandler implements Html.TagHandler {
+    private int mListItemCount = 0;
+    private Vector<String> mListParents = new Vector<String>();
+
+    private static class Code {
+    }
+
+    private static class Center {
+    }
+
+    @Override
+    public void handleTag(final boolean opening, final String tag, Editable output, final XMLReader xmlReader) {
+        if (opening) {
+            // opening tag
+            if (HtmlTextView.DEBUG) {
+                Log.d(HtmlTextView.TAG, "opening, output: " + output.toString());
+            }
+
+            if (tag.equalsIgnoreCase("ul") || tag.equalsIgnoreCase("ol") || tag.equalsIgnoreCase("dd")) {
+                mListParents.add(tag);
+                mListItemCount = 0;
+            } else if (tag.equalsIgnoreCase("code")) {
+                start(output, new Code());
+            } else if (tag.equalsIgnoreCase("center")) {
+                start(output, new Center());
+            }
+        } else {
+            // closing tag
+            if (HtmlTextView.DEBUG) {
+                Log.d(HtmlTextView.TAG, "closing, output: " + output.toString());
+            }
+
+            if (tag.equalsIgnoreCase("ul") || tag.equalsIgnoreCase("ol") || tag.equalsIgnoreCase("dd")) {
+                mListParents.remove(tag);
+                mListItemCount = 0;
+            } else if (tag.equalsIgnoreCase("li")) {
+                handleListTag(output);
+            } else if (tag.equalsIgnoreCase("code")) {
+                end(output, Code.class, new TypefaceSpan("monospace"), false);
+            } else if (tag.equalsIgnoreCase("center")) {
+                end(output, Center.class, new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER), true);
+            }
+        }
+    }
+
+    /**
+     * Mark the opening tag by using private classes
+     *
+     * @param output
+     * @param mark
+     */
+    private void start(Editable output, Object mark) {
+        int len = output.length();
+        output.setSpan(mark, len, len, Spannable.SPAN_MARK_MARK);
+
+        if (HtmlTextView.DEBUG) {
+            Log.d(HtmlTextView.TAG, "len: " + len);
+        }
+    }
+
+    private void end(Editable output, Class kind, Object repl, boolean paragraphStyle) {
+        Object obj = getLast(output, kind);
+        // start of the tag
+        int where = output.getSpanStart(obj);
+        // end of the tag
+        int len = output.length();
+
+        output.removeSpan(obj);
+
+        if (where != len) {
+            // paragraph styles like AlignmentSpan need to end with a new line!
+            if (paragraphStyle) {
+                output.append("\n");
+                len++;
+            }
+            output.setSpan(repl, where, len, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        if (HtmlTextView.DEBUG) {
+            Log.d(HtmlTextView.TAG, "where: " + where);
+            Log.d(HtmlTextView.TAG, "len: " + len);
+        }
+    }
+
+    /**
+     * Get last marked position of a specific tag kind (private class)
+     *
+     * @param text
+     * @param kind
+     * @return
+     */
+    private Object getLast(Editable text, Class kind) {
+        Object[] objs = text.getSpans(0, text.length(), kind);
+        if (objs.length == 0) {
+            return null;
+        } else {
+            for (int i = objs.length; i > 0; i--) {
+                if (text.getSpanFlags(objs[i - 1]) == Spannable.SPAN_MARK_MARK) {
+                    return objs[i - 1];
+                }
+            }
+            return null;
+        }
+    }
+
+    private void handleListTag(Editable output) {
+        if (mListParents.lastElement().equals("ul")) {
+            output.append("\n");
+            String[] split = output.toString().split("\n");
+
+            int lastIndex = split.length - 1;
+            int start = output.length() - split[lastIndex].length() - 1;
+            output.setSpan(new BulletSpan(15 * mListParents.size()), start, output.length(), 0);
+        } else if (mListParents.lastElement().equals("ol")) {
+            mListItemCount++;
+
+            output.append("\n");
+            String[] split = output.toString().split("\n");
+
+            int lastIndex = split.length - 1;
+            int start = output.length() - split[lastIndex].length() - 1;
+            output.insert(start, mListItemCount + ". ");
+            output.setSpan(new LeadingMarginSpan.Standard(15 * mListParents.size()), start, output.length(), 0);
+        }
+    }
+} 

app/src/main/java/org/sufficientlysecure/htmltextview/HtmlTextView.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2013-2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.htmltextview;
+
+import android.content.Context;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.util.AttributeSet;
+
+import java.io.InputStream;
+
+public class HtmlTextView extends JellyBeanSpanFixTextView {
+
+    public static final String TAG = "HtmlTextView";
+    public static final boolean DEBUG = false;
+
+    public HtmlTextView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public HtmlTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public HtmlTextView(Context context) {
+        super(context);
+    }
+
+    /**
+     * http://stackoverflow.com/questions/309424/read-convert-an-inputstream-to-a-string
+     *
+     * @param is
+     * @return
+     */
+    static private String convertStreamToString(java.io.InputStream is) {
+        java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A");
+        return s.hasNext() ? s.next() : "";
+    }
+
+    /**
+     * Loads HTML from a raw resource, i.e., a HTML file in res/raw/.
+     * This allows translatable resource (e.g., res/raw-de/ for german).
+     * The containing HTML is parsed to Android's Spannable format and then displayed.
+     *
+     * @param context
+     * @param id      for example: R.raw.help
+     */
+    public void setHtmlFromRawResource(Context context, int id, boolean useLocalDrawables) {
+        // load html from html file from /res/raw
+        InputStream inputStreamText = context.getResources().openRawResource(id);
+
+        setHtmlFromString(convertStreamToString(inputStreamText), useLocalDrawables);
+    }
+
+    /**
+     * Parses String containing HTML to Android's Spannable format and displays it in this TextView.
+     *
+     * @param html String containing HTML, for example: "<b>Hello world!</b>"
+     */
+    public void setHtmlFromString(String html, boolean useLocalDrawables) {
+        Html.ImageGetter imgGetter;
+        if (useLocalDrawables) {
+            imgGetter = new LocalImageGetter(getContext());
+        } else {
+            imgGetter = new UrlImageGetter(this, getContext());
+        }
+        // this uses Android's Html class for basic parsing, and HtmlTagHandler
+        setText(Html.fromHtml(html, imgGetter, new HtmlTagHandler()));
+
+        // make links work
+        setMovementMethod(LinkMovementMethod.getInstance());
+
+        // no flickering when clicking textview for Android < 4, but overriders color...
+//        text.setTextColor(getResources().getColor(android.R.color.secondary_text_dark_nodisable));
+    }
+}

app/src/main/java/org/sufficientlysecure/htmltextview/JellyBeanSpanFixTextView.java

@@ -0,0 +1,209 @@
+/*
+ * Copyright (C) 2013 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2012 Pierre-Yves Ricau <py.ricau@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.htmltextview;
+
+import android.content.Context;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p/>
+ * A {@link android.widget.TextView} that insert spaces around its text spans where needed to prevent
+ * {@link IndexOutOfBoundsException} in {@link #onMeasure(int, int)} on Jelly Bean.
+ * <p/>
+ * When {@link #onMeasure(int, int)} throws an exception, we try to fix the text by adding spaces
+ * around spans, until it works again. We then try removing some of the added spans, to minimize the
+ * insertions.
+ * <p/>
+ * The fix is time consuming (a few ms, it depends on the size of your text), but it should only
+ * happen once per text change.
+ * <p/>
+ * See http://code.google.com/p/android/issues/detail?id=35466
+ */
+public class JellyBeanSpanFixTextView extends TextView {
+
+    private static class FixingResult {
+        public final boolean fixed;
+        public final List<Object> spansWithSpacesBefore;
+        public final List<Object> spansWithSpacesAfter;
+
+        public static FixingResult fixed(List<Object> spansWithSpacesBefore,
+                                         List<Object> spansWithSpacesAfter) {
+            return new FixingResult(true, spansWithSpacesBefore, spansWithSpacesAfter);
+        }
+
+        public static FixingResult notFixed() {
+            return new FixingResult(false, null, null);
+        }
+
+        private FixingResult(boolean fixed, List<Object> spansWithSpacesBefore,
+                             List<Object> spansWithSpacesAfter) {
+            this.fixed = fixed;
+            this.spansWithSpacesBefore = spansWithSpacesBefore;
+            this.spansWithSpacesAfter = spansWithSpacesAfter;
+        }
+    }
+
+    public JellyBeanSpanFixTextView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public JellyBeanSpanFixTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public JellyBeanSpanFixTextView(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        try {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        } catch (IndexOutOfBoundsException e) {
+            fixOnMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+
+    /**
+     * If possible, fixes the Spanned text by adding spaces around spans when needed.
+     */
+    private void fixOnMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        CharSequence text = getText();
+        if (text instanceof Spanned) {
+            SpannableStringBuilder builder = new SpannableStringBuilder(text);
+            fixSpannedWithSpaces(builder, widthMeasureSpec, heightMeasureSpec);
+        } else {
+            if (HtmlTextView.DEBUG) {
+                Log.d(HtmlTextView.TAG, "The text isn't a Spanned");
+            }
+            fallbackToString(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+
+    /**
+     * Add spaces around spans until the text is fixed, and then removes the unneeded spaces
+     */
+    private void fixSpannedWithSpaces(SpannableStringBuilder builder, int widthMeasureSpec,
+                                      int heightMeasureSpec) {
+        long startFix = System.currentTimeMillis();
+
+        FixingResult result = addSpacesAroundSpansUntilFixed(builder, widthMeasureSpec,
+                heightMeasureSpec);
+
+        if (result.fixed) {
+            removeUnneededSpaces(widthMeasureSpec, heightMeasureSpec, builder, result);
+        } else {
+            fallbackToString(widthMeasureSpec, heightMeasureSpec);
+        }
+
+        if (HtmlTextView.DEBUG) {
+            long fixDuration = System.currentTimeMillis() - startFix;
+            Log.d(HtmlTextView.TAG, "fixSpannedWithSpaces() duration in ms: " + fixDuration);
+        }
+    }
+
+    private FixingResult addSpacesAroundSpansUntilFixed(SpannableStringBuilder builder,
+                                                        int widthMeasureSpec, int heightMeasureSpec) {
+
+        Object[] spans = builder.getSpans(0, builder.length(), Object.class);
+        List<Object> spansWithSpacesBefore = new ArrayList<Object>(spans.length);
+        List<Object> spansWithSpacesAfter = new ArrayList<Object>(spans.length);
+
+        for (Object span : spans) {
+            int spanStart = builder.getSpanStart(span);
+            if (isNotSpace(builder, spanStart - 1)) {
+                builder.insert(spanStart, " ");
+                spansWithSpacesBefore.add(span);
+            }
+
+            int spanEnd = builder.getSpanEnd(span);
+            if (isNotSpace(builder, spanEnd)) {
+                builder.insert(spanEnd, " ");
+                spansWithSpacesAfter.add(span);
+            }
+
+            try {
+                setTextAndMeasure(builder, widthMeasureSpec, heightMeasureSpec);
+                return FixingResult.fixed(spansWithSpacesBefore, spansWithSpacesAfter);
+            } catch (IndexOutOfBoundsException notFixed) {
+            }
+        }
+        if (HtmlTextView.DEBUG) {
+            Log.d(HtmlTextView.TAG, "Could not fix the Spanned by adding spaces around spans");
+        }
+        return FixingResult.notFixed();
+    }
+
+    private boolean isNotSpace(CharSequence text, int where) {
+        return where < 0 || text.charAt(where) != ' ';
+    }
+
+    private void setTextAndMeasure(CharSequence text, int widthMeasureSpec, int heightMeasureSpec) {
+        setText(text);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    private void removeUnneededSpaces(int widthMeasureSpec, int heightMeasureSpec,
+                                      SpannableStringBuilder builder, FixingResult result) {
+
+        for (Object span : result.spansWithSpacesAfter) {
+            int spanEnd = builder.getSpanEnd(span);
+            builder.delete(spanEnd, spanEnd + 1);
+            try {
+                setTextAndMeasure(builder, widthMeasureSpec, heightMeasureSpec);
+            } catch (IndexOutOfBoundsException ignored) {
+                builder.insert(spanEnd, " ");
+            }
+        }
+
+        boolean needReset = true;
+        for (Object span : result.spansWithSpacesBefore) {
+            int spanStart = builder.getSpanStart(span);
+            builder.delete(spanStart - 1, spanStart);
+            try {
+                setTextAndMeasure(builder, widthMeasureSpec, heightMeasureSpec);
+                needReset = false;
+            } catch (IndexOutOfBoundsException ignored) {
+                needReset = true;
+                int newSpanStart = spanStart - 1;
+                builder.insert(newSpanStart, " ");
+            }
+        }
+
+        if (needReset) {
+            setText(builder);
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+
+    private void fallbackToString(int widthMeasureSpec, int heightMeasureSpec) {
+        if (HtmlTextView.DEBUG) {
+            Log.d(HtmlTextView.TAG, "Fallback to unspanned text");
+        }
+        String fallbackText = getText().toString();
+        setTextAndMeasure(fallbackText, widthMeasureSpec, heightMeasureSpec);
+    }
+
+}

app/src/main/java/org/sufficientlysecure/htmltextview/LocalImageGetter.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2014 drawk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.htmltextview;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.text.Html;
+import android.util.Log;
+
+/**
+ * Copied from http://stackoverflow.com/a/22298833
+ */
+public class LocalImageGetter implements Html.ImageGetter {
+    Context c;
+
+    public LocalImageGetter(Context c) {
+        this.c = c;
+    }
+
+    public Drawable getDrawable(String source) {
+        int id = c.getResources().getIdentifier(source, "drawable", c.getPackageName());
+
+        if (id == 0) {
+            // the drawable resource wasn't found in our package, maybe it is a stock android drawable?
+            id = c.getResources().getIdentifier(source, "drawable", "android");
+        }
+
+        if (id == 0) {
+            // prevent a crash if the resource still can't be found
+            Log.e(HtmlTextView.TAG, "source could not be found: " + source);
+            return null;
+        } else {
+            Drawable d = c.getResources().getDrawable(id);
+            d.setBounds(0, 0, d.getIntrinsicWidth(), d.getIntrinsicHeight());
+            return d;
+        }
+    }
+
+}

app/src/main/java/org/sufficientlysecure/htmltextview/UrlImageGetter.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2013 Antarix Tandon
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.htmltextview;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.text.Html.ImageGetter;
+import android.view.View;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+
+public class UrlImageGetter implements ImageGetter {
+    Context c;
+    View container;
+
+    /**
+     * Construct the URLImageParser which will execute AsyncTask and refresh the container
+     *
+     * @param t
+     * @param c
+     */
+    public UrlImageGetter(View t, Context c) {
+        this.c = c;
+        this.container = t;
+    }
+
+    public Drawable getDrawable(String source) {
+        UrlDrawable urlDrawable = new UrlDrawable();
+
+        // get the actual source
+        ImageGetterAsyncTask asyncTask = new ImageGetterAsyncTask(urlDrawable);
+
+        asyncTask.execute(source);
+
+        // return reference to URLDrawable which will asynchronously load the image specified in the src tag
+        return urlDrawable;
+    }
+
+    public class ImageGetterAsyncTask extends AsyncTask<String, Void, Drawable> {
+        UrlDrawable urlDrawable;
+
+        public ImageGetterAsyncTask(UrlDrawable d) {
+            this.urlDrawable = d;
+        }
+
+        @Override
+        protected Drawable doInBackground(String... params) {
+            String source = params[0];
+            return fetchDrawable(source);
+        }
+
+        @Override
+        protected void onPostExecute(Drawable result) {
+            // set the correct bound according to the result from HTTP call
+            urlDrawable.setBounds(0, 0, result.getIntrinsicWidth(), result.getIntrinsicHeight());
+
+            // change the reference of the current drawable to the result from the HTTP call
+            urlDrawable.drawable = result;
+
+            // redraw the image by invalidating the container
+            UrlImageGetter.this.container.invalidate();
+        }
+
+        /**
+         * Get the Drawable from URL
+         *
+         * @param urlString
+         * @return
+         */
+        public Drawable fetchDrawable(String urlString) {
+            try {
+                InputStream is = fetch(urlString);
+                Drawable drawable = Drawable.createFromStream(is, "src");
+                drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+                return drawable;
+            } catch (Exception e) {
+                return null;
+            }
+        }
+
+        private InputStream fetch(String urlString) throws MalformedURLException, IOException {
+            DefaultHttpClient httpClient = new DefaultHttpClient();
+            HttpGet request = new HttpGet(urlString);
+            HttpResponse response = httpClient.execute(request);
+            return response.getEntity().getContent();
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    public class UrlDrawable extends BitmapDrawable {
+        protected Drawable drawable;
+
+        @Override
+        public void draw(Canvas canvas) {
+            // override the draw to facilitate refresh function later
+            if (drawable != null) {
+                drawable.draw(canvas);
+            }
+        }
+    }
+}