Merge branch 'master' of i2pgit.org:I2P_Developers/i2p.android.base

This reverts commit 96bb2cf161.

.dockerignore

@@ -0,0 +1,3 @@
+app/pkg-temp
+app/build
+app/pkg-mavencentral

.github/workflows/ant.yml

@@ -0,0 +1,73 @@
+# Mostly copied from https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant
+# zlatinb
+
+name: Java CI
+
+on: [push]
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: GetText
+        run: sudo apt install gettext git
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: build with Gradle
+        run: |
+          echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
+          git clone -b i2p-2.4.0 https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          ./gradlew assembleDebug
+          find . -name '*.apk'
+      - name: Upload i2p-debug-${{ github.sha }}.apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-debug.apk
+          path: ./app/build/outputs/apk/free/debug/app-free-debug.apk
+
+  trunk:
+    runs-on: ubuntu-latest
+    steps:
+      - name: GetText
+        run: sudo apt install gettext git
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+          grep -v I2P_ gradle.properties > gradle.properties.update
+          echo "I2P_VERSION=2.5.0-1" >> gradle.properties.update
+          echo "I2P_ANDROID_VERSION=2.5.0-1" >> gradle.properties.update
+          cp -v gradle.properties.update gradle.properties
+      - name: build with Gradle
+        run: |
+          echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
+          git clone -b master https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          bash -c "cd $HOME/i2p.i2p && ./installer/resources/maven-dev-release.sh 1"
+          ./gradlew assembleDebug
+          find . -name '*.apk'
+      - name: Upload i2p-debug-${{ github.sha }}.apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-debug-trunk-${{ github.sha }}.apk
+          path: ./app/build/outputs/apk/free/debug/app-free-debug.apk

.github/workflows/release.yml

@@ -0,0 +1,62 @@
+name: Release
+
+#on: [push]
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'i2p-android-*.*.*' # Release i2p-firefox-1.2.3
+      - 'i2p-android-*.*.*-*' # Release i2p-firefox-1.2.3
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            CHANGELOG.md
+          sparse-checkout-cone-mode: false
+      - name: sleep 6 minutes
+        run: |
+          echo "sleeping 6 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 5 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 4 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 3 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 2 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 1 minutes to wait for artifacts"
+          sleep 1m
+      - name: Download artifacts
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          skip_unpack: true
+          workflow: ant.yml
+          if_no_artifact_found: fail
+      # remove .zip file extension
+      #- run: for f in *.zip; do unzip "$f"; rm "$f"; done
+      - run: unzip i2p-debug.apk.zip
+      - run: echo "" | tee -a RELEASE.md
+      - run: echo "## Checksums" | tee -a RELEASE.md
+      - run: echo "" | tee -a RELEASE.md
+      - run: echo '```' | tee -a RELEASE.md
+      - run: sha256sum * | tee -a RELEASE.md
+      - run: echo '```' | tee -a RELEASE.md
+      - run: echo "" | tee -a RELEASE.md
+      - run: echo '```' | tee -a RELEASE.md
+      - run: file * | tee -a RELEASE.md
+      - run: echo '```' | tee -a RELEASE.md
+      - run: echo "" | tee -a RELEASE.md
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          bodyFile: "RELEASE.md"

.github/workflows/sign.yml

@@ -0,0 +1,95 @@
+# Mostly copied from https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant
+# zlatinb
+
+name: Java Signed CI
+
+on: [push]
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build-signed:
+    runs-on: ubuntu-latest
+    steps:
+      - name: GetText
+        run: sudo apt install gettext git
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Generate override.properties
+        env:
+          DEV_SIGNING_KEY: ${{ secrets.DEV_SIGNING_KEY }}
+          DEV_PASSWORD: ${{ secrets.DEV_PASSWORD }}
+        run: |
+          rm -f override.properties
+          mv etc/github.gradle.properties gradle.properties
+          mv etc/github.signing.properties signing.properties
+          mkdir -p $HOME/keystores/
+          echo $DEV_SIGNING_KEY | base64 --decode > $HOME/keystores/android-release.keystore
+          echo "KEY_ALIAS=mykey" >> signing.properties
+          echo "KEY_PASSWORD=$DEV_PASSWORD" >> signing.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: build with Gradle
+        run: |
+          echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
+          git clone -b i2p-2.4.0 https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          ./gradlew assembleRelease
+          find . -name '*.apk'
+          ls -lah $HOME/keystores/android-release.keystore
+          ls -d $HOME
+      - name: Upload i2p-debug-${{ github.sha }}.apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-debug.apk
+          path: ./app/build/outputs/apk/free/debug/app-free-debug.apk
+
+  trunk-signed:
+    runs-on: ubuntu-latest
+    steps:
+      - name: GetText
+        run: sudo apt install gettext git
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Generate override.properties
+        env:
+          DEV_SIGNING_KEY: ${{ secrets.DEV_SIGNING_KEY }}
+          DEV_PASSWORD: ${{ secrets.DEV_PASSWORD }}
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+          mv etc/github.gradle.properties gradle.properties
+          mv etc/github.signing.properties signing.properties
+          mkdir -p $HOME/keystores/
+          echo $DEV_SIGNING_KEY | base64 --decode > $HOME/keystores/android-release.keystore
+          echo "KEY_ALIAS=mykey" >> signing.properties
+          echo "KEY_PASSWORD=$DEV_PASSWORD" >> signing.properties
+          grep -v I2P_ gradle.properties > gradle.properties.update
+          echo "I2P_VERSION=2.5.0-1" >> gradle.properties.update
+          echo "I2P_ANDROID_VERSION=2.5.0-1" >> gradle.properties.update
+          cp -v gradle.properties.update gradle.properties
+      - name: build with Gradle
+        run: |
+          echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
+          git clone -b master https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          bash -c "cd $HOME/i2p.i2p && ./installer/resources/maven-dev-release.sh 1"
+          ./gradlew assembleRelease
+          find . -name '*.apk'
+          ls -lah $HOME/keystores/android-release.keystore
+          ls -d $HOME
+      - name: Upload i2p-debug-${{ github.sha }}.apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-debug-trunk-${{ github.sha }}.apk
+          path: ./app/build/outputs/apk/free/debug/app-free-debug.apk

.github/workflows/sync.yaml

@@ -0,0 +1,66 @@
+# GitHub Actions workflow file to sync an external repository to this GitHub mirror.
+# This file was automatically generated by go-github-sync.
+#
+# The workflow does the following:
+# - Runs on a scheduled basis (and can also be triggered manually)
+# - Clones the GitHub mirror repository
+# - Fetches changes from the primary external repository
+# - Applies those changes to the mirror repository
+# - Pushes the updated content back to the GitHub mirror
+#
+# Authentication is handled by the GITHUB_TOKEN secret provided by GitHub Actions.
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate Github Actions Environment
+        run: if [ "$GITHUB_ACTIONS" != "true" ]; then echo 'This script must be run in a GitHub Actions environment.'; exit 1; fi
+      - name: Checkout GitHub Mirror
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Configure Git
+        run: |-
+          git config user.name 'GitHub Actions'
+          git config user.email 'actions@github.com'
+      - env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        name: Sync Primary Repository
+        run: |-
+          # Add the primary repository as a remote
+          git remote add primary https://i2pgit.org/I2P_Developers/i2p.android.base.git
+
+          # Fetch the latest changes from the primary repository
+          git fetch primary
+
+          # Check if the primary branch exists in the primary repository
+          if git ls-remote --heads primary master | grep -q master; then
+            echo "Primary branch master found in primary repository"
+          else
+            echo "Error: Primary branch master not found in primary repository"
+            exit 1
+          fi
+
+          # Check if we're already on the mirror branch
+          if git rev-parse --verify --quiet master; then
+            git checkout master
+          else
+            # Create the mirror branch if it doesn't exist
+            git checkout -b master
+          fi
+
+
+          # Force-apply all changes from primary, overriding any conflicts
+          echo "Performing force sync from primary/master to master"
+          git reset --hard primary/master
+
+
+          # Push changes back to the mirror repository
+          git push origin master
+name: Sync Primary Repository to GitHub Mirror
+"on":
+  push: {}
+  schedule:
+    - cron: 0 * * * *
+  workflow_dispatch: {}

.gitignore

@@ -0,0 +1,8 @@
+etc/docker.signing.properties
+signing.properties
+.idea
+.idea/
+.gradle/
+local.properties
+override.properties
+build

.mtn-ignore

@@ -1,52 +0,0 @@
-# Just to try and prevent some noob disasters.
-# Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
-_jsp\.java$
-\.bz2$
-\.class$
-\.diff$
-\.exe$
-\.fba$
-\.gz$
-\.jar$
-\.out$
-\.patch$
-\.sig$
-\.sud$
-\.su2$
-\.tar$
-\.war$
-\.zip$
-^\.
-^build/
-^pkg-temp/
-~$
-/build/
-/classes/
-
-# Android-specific ignores
-^lib/client/libs
-^routerjars/libs
-local.properties
-signing.properties
-
-#IntelliJ IDEA
-^.idea
-.*.iml
-.*.ipr
-.*.iws
-
-#Gradle
-build
-
-# I2P-specific ignores
-^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/.*_ht
-^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,18 +1,18 @@
 [main]
-host = https://www.transifex.com
-lang_map = he: iw, id: in, pt_BR: pt-rBR, ru_RU: ru, sv_SE: sv, tr_TR: tr, uk_UA: uk, yi: ji, zh_CN: zh, zh_TW: zh-rTW
+host     = https://www.transifex.com
+lang_map = pt_BR: pt-rBR, yi: ji, zh_CN: zh, zh_TW: zh-rTW, id: in, ru_RU: ru, sv_SE: sv, tr_TR: tr, uk_UA: uk, he: iw, es_AR: es-rAR
 
-[I2P.android]
-file_filter = app/src/main/res/values-<lang>/strings.xml
+[o:otf:p:I2P:r:android]
+file_filter  = app/src/main/res/values-<lang>/strings.xml
+source_file  = app/src/main/res/values/strings.xml
+source_lang  = en
+type         = ANDROID
+minimum_perc = 22
+
+[o:otf:p:I2P:r:android_lib_helper]
+file_filter  = lib/helper/src/main/res/values-<lang>/strings.xml
+source_file  = lib/helper/src/main/res/values/strings.xml
+source_lang  = en
+type         = ANDROID
 minimum_perc = 50
-source_file = app/src/main/res/values/strings.xml
-source_lang = en
-type = ANDROID
-
-[I2P.android_lib_helper]
-file_filter = lib/helper/src/main/res/values-<lang>/strings.xml
-minimum_perc = 50
-source_file = lib/helper/src/main/res/values/strings.xml
-source_lang = en
-type = ANDROID
 

CHANGELOG

@@ -1,3 +1,173 @@
+2.9.0
+ * Update I2P Library
+
+2.8.0
+ * Update I2P Library
+ * Migrate to AndroidX
+ * Migrate to MagicIndicator
+
+2.7.1
+ * Update I2P Library
+ * Roll back ViewPageIndicator version, fixes crash, causes other issues
+
+2.7.0
+ * Update I2P Library
+
+2.6.0
+ * Update I2P Library
+
+2.5.0
+ * Update I2P Library
+
+2.4.0
+ * Update I2P Library
+
+2.3.0
+ * Update I2P Library
+
+2.2.0
+ * Add blocklist feed support
+ * Fix translations on stats page
+ * Various bugfixes
+
+2.1.0-1
+ * adds support for adding base32 addresses to the local addressbook
+ * adds support for destinations with ports in the string to i2ptunnel
+ * adds support for remote applications launching I2P, via MR#3 from @RyeMantis
+
+2.1.0
+ * Upgrades router to version 2.1.0
+ * Adds jcenter repository back to app/ target, removes jcenter from other targets
+ * explicitly set android.useAndroidX
+
+2.0.1
+ * Fixes gitlab#49 by applying MUTABLE or IMMUTABLE flags across all PendingIntents
+
+2.0.0
+ * Updates router to version 2.0.0
+ * Updates gradle plugin
+ * Remove Firefox from supported browsers list due to lack of about:config support
+ * Add Privacy Browser to supported browsers list and write guide for it
+
+1.9.1
+ * Switches back to mavenCentral builds
+ * Fixes build process for F-Droid main
+ * Using tag i2p.i2p:i2p-android-1.9.0
+ * Allow b32 and blinded b32 to validate in I2PTunnel UI
+
+1.9.0
+ * Updates router to version 1.9.0
+ * Using tag i2p.i2p:i2p-android-1.9.0
+
+1.8.2
+ * This update fixes a bug where Family Keys are incorrectly handled by the Android router, leading
+ to a crash.
+ * This update fixes a bug wherein incorrect type-checking caused a crash when using the Network
+ Config page for some users.
+
+1.8.1
+ * This update fixes a bug where certificates were unpacked to the wrong location on new installs,
+ resulting in the router failing to start.
+ * Decouples the Android version from the I2P library version to allow for android point
+ releases with less pain.
+
+1.8.0
+ * This release updates the underlying I2P libraries to I2P version 1.8.0
+ * The SAM API now operates in "Interactive Authentication" mode. Users will be prompted via
+ the notificationArea to approve or ignore new SAM connections initiated by external apps.
+ * The network config menu now features a drop-down configuration instead of a slider configuration
+ (since reversed)
+
+1.7.1
+ * This release updates the underlying I2P libraries to I2P version 1.7.1
+
+1.7.0
+ * This release updates the underlying I2P libraries to I2P version 1.7.0
+ * Refactor of the unzipResourceToDir function
+
+1.6.0
+ * This release updates the underlying I2P libraries to I2P version 1.6.0
+
+1.5.0
+ * This release updates the underlying I2P libraries to I2P version 1.5.0
+
+0.9.50 2021-05-18
+ * This release updates the underlying I2P libraries to I2P version 0.9.50
+
+0.9.48 2020-12-02
+ * This release updates the underlying I2P libraries to I2P version 0.9.48
+ * Updates to browser configuration documentation
+
+0.9.47-1 2020-10-29
+ * This release fixes a number of bugs arising from a misconfigured bootclasspath
+ * Fix a battery-management issue arising on some phones
+
+0.9.47 / 2020-08-26
+ * Notification bug-fixes on platforms >8.0
+
+0.9.46 / 2020-06-03
+ * catch ActivityNotFound exception in MainActivity
+
+0.9.45 / 2020-03-07
+ * No significant changes
+
+0.9.44 / 2019-12-03
+ * Updated translations
+ * Bumped target sdk version to 28, enforced by google
+
+0.9.43-1 / 2019-10-28
+ * Fix crash at startup in TCG
+
+0.9.43 / 2019-10-27
+ * Save state in background thread (tickets #2595, #2632)
+ * Fix ISE in language dialog (ticket #2631)
+ * Fix NPE in create tunnel (ticket #2629)
+ * Update logo after router killed in background
+ * Fix message in tunnels tabs when tunnels not up yet
+ * Hide tunnel actions while TCG is starting
+ * Add battery permissions dialog (ticket #2607)
+
+0.9.42 / 2019-08-28
+ * Possible fix for tunnel edit dialog crash (ticket #2598)
+
+0.9.41 / 2019-07-03
+ * New 64 bit libjbigi (ticket #2503)
+ * Update 32 bit jbigi to GMP 6.1.2
+ * Fix for client tunnels not starting after reseed
+ * UPnP Fixes (ticket #2499)
+ * WebView crash fixes (ticket #2390)
+ * i2ptunnel crash fix (ticket #2552)
+ * i2ptunnel ANR fix (ticket #2491)
+ * Browser help pages improvements (tickets #2521, 2523)
+ * Code cleanups and fixes
+ * Update visibility of floating menu items
+ * Put our router info at top of list
+ * Table layout cleanups
+ * Fixes for threads remaining after router stop
+ * Remove BOB
+ * Remove welterde IRC tunnel
+ * Various lint fixes
+ * New translations: Add cs, da, el
+ * Add missing translations to menu: ar, fi, gl, hu, zh_TW
+
+0.9.40 / 2019-05-10
+ * Open local I2CP socket for 3rd party apps
+ * Fix News URLs
+ * Numerous bug fixes (see trac)
+
+0.9.39 / 2019-03-23
+ * Set App ID
+
+0.9.38 / 2019-01-27
+
+0.9.37 / 2018-10-10
+
+0.9.36 / 2018-08-27
+
+0.9.35 / 2018-07-03
+
+0.9.34 / 2018-04-25
+
 0.9.33 / 2018-02-18
  * Translation updates
 

DEVELOPMENT-README.md

@@ -0,0 +1,11 @@
+# Development Readme
+
+## How to build development builds of the router core for android?
+
+Check the RELEASE-PROCESS.md file for general information about how to build and to bump the version.
+
+In your i2p.i2p codebase checkout, execute `./installer/resources/maven-dev-release.sh` with your build number as first argument.
+The script locates itself and uses the same codebase as it's in, to produce the maven builds which will be locally installed.
+
+Next, add the build number to the gradle.properties and build the android build as usual.
+

DOCKER.md

@@ -0,0 +1,91 @@
+Docker Build Instructions
+=========================
+
+It is possible to build a container with a pre-installed environment for
+correctly compiling an I2P for Android development build. Unlike the i2p.i2p
+container, zero attempt has been made to optimize the size of the container,
+as it contains a copy of the latest Android SDK, toolchains, and Android NDK,
+which it must download. To save time, this is cached locally. It is likely to
+take up to 30 GB of disk space to compile in this way, however, it is very easy
+and convenient compared to the steps in RELEASE-PROCESS.md and may make
+building Android reproducibly easier in the future.
+
+Container dependencies
+----------------------
+
+  - `menny/android_ndk` (third-party image) (reviewed by idk) (depends on menny/android_sdk
+  - `menny/android_sdk` (third-party image) (reviewed by idk) (depends on ubuntu/18.04)
+  - `ubuntu/18.04` (official docker container) (base container)
+
+Build the container locally
+---------------------------
+
+Run:
+
+        docker build -t i2p.android.base .
+
+To build the container. It will have a lot to download the first time, so it may take
+a while to complete.
+
+Run an Android build in the container
+-------------------------------------
+
+Copy the `etc/docker.signing.example.proprties` file to `etc/docker.signing.proprties`,
+edit it to match your key information and rebuild the container.
+
+Run:
+
+        docker run -it \
+          -u $(id -u):$(id -g) \
+          --name i2p.android.base \
+          -v $HOME/.gnupg/:/.gnupg/:ro \
+          -v $HOME/.i2p-plugin-keys/:/.i2p-plugin-keys/:ro \
+          -v /run/user/$(id -u)/:/run/user/$(id -u)/:ro \
+          i2p.android.base
+
+To get the build artifacts for uploading to Maven out of the container, use:
+
+        docker cp i2p.android.base:/opt/workspace/i2p.i2p/pkg-mavencentral app/pkg-mavencentral
+        docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-i2p.jar app/pkg-mavencentral
+        docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-mstreaming.jar app/pkg-mavencentral
+        docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-router.jar app/pkg-mavencentral
+        docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-servlet-i2p.jar app/pkg-mavencentral
+        docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-streaming.jar app/pkg-mavencentral
+
+To get the Android build artifacts out of the container, use:
+
+        docker cp i2p.android.base:/opt/workspace/i2p.android.base/app/build/ app/build
+
+And your android applications will appear in the `app/build` directory, in the same
+place where non-container builds would go.
+
+If you encounter a permissions error when rebuilding, delete the `app/build`,
+`app/pkg-mavencentral` and `app/pkg-temp` path.
+
+        rm -rf app/pkg-temp app/build app/pkg-mavencentral
+
+Copypasta
+---------
+
+Once you have set up builds for the first time, from then on you can update the container and
+build a fresh set of Maven jars and a new I2P for Android app by copy-pasting the following
+commands:
+
+``` sh
+rm -rf app/pkg-temp app/build app/pkg-mavencentral
+docker build -t i2p.android.base .
+docker run -it \
+  -u $(id -u):$(id -g) \
+  --name i2p.android.base \
+  -v $HOME/.gnupg/:/.gnupg/:ro \
+  -v $HOME/.i2p-plugin-keys/:/.i2p-plugin-keys/:ro \
+  -v /run/user/$(id -u)/:/run/user/$(id -u)/:ro \
+  i2p.android.base
+docker cp i2p.android.base:/opt/workspace/i2p.i2p/pkg-mavencentral app/pkg-mavencentral
+docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-i2p.jar app/pkg-mavencentral
+docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-mstreaming.jar app/pkg-mavencentral
+docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-router.jar app/pkg-mavencentral
+docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-servlet-i2p.jar app/pkg-mavencentral
+docker cp i2p.android.base:/opt/workspace/i2p.i2p/mavencentral-streaming.jar app/pkg-mavencentral
+docker cp i2p.android.base:/opt/workspace/i2p.android.base/app/build/ app/build
+```

Dockerfile

@@ -0,0 +1,39 @@
+FROM menny/android_ndk
+ENV VERSION=0.9.50
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
+RUN echo 'deb http://deb.i2p2.de/ sid main' >> /etc/apt/sources.list
+RUN echo 'deb-src http://deb.i2p2.de/ sid main' >> /etc/apt/sources.list
+RUN echo 'deb http://archive.ubuntu.com/ubuntu trusty universe' >> /etc/apt/sources.list
+RUN wget -O /etc/apt/trusted.gpg.d/i2p-debian-repo.key.asc https://geti2p.net/_static/i2p-debian-repo.key.asc
+COPY etc/debian-jessie-repo.key.asc /etc/apt/trusted.gpg.d
+RUN mkdir -p /opt/packages && wget -O /opt/packages/openjdk-7-jre-headless.deb http://security.debian.org/debian-security/pool/updates/main/o/openjdk-7/openjdk-7-jre-headless_7u261-2.6.22-1~deb8u1_amd64.deb
+RUN apt-get update
+RUN apt-get build-dep -y i2p i2p-router
+RUN apt-get install -y ant openjdk-8* libxml2-utils junit4 libhamcrest-java libmockito-java libmaven-ant-tasks-java dpkg-sig maven
+RUN cd /opt/packages && dpkg-sig -l openjdk-7-jre-headless.deb && dpkg -x openjdk-7-jre-headless.deb /opt/packages/openjdk-7-jre
+RUN git clone https://github.com/i2p/i2p.i2p --depth=1 -b i2p-$VERSION /opt/workspace/i2p.i2p
+RUN update-java-alternatives --jre-headless --set java-1.8.0-openjdk-amd64
+RUN update-java-alternatives --set java-1.8.0-openjdk-amd64
+RUN update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
+RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
+RUN rm /opt/java/openjdk/ -rfv
+COPY . /opt/workspace/i2p.android.base
+COPY etc/docker.local.ndk.properties /opt/workspace/i2p.android.base/client/local.properties
+COPY etc/docker.local.router.properties /opt/workspace/i2p.android.base/routerjars/local.properties
+COPY etc/docker.local.sdk.properties /opt/workspace/i2p.android.base/local.properties
+COPY etc/docker.override.properties /opt/workspace/i2p.android.base/override.properties
+COPY etc/docker.override.properties /opt/workspace/i2p.i2p/override.properties
+COPY etc/docker.signing.properties /opt/workspace/i2p.android.base/signing.properties
+WORKDIR /opt/workspace/i2p.android.base
+RUN find /opt/android-sdk-linux -type d -print0 | xargs -0 chown -R 1000:1000
+RUN find /opt/android-sdk-linux -type d -print0 | xargs -0 chmod -Rc o+rw
+RUN find /opt/android-sdk-linux -type d -print0 | xargs -0 chmod -c 0755
+RUN find /opt/workspace -type d -print0 | xargs -0 chown -R 1000:1000
+RUN find /opt/workspace -type d -print0 | xargs -0 chmod -Rc o+rw
+RUN find /opt/workspace -type d -print0 | xargs -0 chmod -c 0755
+CMD cd /opt/workspace/i2p.i2p && \
+	ant -k mavenCentral; \
+	cp -v *.jar pkg-mavencentral/; \
+	cd /opt/workspace/i2p.android.base && \
+	./gradlew --continue dependencies || true ; \
+	 ./gradlew --continue assembleRelease; tail -f README.md

LICENSE.txt

@@ -43,8 +43,34 @@ License for the Android App:
    See the License for the specific language governing permissions and
    limitations under the License.
 
+See the file licenses/LICENSE-Apache2.0.txt
+
+===================================
+
+License for the MagicIndicator library:
+
+MIT License
+
+Copyright (c) 2016 hackware1993
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 ===================================
 
 
-See the file licenses/LICENSE-Apache2.0.txt

README.md

@@ -7,8 +7,8 @@
 - Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
 - Apache Ant 1.8.0 or higher
 - I2P source
-- Android SDK for API 21
-- Android Build Tools 21.1.2
+- Android SDK for API 28 or higher
+- Android Build Tools 28.0.0 or higher
 - Android Support Repository
 - Gradle 2.2.1
 
@@ -67,10 +67,18 @@ systemProp.socksProxyPort=9150
     ```
     sdk.dir=/path/to/android-studio/sdk
     ```
+1a. For building with a local router development build:
+    cd ../i2p.i2p
+    installer/resources/maven-dev-release.sh x // x is the build number, e.g. 6
+    cd back here
+    edit gradle.properties, add the build number x to I2P_PROPERTIES=0.9.xx-x
 
 2. `gradle assembleDebug`
 
-3. The APK will be placed in `i2p.android.base/app/build/outputs/apk`.
+3. The APK files will be placed in `i2p.android.base/app/build/outputs/apk` subdirectories.
+
+4. Install debug build on phone in USB debugging mode
+    adb install app/build/outputs/apk/free/debug/app-free-debug.apk 
 
 ### Building with Android Studio
 

RELEASE-PROCESS.md

@@ -1,20 +1,128 @@
-1. Check out a clean copy of i2p.i2p at the correct release version.
-2. Edit `routerjars/local.properties` to use the clean i2p.i2p copy.
-3. Pull the latest translations with `tx pull -a` and commit them.
-4. Ensure that `signing.properties` contains the details of the release key.
-5. Edit `gradle.properties` to bump the I2P version.
-6. Edit `app/build.gradle` to bump the Android version number.
-7. If the helper has changed since the last release, edit
-   `lib/helper/gradle.properties` to bump the version.
-8. `./gradlew clean assembleRelease`
-9. `./gradlew :lib:client:uploadArchives`
-10. If the helper version was changed: `./gradlew :lib:helper:uploadArchives`
-11. Check on Sonatype that everything worked, and close/release.
-12. Update local fdroidserver repo
-13. `cp app/build/outputs/apk/free/release/app-free-release.apk path/to/fdroid/repo/I2P-VERSION.apk`
-14. Update `path/to/fdroid/metadata/net.i2p.android.txt`
-15. `fdroid update`
-16. Push to download server and put in place.
-17. Check F-Droid repo works, and app works.
-18. `mtn ci gradle.properties lib/helper/gradle.properties app/build.gradle`
-19. Push free and donate builds to Google Play.
+# Release Process
+
+Note to all future maintainers: We have 4 channels that need to be updated in order to have a successful
+Android release. Many of these channels are updated at different rates, and at times you must wait on a
+third-party service to complete it's tasks before you may continue. When completing an Android release,
+keep in mind that you must update 1) Maven 2) Google Play 3) f-droid.i2p.io and 4) F-Droid main
+repository.
+
+At the time of this revision, 2020/09/13, the main Android maintainer is idk. idk updates Maven, Google
+Play, and f-droid.i2p.io, and nextl00p handles working with the F-Droid project to provide an I2P release
+in their main repository.
+
+NOTE: The docker container built by the Dockerfile in this repostory ensures that the Pre-requisites and
+Dependencies are properly met by obtaining them from the Debian package in `oldoldstable` and pre-configuring
+the override.properties that is used in the Docker container.
+
+## Tag Freezes and Translations
+
+1-2 weeks before the software is released, I2P Desktop will have a "Tag Freeze" which is the deadline for
+translations to be checked in. **When** that time comes, someone who has Transifex privileges should use
+the command: `tx push -s -R I2P.android` to push any and all changed string resources to transifex for
+translation.
+
+**>> Beginning of Docker-enabled Steps <<**
+
+## Prerequirements
+
+ 0. Update the changelog!
+ 1. Ensure you have the deprecated maven ant tasks. ( https://maven.apache.org/ant-tasks/download.cgi )
+ 2. It should exist at `~/.ant/lib/maven-ant-tasks-2.1.3.jar`
+ 3. Ensure you have hamcrest-integration, hamcrest-library, hamcrest-core in the hamcrest.home directory.
+ 4. Ensure junit 4.12 at least in junit.home, ensure the jar file is named `junit4.jar`.
+ 5. Ensure you have the Mockito framework and accompanying documentation in your $JAVA_HOME
+ 6. Ensure to have updated the changelog with the changes done.
+ 7. Ensure that you are configured to build i2p.i2p with Java 8. On Debian it is easiest to set with
+   `update-java-alternatives --set java-1.8.0-openjdk-amd64` and picking Java 8. **TODO:** add instructions for non-Debian-based
+   systems.
+ 8. Ensure that you have a Java 1.7 bootclasspath available. (See **Maven Central** step 2A.)
+
+## Get all the dependencies ready
+
+### Maven Central
+
+ 1. Check out a clean copy of i2p.i2p at the correct release version. (Make a clean checkout)
+ 2. Build the maven packages via `ant mavenCentral` where you end up with mavencentral-*.jar files in the 
+  current directory.
+ 2. **A)** I2P for Android requires a Java 1.7 bootclasspath, but the servlet jar requires Java 8. So, to do the builds:
+  - First set `javac.compilerargs=-bootclasspath /path/to/java/7/rt.jar:/path/to/java/7/jce.jar` in override.properties
+  - Build with `ant mavenCentral`
+
+**>> End of Docker-enabled Steps for Maven <<**
+
+ 3. Login to http://oss.sonatype.org for uploading the mavencentral-*.jar bundles.
+ 4. In nexus, choose "Staging Upload" and upload all of the files with upload mode set to "Artifacts with POM". 
+  When uploading the files to nexus, you *must* upload the pom.xml files, and all of their artifacts. For each 
+  component, you will need to upload a *.jar, a *.jar.asc, a *sources.jar, a *sources.jar.asc, a javadoc.jar, 
+  and a javadoc.jar.asc, and a pom.xml and a pom.xml.asc from the pkg-mavencentral directory during the "Upload
+  Artifacts with POM" operation. You will need to do this once for each component you upload to Nexus.
+ 5. Under "Staging Repositories" ensure all where uploaded correctly, select them all and press "Release"
+  in the toolbar.
+
+#### Example override.properties:
+
+        javac.version=1.7
+        javac.target=1.7
+        javac.source=1.8
+        javac.compilerargs=-bootclasspath /home/user/StudioProjects/java7bootclasspath/rt.jar:/home/user/StudioProjects/java7bootclasspath/jce.jar
+        javac.compilerargs7=-bootclasspath /home/user/StudioProjects/java7bootclasspath/rt.jar:/home/user/StudioProjects/java7bootclasspath/jce.jar
+        build.built-by=name
+
+### Android Common Build
+
+Using Docker: in order to use Docker to generate a new Android apk for release, you will
+need to run the build twice, once for the mavenCentral jars, and once for the actual Android
+app. After doing the Maven release, follow these steps in the i2p.android.base repository, and re-run
+the `docker run` step described in `DOCKER.md`
+
+ 1. Edit `routerjars/local.properties` to use the clean i2p.i2p copy.
+ 2. Pull the latest translations with `tx pull --use-git-timestamps` and commit them. (If you don't have the `tx` command,
+  do `pip install transifex-client` ). If there are broken translations, exclude them and only them.
+  - If there are any new translations, `mtn add` them, and add them to `app/src/main/res/values/arrays.xml`
+  (two places, alphabetical order please)
+ 3. Ensure that `signing.properties` contains the details of the release key. If you are using Docker, see
+  `DOCKER.md` to perform this step for Docker builds by editing `etc/docker.signing.properties` instead.
+ 4. Edit `gradle.properties` to bump the I2P version.
+ 5. Edit `app/build.gradle` to bump the Android version number.
+ 6. Edit `CHANGELOG` to add the release and date.
+ 7. If the helper has changed since the last release, edit
+    `lib/helper/gradle.properties` to bump the version.
+ 8. `./gradlew clean assembleRelease`
+
+### Libraries
+
+ 1. `./gradlew :lib:client:uploadArchives`
+ 2. If the helper version was changed and should be released: `./gradlew :lib:helper:uploadArchives`
+ 3. Check on Sonatype that everything worked, and close/release.
+
+## Release Packages
+
+### F-Droid Guide
+
+This guide is for f-droid.i2p.io, not for F-Droid's main repository. The repository keystore **and** the
+config.py used to generate the repository are required to complete this process successfully.
+
+ 1. Ensure you have the release keys, the keyfile must be placed at `~/.local/share/fdroidserver/keystore.jks`
+ 2. If it's the first time, or you have reinstalled anything, ensure `path/to/fdroid/config.py` has correct
+  information.
+ 3. Assuming you already have ran `./gradlew clean assembleRelease` from a earlier step, continue.
+ 4. `cp app/build/outputs/apk/free/release/app-free-release.apk path/to/fdroid/repo/I2P-VERSION.apk`
+ 5. Update `path/to/fdroid/metadata/net.i2p.android.txt` (The versions at the bottom of the file)
+ 6. Run `fdroid update` from inside the fdroid path (install fdroid command via `pip install fdroidserver`)
+ 7. Zip/tar the local fdroid repo and archive. `rm fdroid.tgz && tar czf fdroid.tgz archive/ repo/` from the
+  fdroid directory.
+ 8. Push to download server and put in place. (via SSH for example, `scp fdroid.tgz download.i2p2.de:~/`)
+ 9. On the server run `bin-fd/update-fdroid` and `sudo bin-fd/update-app i2p 0.9.40` (This ensures we use the
+  exact same apk file for the download page as in fdroid and gplay)
+ 10. Check F-Droid repo works, and app works.
+
+### Google Play and finishing up
+
+ 1. Verify which files that are changed via `mtn ls cha`. It shouldn't be much more than those bellow this
+  line and possible translations (`mtn ls unk`).
+ 2. Commit your release changes, `mtn ci gradle.properties lib/helper/gradle.properties app/build.gradle`
+ 3. Push free and donate builds to Google Play via https://play.google.com/apps/publish/
+ 4. Tag the new release. Example `mtn tag h: android-0.9.36`
+ 5. Push the monotone changes. Make sure that they are there at the next git sync.
+ 6. Update download page (version and hash, including F-Droid)
+

app/build.gradle

@@ -1,11 +1,18 @@
 apply plugin: 'com.android.application'
 
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven { url 'https://jitpack.io' }
+}
+
 android {
-    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
+    namespace 'net.i2p.android.router'
+    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     defaultConfig {
-        versionCode 4745241
-        versionName "$I2P_VERSION"
-        minSdkVersion 9
+        versionCode Integer.parseInt(project.I2P_ANDROID_VERSION_CODE as String)
+        versionName "$I2P_ANDROID_VERSION"
+        minSdkVersion 21
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
 
         // For Espresso
@@ -27,14 +34,19 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lintOptions {
         abortOnError false
+        checkReleaseBuilds false
+        disable 'MissingDefaultResource'
     }
     packagingOptions {
-        exclude 'LICENSE.txt'
+        resources {
+            excludes += ['LICENSE.txt']
+        }
     }
     flavorDimensions 'tier'
     productFlavors {
@@ -54,34 +66,65 @@ android {
 }
 
 dependencies {
+    implementation "androidx.appcompat:appcompat:1.5.1"
+    implementation "androidx.preference:preference:1.2.0"
+    implementation "androidx.annotation:annotation:1.5.0"
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     // Local dependencies
     implementation project(':lib:client')
     implementation project(':lib:helper')
     implementation project(path: ':routerjars', configuration: 'routerjars')
-
     // Android Support Repository dependencies
-    def supportVersion = '25.3.1'
+    /*def supportVersion = '28.0.0'
     implementation "com.android.support:support-v4:$supportVersion"
     implementation "com.android.support:appcompat-v7:$supportVersion"
     implementation "com.android.support:preference-v7:$supportVersion"
     implementation "com.android.support:preference-v14:$supportVersion"
-    implementation "com.android.support:recyclerview-v7:$supportVersion"
-
+    implementation "com.android.support:recyclerview-v7:$supportVersion"*/
+    implementation 'com.google.android.material:material:1.9.0'
     // Remote dependencies
-    implementation 'com.androidplot:androidplot-core:1.4.1'
+    implementation 'com.androidplot:androidplot-core:1.5.11'
     implementation 'com.eowise:recyclerview-stickyheaders:0.5.2@aar'
-    implementation 'com.inkapplications.viewpageindicator:library:2.4.4'
+    //implementation 'com.inkapplications.viewpageindicator:library:2.4.4'
+    implementation 'com.github.hackware1993:MagicIndicator:1.7.0' // for androidx
     implementation 'com.pnikosis:materialish-progress:1.7'
     implementation "net.i2p:router:$I2P_VERSION"
+    implementation "net.i2p:i2p:$I2P_VERSION"
+    implementation "net.i2p.client:mstreaming:$I2P_VERSION"
+    implementation "net.i2p.client:streaming:$I2P_VERSION"
     implementation 'net.i2p.android.ext:floatingactionbutton:1.10.1'
-    implementation 'org.sufficientlysecure:html-textview:3.1'
-
+    implementation 'com.github.SufficientlySecure:html-textview:v3.6'
     // Testing-only dependencies
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
 }
 
+dependencies {
+    implementation "androidx.appcompat:appcompat:1.5.1"
+    implementation "androidx.preference:preference:1.2.0"
+    implementation "androidx.annotation:annotation:1.5.0"
+    implementation 'androidx.test.espresso:espresso-core:3.6.1'
+    implementation 'androidx.test.ext:junit:1.2.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+}
+
+dependencies {
+    // ...existing code...
+    
+    // Force consistent lifecycle versions
+    implementation('androidx.lifecycle:lifecycle-viewmodel:2.5.1')
+    implementation('androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1')
+    
+    // Exclude older versions
+    configurations.all {
+        resolutionStrategy {
+            force 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
+            force 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+        }
+    }
+}
+
 project.ext.i2pbase = "../i2p.i2p"
 def Properties props = new Properties()
 def propFile = new File(project(':routerjars').projectDir, 'local.properties')
@@ -108,7 +151,7 @@ task copyI2PResources(type: Copy) {
     outputs.upToDateWhen { false }
     into 'src/main/res'
     into('drawable') {
-        from file(i2pbase + '/installer/resources/themes/console/images/i2plogo.png')
+        from file(i2pbase + '/apps/routerconsole/jsp/themes/console/images/i2plogo.png')
     }
     into('raw') {
         from(i2pbase + '/installer/resources/blocklist.txt') { rename { 'blocklist_txt' } }
@@ -171,15 +214,15 @@ task copyI2PAssets(type: Copy) {
     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')
+        from file(i2pbase + '/apps/routerconsole/jsp/themes/console/images/i2plogo.png')
+        from file(i2pbase + '/apps/routerconsole/jsp/themes/console/images/inbound.png')
+        from file(i2pbase + '/apps/routerconsole/jsp/themes/console/images/outbound.png')
     }
     into('light') {
-        from file(i2pbase + '/installer/resources/themes/console/light/console.css')
+        from file(i2pbase + '/apps/routerconsole/jsp/themes/console/light/console.css')
     }
     into('light/images') {
-        from file(i2pbase + '/installer/resources/themes/console/light/images/header.png')
+        from file(i2pbase + '/apps/routerconsole/jsp/themes/console/light/images/header.png')
     }
 }
 

app/src/androidTest/java/net/i2p/android/I2PActivityTest.java

@@ -1,39 +1,43 @@
 package net.i2p.android;
 
-import android.test.ActivityInstrumentationTestCase2;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import net.i2p.android.router.R;
 
-import static android.support.test.espresso.Espresso.closeSoftKeyboard;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
-import static android.support.test.espresso.Espresso.pressBack;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.swipeLeft;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.hasSibling;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withParent;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static androidx.test.espresso.Espresso.closeSoftKeyboard;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
+import static androidx.test.espresso.Espresso.pressBack;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.swipeLeft;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.hasSibling;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.not;
 
-public class I2PActivityTest extends ActivityInstrumentationTestCase2<I2PActivity> {
-    public I2PActivityTest() {
-        super(I2PActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        // For each test method invocation, the Activity will not actually be created
-        // until the first time this method is called.
-        getActivity();
+@RunWith(AndroidJUnit4.class)
+public class I2PActivityTest {
+
+    private ActivityScenario<I2PActivity> scenario;
+
+    @Before
+    public void setUp() {
+        scenario = ActivityScenario.launch(I2PActivity.class);
     }
 
+    @Test
     public void testMainTabs() {
         onView(withId(R.id.router_onoff_button)).check(matches(isDisplayed()));
 
@@ -55,6 +59,7 @@ public class I2PActivityTest extends ActivityInstrumentationTestCase2<I2PActivit
         onView(withId(R.id.router_onoff_button)).check(matches(isDisplayed()));
     }
 
+    @Test
     public void testMainSwipe() {
         onView(withId(R.id.router_onoff_button)).check(matches(isDisplayed()));
 
@@ -70,9 +75,10 @@ public class I2PActivityTest extends ActivityInstrumentationTestCase2<I2PActivit
         // TODO: test addressbook ViewPager
     }
 
+    @Test
     public void testSettingsNavigation() {
         // Open settings menu
-        openActionBarOverflowOrOptionsMenu(getActivity());
+        openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
         onView(withText(R.string.menu_settings)).perform(click());
 
         // Open bandwidth page
@@ -106,4 +112,4 @@ public class I2PActivityTest extends ActivityInstrumentationTestCase2<I2PActivit
         pressBack();
         onView(withText(R.string.settings_label_advanced)).check(doesNotExist());
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -1,7 +1,8 @@
 <?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:installLocation="auto"
+    android:sharedUserId="net.i2p">
 
     <uses-sdk xmlns:tools="http://schemas.android.com/tools"
         tools:overrideLibrary="android.support.v14.preference" />
@@ -9,6 +10,16 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <!-- following two are for UPnP -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <!-- required for reliable core functionality on Android, see:
+    https://geti2p.net/en/docs/applications/embedding
+    heading: "Design for and Encourage Long Uptimes"
+    -->
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <application
         android:icon="@drawable/ic_launcher_itoopie"
@@ -17,7 +28,12 @@
         <service
             android:name=".service.RouterService"
             android:icon="@drawable/ic_launcher_itoopie"
-            android:label="@string/app_name">
+            android:enabled="true"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:foregroundServiceType="specialUse">
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="i2p_router_background_process_required_network_operation"/>
             <intent-filter>
                 <action android:name="net.i2p.android.router.service.IRouterState" />
             </intent-filter>
@@ -25,17 +41,28 @@
         <provider
             android:name=".provider.CacheProvider"
             android:authorities="${applicationId}.provider" />
-        <receiver android:name=".receiver.OnBootReceiver">
+        <receiver
+            android:name=".receiver.OnBootReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+        <receiver
+            android:name=".receiver.RemoteStartReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="net.i2p.android.router.receiver.START_I2P" />
+            </intent-filter>
+        </receiver>
 
         <activity
             android:name="net.i2p.android.I2PActivity"
             android:icon="@drawable/ic_launcher_itoopie"
             android:label="@string/app_name"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:exported="true">
             <!-- Console filters -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -45,6 +72,10 @@
                 <action android:name="net.i2p.android.router.START_I2P" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="net.i2p.android.router.service.APPROVE_SAM" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
 
             <!-- Addressbook filters -->
             <intent-filter>
@@ -95,6 +126,7 @@
         <activity
             android:name=".web.WebActivity"
             android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
             android:label="I2P Web Browser">
             <!-- Disabled, this browser is not very secure
             Temporarily enabled until an alternative browser is ready -->

app/src/main/java/androidx/viewpager/widget/CustomViewPager.java

@@ -1,10 +1,15 @@
-package android.support.v4.view;
+//package android.support.v4.view;
+package androidx.viewpager.widget;
 
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
+//import android.support.v4.os.ParcelableCompat;
+import androidx.core.os.ParcelableCompat;
+//import android.support.v4.os.ParcelableCompatCreatorCallbacks;
+import androidx.core.os.ParcelableCompatCreatorCallbacks;
+
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.Toast;
@@ -31,6 +36,13 @@ public class CustomViewPager extends ViewPager {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent event) {
+        // See Nov. 20, 2013 comment at:
+        // https://github.com/JakeWharton/ViewPagerIndicator/pull/257
+        // Our ticket #2488
+
+        // prevent NPE if fake dragging and touching ViewPager
+        if(isFakeDragging()) return false;
+
         return mEnabled && mFixedPage < 0 && super.onInterceptTouchEvent(event);
     }
 

app/src/main/java/com/pavelsikun/seekbarpreference/MaterialSeekBarController.java

@@ -2,9 +2,10 @@ package com.pavelsikun.seekbarpreference;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.Preference;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -125,7 +126,8 @@ public class MaterialSeekBarController implements SeekBar.OnSeekBarChangeListene
     }
 
     private void setPaddedValue(int value) {
-        mSeekBarValue.setText(String.format("%0" + mMaxDigits +"d", value));
+        //mSeekBarValue.setText(String.format("%0" + mMaxDigits +"d", value));
+        mSeekBarValue.setText(String.format("%" + mMaxDigits +"d", value));
     }
 
 

app/src/main/java/com/pavelsikun/seekbarpreference/SeekBarPreference.java

@@ -4,9 +4,11 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.annotation.NonNull;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 
 import net.i2p.android.router.R;

app/src/main/java/net/i2p/android/I2PActivity.java

@@ -5,10 +5,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -19,12 +23,13 @@ import net.i2p.android.router.MainFragment;
 import net.i2p.android.router.R;
 import net.i2p.android.router.SettingsActivity;
 import net.i2p.android.router.addressbook.AddressbookContainer;
+import net.i2p.android.router.service.AndroidSAMSecureSession;
 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.android.util.MemoryFragmentPagerAdapter;
-import android.support.v4.view.CustomViewPager;
+import androidx.viewpager.widget.CustomViewPager;
 import net.i2p.android.widget.SlidingTabLayout;
 import net.i2p.router.RouterContext;
 
@@ -134,6 +139,7 @@ public class I2PActivity extends I2PActivityBase implements
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
+        setIntent(intent);
         handleIntents();
     }
 
@@ -143,17 +149,29 @@ public class I2PActivity extends I2PActivityBase implements
 
         Intent intent = getIntent();
         String action = intent.getAction();
+        Util.d("handleIntent: intent=" + intent.toString());
 
         if (action == null)
             return;
 
+        Util.d("handleIntent: action=" + action);
+
+        Bundle extra = intent.getExtras();
+        if (extra != null)
+          Util.d("handleIntent extra=" + extra.toString());
+
         switch (action) {
             case "net.i2p.android.router.START_I2P":
                 if (mViewPager.getCurrentItem() != 0)
                     mViewPager.setCurrentItem(0, false);
                 autoStart();
                 break;
-
+            case "net.i2p.android.router.service.APPROVE_SAM":
+                Util.w("Affirmed SAM Connection");
+                String ID = extra.getString("ID");
+                Util.d("SAM ID was: " + ID);
+                AndroidSAMSecureSession.affirmResult(ID);
+                break;
             case Intent.ACTION_PICK:
                 mViewPager.setFixedPage(2, R.string.select_an_address);
                 break;

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

@@ -6,7 +6,8 @@ import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v7.app.AppCompatActivity;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import net.i2p.android.router.service.RouterBinder;
 import net.i2p.android.router.service.RouterService;

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

@@ -35,6 +35,7 @@ class InitActivities {
     public InitActivities(Context c) {
         ctx = c;
         myDir = Util.getFileDir(c);
+        Util.i("My app directory is "+myDir);
         _ourVersion = Util.getOurVersion(c);
     }
 
@@ -59,90 +60,89 @@ class InitActivities {
     }
 
     void initialize() {
+        Util.i("Initializing the I2P resources");
 
-        if (checkNewVersion()) {
-            List<Properties> lProps = Util.getPropertiesFromPreferences(ctx);
-            Properties props = lProps.get(0);
+        List<Properties> lProps = Util.getPropertiesFromPreferences(ctx);
+        Properties props = lProps.get(0);
 
-            props.setProperty("i2p.dir.temp", myDir + "/tmp");
-            props.setProperty("i2p.dir.pid", myDir + "/tmp");
-            // Time disabled in default router.config
-            // But lots of time problems on Android, not all carriers support NITZ
-            // and there was no NTP before 3.0. Tablets should be fine?
-            // Phones in airplane mode with wifi enabled still a problem.
-            // Deactivated phones in airplane mode definitely won't have correct time.
-            if (Build.VERSION.SDK_INT < 11)  // Honeycomb 3.0
-                props.setProperty("time.disabled", "false");
-            mergeResourceToFile(R.raw.router_config, "router.config", props);
-            mergeResourceToFile(R.raw.logger_config, "logger.config", lProps.get(1));
-            // This is not needed for now, i2ptunnel.config only contains tunnel
-            // settings, which can now be configured manually. We don't want to
-            // overwrite the user's tunnels.
-            //mergeResourceToFile(R.raw.i2ptunnel_config, "i2ptunnel.config", null);
-            copyResourceToFileIfAbsent(R.raw.i2ptunnel_config, "i2ptunnel.config");
-            // FIXME this is a memory hog to merge this way
-            mergeResourceToFile(R.raw.hosts_txt, "hosts.txt", null);
-            mergeResourceToFile(R.raw.more_hosts_txt, "hosts.txt", null);
-            copyResourceToFile(R.raw.blocklist_txt, "blocklist.txt");
+        props.setProperty("i2p.dir.temp", myDir + "/tmp");
+        props.setProperty("i2p.dir.pid", myDir + "/tmp");
+        // Time disabled in default router.config
+        // But lots of time problems on Android, not all carriers support NITZ
+        // and there was no NTP before 3.0. Tablets should be fine?
+        // Phones in airplane mode with wifi enabled still a problem.
+        // Deactivated phones in airplane mode definitely won't have correct time.
+        if (Build.VERSION.SDK_INT < 11)  // Honeycomb 3.0
+            props.setProperty("time.disabled", "false");
+        mergeResourceToFile(R.raw.router_config, "router.config", props);
+        mergeResourceToFile(R.raw.logger_config, "logger.config", lProps.get(1));
+        // This is not needed for now, i2ptunnel.config only contains tunnel
+        // settings, which can now be configured manually. We don't want to
+        // overwrite the user's tunnels.
+        //mergeResourceToFile(R.raw.i2ptunnel_config, "i2ptunnel.config", null);
+        copyResourceToFileIfAbsent(R.raw.i2ptunnel_config, "i2ptunnel.config");
+        // FIXME this is a memory hog to merge this way
+        mergeResourceToFile(R.raw.hosts_txt, "hosts.txt", null);
+        mergeResourceToFile(R.raw.more_hosts_txt, "hosts.txt", null);
+        copyResourceToFile(R.raw.blocklist_txt, "blocklist.txt");
 
-            File abDir = new File(myDir, "addressbook");
-            abDir.mkdir();
-            copyResourceToFile(R.raw.subscriptions_txt, "addressbook/subscriptions.txt");
-            mergeResourceToFile(R.raw.addressbook_config_txt, "addressbook/config.txt", null);
+        File abDir = new File(myDir, "addressbook");
+        abDir.mkdir();
+        copyResourceToFileIfAbsent(R.raw.subscriptions_txt, "addressbook/subscriptions.txt");
+        mergeResourceToFile(R.raw.addressbook_config_txt, "addressbook/config.txt", null);
 
-            File docsDir = new File(myDir, "docs");
-            docsDir.mkdir();
-            copyResourceToFile(R.raw.ahelper_conflict_header_ht, "docs/ahelper-conflict-header.ht");
-            copyResourceToFile(R.raw.ahelper_new_header_ht, "docs/ahelper-new-header.ht");
-            copyResourceToFile(R.raw.ahelper_notfound_header_ht, "docs/ahelper-notfound-header.ht");
-            copyResourceToFile(R.raw.auth_header_ht, "docs/auth-header.ht");
-            copyResourceToFile(R.raw.baduri_header_ht, "docs/baduri-header.ht");
-            copyResourceToFile(R.raw.denied_header_ht, "docs/denied-header.ht");
-            copyResourceToFile(R.raw.dnf_header_ht, "docs/dnf-header.ht");
-            copyResourceToFile(R.raw.dnfb_header_ht, "docs/dnfb-header.ht");
-            copyResourceToFile(R.raw.dnfh_header_ht, "docs/dnfh-header.ht");
-            copyResourceToFile(R.raw.dnfp_header_ht, "docs/dnfp-header.ht");
-            copyResourceToFile(R.raw.enc_header_ht, "docs/enc-header.ht");
-            copyResourceToFile(R.raw.encp_header_ht, "docs/encp-header.ht");
-            copyResourceToFile(R.raw.localhost_header_ht, "docs/localhost-header.ht");
-            copyResourceToFile(R.raw.nols_header_ht, "docs/nols-header.ht");
-            copyResourceToFile(R.raw.nolsp_header_ht, "docs/nolsp-header.ht");
-            copyResourceToFile(R.raw.noproxy_header_ht, "docs/noproxy-header.ht");
-            copyResourceToFile(R.raw.protocol_header_ht, "docs/protocol-header.ht");
-            copyResourceToFile(R.raw.reset_header_ht, "docs/reset-header.ht");
-            copyResourceToFile(R.raw.resetp_header_ht, "docs/resetp-header.ht");
+        File docsDir = new File(myDir, "docs");
+        docsDir.mkdir();
+        /*copyResourceToFile(R.raw.ahelper_conflict_header_ht, "docs/ahelper-conflict-header.ht");
+        copyResourceToFile(R.raw.ahelper_new_header_ht, "docs/ahelper-new-header.ht");
+        copyResourceToFile(R.raw.ahelper_notfound_header_ht, "docs/ahelper-notfound-header.ht");
+        copyResourceToFile(R.raw.auth_header_ht, "docs/auth-header.ht");
+        copyResourceToFile(R.raw.baduri_header_ht, "docs/baduri-header.ht");
+        copyResourceToFile(R.raw.denied_header_ht, "docs/denied-header.ht");
+        copyResourceToFile(R.raw.dnf_header_ht, "docs/dnf-header.ht");
+        copyResourceToFile(R.raw.dnfb_header_ht, "docs/dnfb-header.ht");
+        copyResourceToFile(R.raw.dnfh_header_ht, "docs/dnfh-header.ht");
+        copyResourceToFile(R.raw.dnfp_header_ht, "docs/dnfp-header.ht");
+        copyResourceToFile(R.raw.enc_header_ht, "docs/enc-header.ht");
+        copyResourceToFile(R.raw.encp_header_ht, "docs/encp-header.ht");
+        copyResourceToFile(R.raw.localhost_header_ht, "docs/localhost-header.ht");
+        copyResourceToFile(R.raw.nols_header_ht, "docs/nols-header.ht");
+        copyResourceToFile(R.raw.nolsp_header_ht, "docs/nolsp-header.ht");
+        copyResourceToFile(R.raw.noproxy_header_ht, "docs/noproxy-header.ht");
+        copyResourceToFile(R.raw.protocol_header_ht, "docs/protocol-header.ht");
+        copyResourceToFile(R.raw.reset_header_ht, "docs/reset-header.ht");
+        copyResourceToFile(R.raw.resetp_header_ht, "docs/resetp-header.ht");*/
 
-            File cssDir = new File(docsDir, "themes/console/light");
-            cssDir.mkdirs();
-            //copyResourceToFile(R.raw.console_css, "docs/themes/console/light/console.css");
-            //copyResourceToFile(R.raw.android_css, "docs/themes/console/light/android.css");
+        File cssDir = new File(docsDir, "themes/console/light");
+        cssDir.mkdirs();
+        //copyResourceToFile(R.raw.console_css, "docs/themes/console/light/console.css");
+        //copyResourceToFile(R.raw.android_css, "docs/themes/console/light/android.css");
 
-            File imgDir = new File(docsDir, "themes/console/images");
-            imgDir.mkdir();
-            copyResourceToFile(R.drawable.i2plogo, "docs/themes/console/images/i2plogo.png");
-            copyResourceToFile(R.drawable.itoopie_sm, "docs/themes/console/images/itoopie_sm.png");
-            //copyResourceToFile(R.drawable.outbound, "docs/themes/console/images/outbound.png");
-            //copyResourceToFile(R.drawable.inbound, "docs/themes/console/images/inbound.png");
+        File imgDir = new File(docsDir, "themes/console/images");
+        imgDir.mkdir();
+        copyResourceToFile(R.drawable.i2plogo, "docs/themes/console/images/i2plogo.png");
+        copyResourceToFile(R.drawable.itoopie_sm, "docs/themes/console/images/itoopie_sm.png");
+        //copyResourceToFile(R.drawable.outbound, "docs/themes/console/images/outbound.png");
+        //copyResourceToFile(R.drawable.inbound, "docs/themes/console/images/inbound.png");
 
-            File img2Dir = new File(cssDir, "images");
-            img2Dir.mkdir();
-            //copyResourceToFile(R.drawable.header, "docs/themes/console/light/images/header.png");
+        File img2Dir = new File(cssDir, "images");
+        img2Dir.mkdir();
+        //copyResourceToFile(R.drawable.header, "docs/themes/console/light/images/header.png");
 
-            File certDir = new File(myDir, "certificates");
-            certDir.mkdir();
-            File certificates = new File(myDir, "certificates");
-            File[] allcertificates = certificates.listFiles();
-            if ( allcertificates != null) {
-                for (File f : allcertificates) {
-                    Util.d("Deleting old certificate file/dir " + f);
-                    FileUtil.rmdir(f, false);
-                }
+        File certDir = new File(myDir, "certificates");
+        certDir.mkdir();
+        File certificates = new File(myDir, "certificates");
+        File[] allCertificates = certificates.listFiles();
+        if ( allCertificates != null) {
+            for (File f : allCertificates) {
+                Util.d("Deleting old certificate file/dir " + f);
+                FileUtil.rmdir(f, false);
             }
-            unzipResourceToDir(R.raw.certificates_zip, "certificates");
-            //File netDBDir = new File(myDir, "netDB");
-            //netDBDir.mkdir();
-            //unzipResourceToDir(R.raw.netdb_zip, "netDB");
         }
+        File netDBDir = new File(myDir, "netDB");
+        netDBDir.mkdir();
+        //unzipResourceToDir(R.raw.netdb_zip, "netDB");
+        unzipResourceToDir(R.raw.certificates_zip, "certificates");
 
         // Set up the locations so settings can find them
         System.setProperty("i2p.dir.base", myDir);
@@ -178,10 +178,16 @@ class InitActivities {
                 out.write(buf, 0, read);
 
         } catch (IOException ioe) {
+            Util.e("copyResourceToFile" + "IOE: ", ioe);
         } catch (Resources.NotFoundException nfe) {
+            Util.e("copyResourceToFile" + "NFE: ", nfe);
         } finally {
-            if (in != null) try { in.close(); } catch (IOException ioe) {}
-            if (out != null) try { out.close(); } catch (IOException ioe) {}
+            if (in != null) try { in.close(); } catch (IOException ioe) {
+                Util.e("copyResourceToFile" + "IOE in.close(): ", ioe);
+            }
+            if (out != null) try { out.close(); } catch (IOException ioe) {
+                Util.e("copyResourceToFile" + "IOE out.close(): ", ioe);
+            }
         }
     }
     /**
@@ -192,7 +198,7 @@ class InitActivities {
         FileOutputStream out = null;
         ZipInputStream zis = null;
 
-        Util.d("Creating files in '" + myDir + "/" + folder + "/' from resource");
+        Util.i("Creating files in '" + myDir + "/" + folder + "/' from resource");
         try {
             // Context methods
             in = ctx.getResources().openRawResource(resID);
@@ -200,6 +206,7 @@ class InitActivities {
             ZipEntry ze;
             while ((ze = zis.getNextEntry()) != null) {
                 out = null;
+                Util.i("unzipping "+ze);
                 try {
                     ByteArrayOutputStream baos = new ByteArrayOutputStream();
                     byte[] buffer = new byte[1024];
@@ -209,26 +216,51 @@ class InitActivities {
                     }
                     String name = ze.getName();
                     File f = new File(myDir + "/" + folder +"/" + name);
-                    if (ze.isDirectory()) {
-                        Util.d("Creating directory " + myDir + "/" + folder +"/" + name + " from resource");
+                    String canonicalPath = f.getCanonicalPath().replace("/user/0/", "/data/");
+                    // account for canonical path differences when using .aab bundles
+                    if (!canonicalPath.startsWith(myDir.replace("/user/0/", "/data/"))) {
+                        // If these don't match, there's a path-traversal possibility.
+                        // So ignore it.
+                        Util.e("Path mismatch bug " + canonicalPath.toString() + " " + myDir.toString());
+                    } else if (ze.isDirectory()) {
+                        Util.i("Creating directory " + myDir + "/" + folder +"/" + name + " from resource");
                         f.mkdir();
                     } else {
-                        Util.d("Creating file " + myDir + "/" + folder +"/" + name + " from resource");
+                        Util.i("Creating file " + myDir + "/" + folder +"/" + name + " from resource");
+                        //create all the leading directories
+                        File newFile = new File(myDir+"/"+folder+"/"+name);
+                        newFile.getParentFile().mkdirs();
                         byte[] bytes = baos.toByteArray();
                         out = new FileOutputStream(f);
                         out.write(bytes);
                     }
                 } catch (IOException ioe) {
+                    Util.e("unzipResourceToDir" + "IOE: ", ioe);
                 } finally {
-                    if (out != null) { try { out.close(); } catch (IOException ioe) {} out = null; }
+                    if (out != null) {
+                        try {
+                            out.close();
+                        } catch (IOException ioe) {
+                            Util.e("unzipResourceToDir" + "IOE: interior out.close ", ioe);
+                        }
+                        out = null;
+                    }
                 }
             }
         } catch (IOException ioe) {
+            Util.e("unzipResourceToDir" + "IOE: ", ioe);
         } catch (Resources.NotFoundException nfe) {
+            Util.e("unzipResourceToDir" + "NFE: ", nfe);
         } finally {
-            if (in != null) try { in.close(); } catch (IOException ioe) {}
-            if (out != null) try { out.close(); } catch (IOException ioe) {}
-            if (zis != null) try { zis.close(); } catch (IOException ioe) {}
+            if (in != null) try { in.close(); } catch (IOException ioe) {
+                Util.e("unzipResourceToDir" + "IOE: in.close() ", ioe);
+            }
+            if (out != null) try { out.close(); } catch (IOException ioe) {
+                Util.e("unzipResourceToDir" + "IOE: out.close() ", ioe);
+            }
+            if (zis != null) try { zis.close(); } catch (IOException ioe) {
+                Util.e("unzipResourceToDir" + "IOE: zis.close() ", ioe);
+            }
         }
     }
 
@@ -252,18 +284,31 @@ class InitActivities {
     private boolean checkNewVersion() {
         Properties props = new Properties();
 
+        Util.i("Checking for a new install/version");
         InputStream fin = null;
         try {
             fin = ctx.openFileInput(CONFIG_FILE);
             DataHelper.loadProps(props,  fin);
         } catch (IOException ioe) {
-            Util.d("Looks like a new install");
+            Util.i("Looks like a new install");
         } finally {
-            if (fin != null) try { fin.close(); } catch (IOException ioe) {}
+            if (fin != null) {
+                try {
+                    Util.i("fin was not null "+CONFIG_FILE);
+                    fin.close();
+                } catch (IOException ioe) {
+                    Util.i("Error loading config:", ioe);
+                }
+            }else {
+                Util.i("fin was null");
+            }
         }
 
         String oldVersion = props.getProperty(PROP_INSTALLED_VERSION);
+        Util.i("Old version is:"+oldVersion);
         boolean newInstall = oldVersion == null;
+        if (newInstall)
+            return true;
         boolean newVersion = !_ourVersion.equals(oldVersion);
 
         if (newVersion) {

app/src/main/java/net/i2p/android/apps/EepGetFetcher.java

@@ -5,6 +5,8 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Locale;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.util.EepGet;
@@ -83,7 +85,7 @@ public class EepGetFetcher implements EepGet.StatusListener {
         int semi = rv.indexOf(";");
         if (semi > 0)
             rv = rv.substring(0, semi);
-        return rv.toLowerCase();
+        return rv.toLowerCase(Locale.US);
     }
 
     /**

app/src/main/java/net/i2p/android/apps/NewsFetcher.java

@@ -1,22 +1,41 @@
 package net.i2p.android.apps;
 
+import static net.i2p.app.ClientAppState.INITIALIZED;
+import static net.i2p.app.ClientAppState.RUNNING;
+import static net.i2p.app.ClientAppState.STARTING;
+import static net.i2p.app.ClientAppState.STOPPED;
+import static net.i2p.app.ClientAppState.STOPPING;
+import static net.i2p.app.ClientAppState.UNINITIALIZED;
+import static net.i2p.update.UpdateType.BLOCKLIST;
+
 import android.content.Context;
 
 import net.i2p.android.router.NewsActivity;
 import net.i2p.android.router.R;
 import net.i2p.android.router.util.Notifications;
+import net.i2p.app.ClientApp;
+import net.i2p.app.ClientAppManager;
+import net.i2p.app.ClientAppState;
 import net.i2p.crypto.SU3File;
+import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
+import net.i2p.data.Hash;
+import net.i2p.router.Banlist;
+import net.i2p.router.Blocklist;
 import net.i2p.router.RouterContext;
+import net.i2p.router.news.BlocklistEntries;
 import net.i2p.router.news.NewsEntry;
 import net.i2p.router.news.NewsMetadata;
 import net.i2p.router.news.NewsXMLParser;
+import net.i2p.util.Addresses;
 import net.i2p.util.EepGet;
 import net.i2p.util.FileUtil;
+import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
-import net.i2p.util.ReusableGZIPInputStream;
-import net.i2p.util.SecureFileOutputStream;
 import net.i2p.util.RFC822Date;
+import net.i2p.util.ReusableGZIPInputStream;
+import net.i2p.util.SecureFile;
+import net.i2p.util.SecureFileOutputStream;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -27,13 +46,17 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 /**
  * From router console, simplified since we don't deal with router versions
  * or updates.
+ *
+ * As of 0.9.41, implements ClientApp to hang us off the ClientAppManager,
+ * so we can remove the static reference.
  */
-public class NewsFetcher implements Runnable, EepGet.StatusListener {
+public class NewsFetcher implements Runnable, EepGet.StatusListener, ClientApp {
     private final Context mCtx;
     private final RouterContext _context;
     private final Notifications _notif;
@@ -44,20 +67,22 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     private boolean _invalidated;
     private File _newsFile;
     private File _tempFile;
-    private static NewsFetcher _instance;
     private volatile boolean _isRunning = true;
     private Thread _thread;
+    private final ClientAppManager _mgr;
+    private volatile ClientAppState _state = UNINITIALIZED;
+    public static final String APP_NAME = "NewsFetcher";
 
-    public static /*final */ NewsFetcher getInstance() {
-        return _instance;
-    }
+    static final String PROP_BLOCKLIST_TIME = "router.blocklistVersion";
+    private static final String BLOCKLIST_DIR = "docs/feed/blocklist";
+    private static final String BLOCKLIST_FILE = "blocklist.txt";
 
+    /**
+     *  As of 0.9.41, returns a new one every time. Only call once.
+     */
     public static /* final */ synchronized NewsFetcher getInstance(
             Context context, RouterContext ctx, Notifications notif) {
-        if (_instance != null)
-            return _instance;
-        _instance = new NewsFetcher(context, ctx, notif);
-        return _instance;
+        return new NewsFetcher(context, ctx, notif);
     }
 
     private static final String NEWS_DIR = "docs";
@@ -71,18 +96,17 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
      *
      * @since 0.7.14 not configurable
      */
-    private static final String BACKUP_NEWS_URL_SU3 = "http://avviiexdngd32ccoy4kuckvc3mkf53ycvzbz6vz75vzhv4tbpk5a.b32.i2p/news.su3";
+    private static final String BACKUP_NEWS_URL_SU3 = "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/news.su3";
     private static final String PROP_LAST_CHECKED = "router.newsLastChecked";
     private static final String PROP_REFRESH_FREQUENCY = "router.newsRefreshFrequency";
     private static final String DEFAULT_REFRESH_FREQUENCY = 24 * 60 * 60 * 1000 + "";
     private static final String PROP_NEWS_URL = "router.newsURL";
-    public static final String DEFAULT_NEWS_URL_SU3 = "http://echelon.i2p/news/news.su3";
+    public static final String DEFAULT_NEWS_URL_SU3 = "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3";
 
     private NewsFetcher(Context context, RouterContext ctx, Notifications notif) {
         mCtx = context;
         _context = ctx;
         _notif = notif;
-        _context.addShutdownTask(new Shutdown());
         _log = ctx.logManager().getLog(NewsFetcher.class);
         try {
             String last = ctx.getProperty(PROP_LAST_CHECKED);
@@ -96,6 +120,9 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
         _newsFile = new File(newsDir, NEWS_FILE);
         _tempFile = new File(_context.getTempDir(), TEMP_NEWS_FILE);
         updateLastFetched();
+        _mgr = ctx.clientAppManager();
+        changeState(INITIALIZED);
+        _mgr.register(this);
     }
 
     private void updateLastFetched() {
@@ -134,7 +161,17 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     private static final long RUN_DELAY = 30 * 60 * 1000;
 
     public void run() {
-        _thread = Thread.currentThread();
+        changeState(RUNNING);
+        try {
+            run2();
+        } finally {
+            _mgr.unregister(this);
+            changeState(STOPPED);
+        }
+    }
+
+
+    private void run2() {
         try {
             Thread.sleep(INITIAL_DELAY);
         } catch (InterruptedException ie) {
@@ -276,14 +313,6 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     public void attempting(String url) {
     }
 
-    private class Shutdown implements Runnable {
-        public void run() {
-            _isRunning = false;
-            if (_thread != null)
-                _thread.interrupt();
-        }
-    }
-
     //
     // SU3 handlers
     //
@@ -323,6 +352,11 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
             xml.delete();
             NewsMetadata data = parser.getMetadata();
             List<NewsEntry> entries = parser.getEntries();
+            BlocklistEntries ble = parser.getBlocklistEntries();
+            if (ble != null && ble.isVerified())
+                processBlocklistEntries(ble);
+            else
+                _log.info("No blocklist entries found in news feed");
             String sudVersion = su3.getVersionString();
             String signingKeyName = su3.getSignerString();
             File to3 = new File(_context.getTempDir(), "tmp3-" + _context.random().nextInt() + ".xml");
@@ -333,6 +367,104 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
         }
     }
 
+    /**
+     *  Process blocklist entries
+     *
+     *  @since 0.9.57
+     */
+    private void processBlocklistEntries(BlocklistEntries ble) {
+        long oldTime = _context.getProperty(PROP_BLOCKLIST_TIME, 0L);
+        if (ble.updated <= oldTime) {
+            if (_log.shouldWarn())
+                _log.warn("Not processing blocklist " + DataHelper.formatDate(ble.updated) +
+                        ", already have " + DataHelper.formatDate(oldTime));
+            return;
+        }
+        Blocklist bl = _context.blocklist();
+        Banlist ban = _context.banlist();
+        String reason = "Blocklist feed " + DataHelper.formatDate(ble.updated);
+        int banned = 0;
+        for (Iterator<String> iter = ble.entries.iterator(); iter.hasNext(); ) {
+            String s = iter.next();
+            if (s.length() == 44) {
+                byte[] b = Base64.decode(s);
+                if (b == null || b.length != Hash.HASH_LENGTH) {
+                    iter.remove();
+                    continue;
+                }
+                Hash h = Hash.create(b);
+                if (!ban.isBanlistedForever(h)) {
+                    ban.banlistRouterForever(h, reason);
+                    _context.commSystem().forceDisconnect(h);
+                }
+            } else {
+                byte[] ip = Addresses.getIP(s);
+                if (ip == null) {
+                    iter.remove();
+                    continue;
+                }
+                if (!bl.isBlocklisted(ip))
+                    bl.add(ip);
+            }
+            if (++banned >= BlocklistEntries.MAX_ENTRIES) {
+                // prevent somebody from destroying the whole network
+                break;
+            }
+        }
+        for (String s : ble.removes) {
+            if (s.length() == 44) {
+                byte[] b = Base64.decode(s);
+                if (b == null || b.length != Hash.HASH_LENGTH)
+                    continue;
+                Hash h = Hash.create(b);
+                if (ban.isBanlistedForever(h))
+                    ban.unbanlistRouter(h);
+            } else {
+                byte[] ip = Addresses.getIP(s);
+                if (ip == null)
+                    continue;
+                if (bl.isBlocklisted(ip))
+                    bl.remove(ip);
+            }
+        }
+        // Save the blocks. We do not save the unblocks.
+        File f = new SecureFile(_context.getConfigDir(), BLOCKLIST_DIR);
+        f.mkdirs();
+        f = new File(f, BLOCKLIST_FILE);
+        boolean fail = false;
+        BufferedWriter out = null;
+        try {
+            out = new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(f), "UTF-8"));
+            out.write("# ");
+            out.write(ble.supdated);
+            out.newLine();
+            banned = 0;
+            for (String s : ble.entries) {
+                s = s.replace(':', ';');  // IPv6
+                out.write(reason);
+                out.write(':');
+                out.write(s);
+                out.newLine();
+                if (++banned >= BlocklistEntries.MAX_ENTRIES)
+                    break;
+            }
+        } catch (IOException ioe) {
+            _log.error("Error writing blocklist", ioe);
+            fail = true;
+        } finally {
+            if (out != null) try {
+                out.close();
+            } catch (IOException ioe) {}
+        }
+        if (!fail) {
+            f.setLastModified(ble.updated);
+            String upd = Long.toString(ble.updated);
+            _context.router().saveConfig(PROP_BLOCKLIST_TIME, upd);
+        }
+        if (_log.shouldWarn())
+            _log.warn("Processed " + ble.entries.size() + " blocks and " + ble.removes.size() + " unblocks from news feed");
+    }
+
     /**
      *  Gunzip the file
      *
@@ -417,4 +549,69 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
             } catch (IOException ioe) {}
         }
     }
+
+    ////// begin ClientApp interface
+
+    /**
+     *  @since 0.9.41
+     */
+    public synchronized void startup() {
+        changeState(STARTING);
+        _thread = new I2PAppThread(this, "NewsFetcher", true);
+        _thread.start();
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    public synchronized void shutdown(String[] args) {
+        if (_state != RUNNING)
+            return;
+        changeState(STOPPING);
+        _isRunning = false;
+        if (_thread != null)
+            _thread.interrupt();
+        changeState(STOPPED);
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    public ClientAppState getState() {
+        return _state;
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    public String getName() {
+        return APP_NAME;
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    public String getDisplayName() {
+        return APP_NAME;
+    }
+
+    ////// end ClientApp interface
+    ////// begin ClientApp helpers
+
+    /**
+     *  @since 0.9.41
+     */
+    private void changeState(ClientAppState state) {
+        changeState(state, null);
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    private synchronized void changeState(ClientAppState state, Exception e) {
+        _state = state;
+        _mgr.notify(this, state, null, e);
+    }
+
+    ////// end ClientApp helpers
 }

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

@@ -1,19 +1,26 @@
 package net.i2p.android.help;
 
+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.support.annotation.NonNull;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 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;
 
+    private boolean isInstalled;
     /**
      * A browser that we don't know about.
      *
@@ -80,4 +87,23 @@ public class Browser implements Comparable<Browser> {
         } else
             return 2;
     }
+
+    public boolean isInstalled(Context context){
+        if (isInstalled) {
+            return true;
+        }
+        // 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 = context.getPackageManager();
+        List<ResolveInfo> installedBrowsers = pm.queryIntentActivities(intent, 0);
+        for (ResolveInfo browser : installedBrowsers) {
+            if (browser.activityInfo.packageName.equals(packageName)) {
+                isInstalled = true;
+                break;
+            }
+        }
+        return isInstalled;
+    }
 }

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

@@ -6,7 +6,8 @@ import android.content.Intent;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.net.Uri;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -73,11 +74,15 @@ public class BrowserAdapter extends RecyclerView.Adapter<BrowserAdapter.ViewHold
         holder.mLabel.setText(browser.label);
 
         if (browser.isKnown) {
-            if (browser.isRecommended && browser.isInstalled) {
+            if (browser.isRecommended && browser.isInstalled(mCtx)) {
                 holder.mStatus.setImageDrawable(
                         mCtx.getResources().getDrawable(R.drawable.ic_stars_white_24dp));
                 holder.mStatus.setVisibility(View.VISIBLE);
-            } else if (browser.isSupported && !browser.isInstalled) {
+            } else if (browser.isSupported && browser.isInstalled(mCtx)) {
+                holder.mStatus.setImageDrawable(
+                        mCtx.getResources().getDrawable(R.drawable.ic_stars_white_24dp));
+                holder.mStatus.setVisibility(View.INVISIBLE);
+            } else if (browser.isSupported && !browser.isInstalled(mCtx)) {
                 holder.mStatus.setImageDrawable(
                         mCtx.getResources().getDrawable(R.drawable.ic_shop_white_24dp));
                 holder.mStatus.setOnClickListener(new View.OnClickListener() {
@@ -94,7 +99,7 @@ public class BrowserAdapter extends RecyclerView.Adapter<BrowserAdapter.ViewHold
                     }
                 });
                 holder.mStatus.setVisibility(View.VISIBLE);
-            } else if (!browser.isSupported) {
+            } else if (browser.isInstalled(mCtx) && !browser.isSupported) {
                 // Make the icon gray-scale to show it is unsupported
                 ColorMatrix matrix = new ColorMatrix();
                 matrix.setSaturation(0);

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

@@ -1,8 +1,10 @@
 package net.i2p.android.help;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import net.i2p.android.router.R;

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

@@ -8,11 +8,16 @@ 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.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
+//import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,6 +31,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.List;
 import java.util.Map;
 
@@ -100,8 +107,28 @@ public class BrowserListFragment extends Fragment implements
                     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));
+            unsupported = allBrowsers(context);//Arrays.asList(
+                    //context.getResources().getStringArray(R.array.unsupported_browsers));
+        }
+
+        public List<String> allBrowsers(Context context){
+            //try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse("http://www.google.com"));
+                List<ResolveInfo> browserList;
+                PackageManager pm = context.getPackageManager();
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    // gets all
+                    browserList = pm.queryIntentActivities(intent, PackageManager.MATCH_ALL);
+                } else {
+                    browserList = pm.queryIntentActivities(intent, 0);
+                }
+            //}catch()
+            List<String> finalResult = new ArrayList<String>();
+            for (ResolveInfo ri : browserList){
+                finalResult.add(ri.resolvePackageName);
+            }
+            return finalResult;
         }
 
         @Override
@@ -121,8 +148,9 @@ public class BrowserListFragment extends Fragment implements
             intent.setData(Uri.parse("http://stats.i2p"));
 
             final PackageManager pm = getContext().getPackageManager();
-            List<ResolveInfo> installedBrowsers = pm.queryIntentActivities(intent, 0);
+            Set<ResolveInfo> installedBrowsers = new HashSet<>(pm.queryIntentActivities(intent, 0));
 
+            // Compare installed browsers to supported browsers
             for (ResolveInfo browser : installedBrowsers) {
                 if (recommended.contains(browser.activityInfo.packageName)) {
                     browsers.add(new Browser(pm, browser, true, true));

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

@@ -2,10 +2,14 @@ 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.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.NavUtils;
+import androidx.core.app.NavUtils;
+//import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.TaskStackBuilder;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 

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

@@ -1,7 +1,8 @@
 package net.i2p.android.help;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -2,7 +2,8 @@ package net.i2p.android.help;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;

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

@@ -2,8 +2,10 @@ package net.i2p.android.i2ptunnel;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 import net.i2p.android.I2PActivityBase;

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

@@ -10,12 +10,17 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -81,7 +86,7 @@ public class TunnelDetailFragment extends Fragment {
         try {
             mGroup = TunnelControllerGroup.getInstance();
             error = mGroup == null ? getResources().getString(R.string.i2ptunnel_not_initialized) : null;
-            controllers = mGroup.getControllers();
+            controllers = mGroup == null ? null : mGroup.getControllers();
         } catch (IllegalArgumentException iae) {
             mGroup = null;
             controllers = null;

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

@@ -20,6 +20,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+/**
+ *  A single tunnel.
+ *  Stored by the TunnelEntryAdapter.
+ */
 public class TunnelEntry {
     public static final int RUNNING = 1;
     public static final int STARTING = 2;
@@ -31,6 +35,7 @@ public class TunnelEntry {
     private final int mId;
 
     /**
+     * @param tcg non-null
      * @return the new TunnelEntry, or null if there was an error.
      */
     public static TunnelEntry createNewTunnel(

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

@@ -2,25 +2,37 @@ package net.i2p.android.i2ptunnel;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.util.Pair;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
+//import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import net.i2p.android.router.R;
 import net.i2p.android.util.FragmentUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
+/**
+ *  Contains the List of TunnelEntries.
+ *  There's two of these, one for client tunnels and
+ *  one for server tunnels.
+ *  Created by the TunnelListFragment.
+ */
 public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-    private Context mCtx;
-    private boolean mClientTunnels;
-    private TunnelListFragment.OnTunnelSelectedListener mListener;
-    private FragmentUtils.TwoPaneProvider mTwoPane;
+    private final Context mCtx;
+    private final boolean mClientTunnels;
+    private final TunnelListFragment.OnTunnelSelectedListener mListener;
+    private final FragmentUtils.TwoPaneProvider mTwoPane;
     private List<TunnelEntry> mTunnels;
     /**
      * The current activated item position. Only used on tablets.
@@ -34,10 +46,10 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
     }
 
     public static class TunnelViewHolder extends RecyclerView.ViewHolder {
-        public ImageView status;
-        public TextView name;
-        public TextView description;
-        public TextView interfacePort;
+        public final ImageView status;
+        public final TextView name;
+        public final TextView description;
+        public final TextView interfacePort;
 
         public TunnelViewHolder(View itemView) {
             super(itemView);
@@ -65,6 +77,8 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
     }
 
     public void addTunnel(TunnelEntry tunnel) {
+        if (mTunnels == null)
+            mTunnels = new ArrayList<TunnelEntry>();
         boolean wasEmpty = mTunnels.isEmpty();
         mTunnels.add(tunnel);
         if (wasEmpty) {
@@ -120,13 +134,24 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         }
     }
 
+    private void setClipboard(Context context, String text) {
+        if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB) {
+            android.text.ClipboardManager clipboard = (android.text.ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+            clipboard.setText(text);
+        } else {
+            android.content.ClipboardManager clipboard = (android.content.ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+            android.content.ClipData clip = android.content.ClipData.newPlainText("Copied Text", text);
+            clipboard.setPrimaryClip(clip);
+        }
+    }
+
     // Replace the contents of a view (invoked by the layout manager)
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, final int position) {
         switch (holder.getItemViewType()) {
             case R.string.router_not_running:
                 ((TextView) holder.itemView).setText(
-                        mCtx.getString(R.string.router_not_running));
+                        mCtx.getString(R.string.i2ptunnel_not_initialized));
                 break;
 
             case R.layout.listitem_empty:
@@ -155,6 +180,16 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
                 tvh.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
+                        // TODO
+                        // lint priority 8/10
+                        // lint: Do not treat position as fixed; only use immediately and call holder.getAdapterPosition() to look it up later
+                        // javadocs: Note that unlike ListView, RecyclerView will not call this method again
+                        // if the position of the item changes in the data set unless the item itself is invalidated
+                        // or the new position cannot be determined.
+                        // For this reason, you should only use the position parameter while acquiring
+                        // the related data item inside this method and should not keep a copy of it.
+                        // If you need the position of an item later on (e.g. in a click listener),
+                        // use RecyclerView.ViewHolder.getAdapterPosition() which will have the updated adapter position.
                         int oldPosition = mActivatedPosition;
                         mActivatedPosition = position;
                         notifyItemChanged(oldPosition);
@@ -164,6 +199,19 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
                                 ViewCompat.getTransitionName(tvh.status));
                         Pair<View, String>[] pairs = new Pair[]{ statusPair};
                         mListener.onTunnelSelected(tunnel.getId(), pairs);
+                        view.invalidate();
+                    }
+                });
+                tvh.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                    //@Override
+                    public boolean onLongClick(View view) {
+                        setClipboard(mCtx, tunnel.getDestHashBase32());
+                        Toast clipboardMessage = Toast.makeText(mCtx, R.string.copied_base32_system_notification_title, Toast. LENGTH_LONG);
+                        clipboardMessage.setGravity(Gravity.TOP, 0, 0); //optional
+                        clipboardMessage.show();
+                        view.invalidate();
+                        return true;
+
                     }
                 });
                 break;
@@ -171,6 +219,7 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
             default:
                 break;
         }
+
     }
 
     // Return the size of the dataset (invoked by the layout manager)

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

@@ -2,7 +2,8 @@ package net.i2p.android.i2ptunnel;
 
 import android.content.Context;
 import android.os.Handler;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import net.i2p.android.router.util.Util;
 import net.i2p.i2ptunnel.TunnelController;
@@ -13,10 +14,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class TunnelEntryLoader extends AsyncTaskLoader<List<TunnelEntry>> {
-    private TunnelControllerGroup mGroup;
-    private boolean mClientTunnels;
+    private final TunnelControllerGroup mGroup;
+    private final boolean mClientTunnels;
     private List<TunnelEntry> mData;
-    private Handler mHandler;
+    private final Handler mHandler;
     private TunnelControllerMonitor mMonitor;
 
     public TunnelEntryLoader(Context context, TunnelControllerGroup tcg, boolean clientTunnels) {

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

@@ -6,13 +6,20 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 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.v4.content.LocalBroadcastManager;
-import android.support.v4.util.Pair;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
+//import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,6 +38,12 @@ import net.i2p.i2ptunnel.TunnelControllerGroup;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ *  The list of tunnels.
+ *  There's two of these, one for client tunnels and
+ *  one for server tunnels.
+ *  Creates the TunnelEntryAdapter.
+ */
 public class TunnelListFragment extends Fragment implements
         LoaderManager.LoaderCallbacks<List<TunnelEntry>> {
     public static final String SHOW_CLIENT_TUNNELS = "show_client_tunnels";
@@ -51,6 +64,8 @@ public class TunnelListFragment extends Fragment implements
     private TunnelEntryAdapter mAdapter;
     private boolean mClientTunnels;
 
+    private static final String KEY_SELECTED_TUNNEL = "selected_tunnel";
+
     // Container Activity must implement this interface
     public interface OnTunnelSelectedListener {
         void onTunnelSelected(int tunnelId, Pair<View, String>[] pairs);
@@ -94,6 +109,12 @@ public class TunnelListFragment extends Fragment implements
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        if (savedInstanceState != null) {
+            int tunnelId = savedInstanceState.getInt(KEY_SELECTED_TUNNEL, -1);
+            if (tunnelId != -1) {
+                mCallback.onTunnelSelected(tunnelId, null);
+            }
+        }
     }
 
     @Override

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

@@ -6,9 +6,11 @@ import android.content.Context;
 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.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import net.i2p.android.router.R;
 import net.i2p.android.wizard.model.AbstractWizardModel;

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

@@ -1,15 +1,25 @@
 package net.i2p.android.i2ptunnel;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.util.Pair;
-import android.support.v4.view.ViewPager;
+//import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
+//import android.support.v4.app.ActivityOptionsCompat;
+import androidx.core.app.ActivityOptionsCompat;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentPagerAdapter;
+//import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
+//import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
+
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -19,7 +29,17 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
-import com.viewpagerindicator.TitlePageIndicator;
+import com.google.android.material.tabs.TabLayout;
+import net.lucode.hackware.magicindicator.MagicIndicator;
+import net.lucode.hackware.magicindicator.ViewPagerHelper;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView;
+import androidx.core.content.ContextCompat;
 
 import net.i2p.android.i2ptunnel.preferences.EditTunnelContainerFragment;
 import net.i2p.android.i2ptunnel.util.TunnelUtil;
@@ -33,6 +53,11 @@ import net.i2p.router.RouterContext;
 
 import java.util.List;
 
+/**
+ *  The top level Fragment of the tunnels tabs.
+ *  Creates client and server TunnelListFragments,
+ *  the options menu, and the new tunnel wizard button.
+ */
 public class TunnelsContainer extends Fragment implements
         FragmentUtils.TwoPaneProvider,
         TunnelListFragment.OnTunnelSelectedListener,
@@ -47,7 +72,7 @@ public class TunnelsContainer extends Fragment implements
     private boolean mTwoPane;
 
     ViewPager mViewPager;
-    TitlePageIndicator mPageIndicator;
+    MagicIndicator mPageIndicator;
     FragmentPagerAdapter mFragPagerAdapter;
 
     private static final String FRAGMENT_CLIENT = "client_fragment";
@@ -65,27 +90,28 @@ public class TunnelsContainer extends Fragment implements
         setHasOptionsMenu(true);
     }
 
-    private boolean showActions() {
+    private static boolean showActions() {
         RouterContext rCtx = Util.getRouterContext();
         TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
         return rCtx != null && tcg != null &&
-                (tcg.getState() == ClientAppState.STARTING ||
-                        tcg.getState() == ClientAppState.RUNNING);
+               tcg.getState() == ClientAppState.RUNNING;
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.container_tunnels, container, false);
 
-        mViewPager = (ViewPager) v.findViewById(R.id.pager);
-        mPageIndicator = (TitlePageIndicator) v.findViewById(R.id.page_indicator);
-        mNewTunnel = (ImageButton) v.findViewById(R.id.promoted_action);
+        mViewPager = v.findViewById(R.id.pager);
+        mPageIndicator = v.findViewById(R.id.magic_indicator);
+        
+        mNewTunnel = v.findViewById(R.id.promoted_action);
         mNewTunnel.setVisibility(showActions() ? View.VISIBLE : View.GONE);
 
+        // Initialize ViewPager adapter
+        mFragPagerAdapter = new TunnelsPagerAdapter(getChildFragmentManager());
+        mViewPager.setAdapter(mFragPagerAdapter);
+
         if (v.findViewById(R.id.detail_fragment) != null) {
-            // The detail container view will be present only in the
-            // large-screen layouts (res/values-w720dp). If this view
-            // is present, then the activity should be in two-pane mode.
             mTwoPane = true;
         }
 
@@ -96,19 +122,22 @@ public class TunnelsContainer extends Fragment implements
                     savedInstanceState, FRAGMENT_SERVER);
         }
 
+        setupMagicIndicator();
+
         return v;
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-
+        
+        // Initialize ViewPager and adapter
         mFragPagerAdapter = new TunnelsPagerAdapter(getChildFragmentManager());
         mViewPager.setAdapter(mFragPagerAdapter);
 
-        // Bind the page indicator to the pager.
-        mPageIndicator.setViewPager(mViewPager);
+        setupMagicIndicator();
 
+        // Setup New Tunnel button
         mNewTunnel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -211,8 +240,17 @@ public class TunnelsContainer extends Fragment implements
         if (requestCode == TUNNEL_WIZARD_REQUEST) {
             if (resultCode == Activity.RESULT_OK) {
                 Bundle tunnelData = data.getExtras().getBundle(TUNNEL_WIZARD_DATA);
+                // ticket #2483
+                if (tunnelData == null)
+                    return;
                 // TODO fetch earlier
                 TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
+                if (tcg == null) {
+                    // router went away
+                    Toast.makeText(getActivity().getApplicationContext(),
+                                   R.string.router_not_running, Toast.LENGTH_LONG).show();
+                    return;
+                }
                 TunnelConfig cfg = TunnelUtil.createConfigFromWizard(getActivity(), tcg, tunnelData);
                 TunnelEntry tunnel = TunnelEntry.createNewTunnel(getActivity(), tcg, cfg);
 
@@ -257,9 +295,14 @@ public class TunnelsContainer extends Fragment implements
             // In two-pane mode, show the detail view in this activity by
             // adding or replacing the detail fragment using a
             // fragment transaction.
-            TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);
-            getChildFragmentManager().beginTransaction()
-                    .replace(R.id.detail_fragment, detailFrag).commit();
+            try {
+                TunnelDetailFragment detailFrag = TunnelDetailFragment.newInstance(tunnelId);
+                getChildFragmentManager().beginTransaction()
+                    .replace(R.id.detail_fragment, detailFrag)
+                    .commitNow(); // Use commitNow() to execute synchronously
+            } catch (Exception e) {
+                Log.e("TunnelsContainer", "Failed to update detail fragment", e);
+            }
         } else {
             // In single-pane mode, simply start the detail activity
             // for the selected item ID.
@@ -298,4 +341,54 @@ public class TunnelsContainer extends Fragment implements
             }
         }
     }
+
+    private void setupMagicIndicator() {
+        if (mPageIndicator == null || getContext() == null) {
+            return;
+        }
+    
+        CommonNavigator commonNavigator = new CommonNavigator(getContext());
+        commonNavigator.setAdjustMode(true);  // Add this line for better spacing
+        commonNavigator.setAdapter(new CommonNavigatorAdapter() {
+            @Override
+            public int getCount() {
+                return mFragPagerAdapter.getCount();
+            }
+    
+            @Override
+            public IPagerTitleView getTitleView(Context context, final int index) {
+                SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
+                simplePagerTitleView.setText(mFragPagerAdapter.getPageTitle(index));
+                simplePagerTitleView.setTextSize(16); // Add this line to increase text size
+                simplePagerTitleView.setNormalColor(ContextCompat.getColor(context, 
+                    R.color.primary_text_disabled_material_dark));
+                simplePagerTitleView.setSelectedColor(ContextCompat.getColor(context,
+                    R.color.primary_text_default_material_dark));
+                simplePagerTitleView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mViewPager.setCurrentItem(index);
+                    }
+                });
+                return simplePagerTitleView;
+            }
+    
+            @Override
+            public IPagerIndicator getIndicator(Context context) {
+                LinePagerIndicator indicator = new LinePagerIndicator(context);
+                indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
+                indicator.setColors(ContextCompat.getColor(context, R.color.primary));
+                indicator.setLineHeight(dpToPx(context, 3));
+                return indicator;
+            }
+        });
+    
+        mPageIndicator.setNavigator(commonNavigator);
+        ViewPagerHelper.bind(mPageIndicator, mViewPager);
+    }
+    
+    private int dpToPx(Context context, int dp) {
+        float density = context.getResources().getDisplayMetrics().density;
+        return Math.round(dp * density);
+    }
 }

app/src/main/java/net/i2p/android/i2ptunnel/preferences/AdvancedTunnelPreferenceFragment.java

@@ -3,11 +3,16 @@ package net.i2p.android.i2ptunnel.preferences;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
+//import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//import android.support.v7.preference.PreferenceCategory;
+import androidx.preference.PreferenceCategory;
+//import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
 
 import net.i2p.android.i2ptunnel.util.TunnelLogic;
 import net.i2p.android.i2ptunnel.util.TunnelUtil;

app/src/main/java/net/i2p/android/i2ptunnel/preferences/BaseTunnelPreferenceFragment.java

@@ -2,9 +2,12 @@ package net.i2p.android.i2ptunnel.preferences;
 
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//import android.support.v7.preference.PreferenceGroup;
+import androidx.preference.PreferenceGroup;
+//import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
 import android.widget.Toast;
 
 import net.i2p.android.i2ptunnel.util.SaveTunnelTask;
@@ -16,6 +19,9 @@ import net.i2p.i2ptunnel.TunnelControllerGroup;
 import net.i2p.i2ptunnel.ui.TunnelConfig;
 
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.TimeUnit;
 
 public abstract class BaseTunnelPreferenceFragment extends CustomPreferenceFragment {
     protected static final String ARG_TUNNEL_ID = "tunnelId";
@@ -88,11 +94,15 @@ public abstract class BaseTunnelPreferenceFragment extends CustomPreferenceFragm
                 // TODO: There used to be a possible ANR here, because the underlying I2P code
                 // checks if the session is open as part of updating its config. We may need to save
                 // completely asynchronously (and ensure we do actually save before the app closes).
-                task.execute().get();
+                task.execute().get(2, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 Util.e("Interrupted while saving tunnel config", e);
             } catch (ExecutionException e) {
                 Util.e("Error while saving tunnel config", e);
+            } catch (CancellationException e) {
+                Util.e("Cancelled while saving tunnel config", e);
+            } catch (TimeoutException e) {
+                Util.e("Timed out while savomg tunnel config", e);
             }
         }
     }

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

@@ -2,10 +2,14 @@ package net.i2p.android.i2ptunnel.preferences;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.i2ptunnel.TunnelDetailActivity;
 import net.i2p.android.i2ptunnel.TunnelDetailFragment;

app/src/main/java/net/i2p/android/i2ptunnel/preferences/EditTunnelContainerFragment.java

@@ -1,9 +1,12 @@
 package net.i2p.android.i2ptunnel.preferences;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/net/i2p/android/i2ptunnel/preferences/GeneralTunnelPreferenceFragment.java

@@ -5,13 +5,20 @@ import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
+//import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
+//import android.support.v7.preference.ListPreference;
+import androidx.preference.ListPreference;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//import android.support.v7.preference.PreferenceCategory;
+import androidx.preference.PreferenceCategory;
+//import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
 
 import net.i2p.android.i2ptunnel.util.TunnelLogic;
 import net.i2p.android.i2ptunnel.util.TunnelUtil;
@@ -111,7 +118,8 @@ public class GeneralTunnelPreferenceFragment extends BaseTunnelPreferenceFragmen
                 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)));
+                // # TODO: See trac issue #2296
+                //portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
             }
         }
 
@@ -168,8 +176,11 @@ public class GeneralTunnelPreferenceFragment extends BaseTunnelPreferenceFragmen
 
         @Override
         protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            /*
+            # TODO: See trac issue #2296
             if (!isStandardOrIrc)
                 portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+                 */
         }
 
         @Override
@@ -185,7 +196,8 @@ public class GeneralTunnelPreferenceFragment extends BaseTunnelPreferenceFragmen
         @Override
         protected void generalServerHttpBidirOrStreamr(boolean isStreamr) {
             addPreferencesFromResource(R.xml.tunnel_gen_client_port, portCategory);
-            portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+            // # TODO: See trac issue #2296
+            //portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
             if (isStreamr)
                 portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_LISTEN_PORT)));
 
@@ -201,7 +213,8 @@ public class GeneralTunnelPreferenceFragment extends BaseTunnelPreferenceFragmen
         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)));
+                // # TODO: See trac issue #2296
+                //portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
             }
         }
 

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

@@ -15,9 +15,9 @@ import java.util.List;
  * InetAddress.getByName(), which will trigger a NetworkOnMainThreadException otherwise.
  */
 public class SaveTunnelTask  extends AsyncTask<Void, Void, List<String>> {
-    TunnelControllerGroup mGroup;
-    int mTunnelId;
-    TunnelConfig mCfg;
+    final TunnelControllerGroup mGroup;
+    final int mTunnelId;
+    final TunnelConfig mCfg;
 
     public SaveTunnelTask(TunnelControllerGroup group, int tunnelId, TunnelConfig cfg) {
         mGroup = group;

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

@@ -11,7 +11,7 @@ package net.i2p.android.i2ptunnel.util;
  * tunnel properties always exist.
  */
 public abstract class TunnelLogic {
-    protected String mType;
+    protected final String mType;
 
     public TunnelLogic(String type) {
         mType = type;

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

@@ -7,6 +7,7 @@ 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;
@@ -99,6 +100,7 @@ public class TunnelUtil extends GeneralHelper {
     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();
 
@@ -122,9 +124,9 @@ public class TunnelUtil extends GeneralHelper {
     }
 
     class TunnelToPreferences extends TunnelLogic {
-        SharedPreferences.Editor ed;
-        Resources res;
-        int tunnel;
+        final SharedPreferences.Editor ed;
+        final Resources res;
+        final int tunnel;
 
         public TunnelToPreferences(SharedPreferences.Editor ed, Resources res, int tunnel, String type) {
             super(type);
@@ -182,8 +184,10 @@ public class TunnelUtil extends GeneralHelper {
 
         @Override
         protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            /* # TODO: See trac issue #2296
             if (isStandardOrIrc)
                 ed.putBoolean(res.getString(R.string.TUNNEL_USE_SSL), isSSLEnabled(tunnel));
+                */
         }
 
         @Override
@@ -212,7 +216,8 @@ public class TunnelUtil extends GeneralHelper {
         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));
+                // # TODO: See trac issue #2296
+                //ed.putBoolean(res.getString(R.string.TUNNEL_USE_SSL), isSSLEnabled(tunnel));
             }
         }
 
@@ -325,6 +330,7 @@ public class TunnelUtil extends GeneralHelper {
     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();
 
@@ -345,11 +351,11 @@ public class TunnelUtil extends GeneralHelper {
     }
 
     class TunnelConfigFromPreferences extends TunnelLogic {
-        TunnelConfig cfg;
-        SharedPreferences prefs;
-        Resources res;
-        TunnelControllerGroup tcg;
-        int tunnel;
+        final TunnelConfig cfg;
+        final SharedPreferences prefs;
+        final Resources res;
+        final TunnelControllerGroup tcg;
+        final int tunnel;
 
         public TunnelConfigFromPreferences(TunnelConfig cfg, SharedPreferences prefs, Resources res,
                                            TunnelControllerGroup tcg, int tunnel, String type) {
@@ -414,8 +420,10 @@ public class TunnelUtil extends GeneralHelper {
 
         @Override
         protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            /* # TODO: See trac issue #2296
             if (isStandardOrIrc)
                 cfg.setUseSSL(prefs.getBoolean(res.getString(R.string.TUNNEL_USE_SSL), false));
+                */
         }
 
         @Override
@@ -444,7 +452,8 @@ public class TunnelUtil extends GeneralHelper {
         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));
+                // # TODO: See trac issue #2296
+                //cfg.setUseSSL(prefs.getBoolean(res.getString(R.string.TUNNEL_USE_SSL), false));
             }
         }
 
@@ -560,10 +569,17 @@ public class TunnelUtil extends GeneralHelper {
         }
     }
 
+    /**
+     *  @param data non-null
+     */
     public static TunnelConfig createConfigFromWizard(
             Context ctx, TunnelControllerGroup tcg, Bundle data) {
         return new TunnelUtil(tcg).createConfigFromWizard(ctx, data);
     }
+
+    /**
+     *  @param data non-null
+     */
     public TunnelConfig createConfigFromWizard(Context ctx, Bundle data) {
         // Get the Bundle keys
         Resources res = ctx.getResources();
@@ -574,21 +590,26 @@ public class TunnelUtil extends GeneralHelper {
         // 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);
+        try {
+            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();
+        } catch (NullPointerException ex) {
+            Util.e("Exception while trying to create config from wizard: "+ex.getMessage());
+        }
 
-        new TunnelConfigFromWizard(cfg, data, res, _group, type).runLogic();
 
         return cfg;
     }
 
     class TunnelConfigFromWizard extends TunnelLogic {
-        TunnelConfig cfg;
-        Bundle data;
-        Resources res;
-        TunnelControllerGroup tcg;
+        final TunnelConfig cfg;
+        final Bundle data;
+        final Resources res;
+        final TunnelControllerGroup tcg;
 
         public TunnelConfigFromWizard(TunnelConfig cfg, Bundle data, Resources res,
                                            TunnelControllerGroup tcg, String type) {

app/src/main/java/net/i2p/android/preferences/AdvancedPreferenceFragment.java

@@ -1,14 +1,15 @@
 package net.i2p.android.preferences;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.SettingsActivity;
 
-public class AdvancedPreferenceFragment extends PreferenceFragmentCompat {
+public class AdvancedPreferenceFragment extends I2PreferenceFragment {
     private static final String PREFERENCE_CATEGORY_TRANSPORTS = "preference_category_transports";
     private static final String PREFERENCE_CATEGORY_EXPL_TUNNELS = "preference_category_expl_tunnels";
 

app/src/main/java/net/i2p/android/preferences/GraphsPreferenceFragment.java

@@ -2,10 +2,14 @@ package net.i2p.android.preferences;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
+//import android.support.v7.preference.PreferenceCategory;
+import androidx.preference.PreferenceCategory;
+//import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
+//import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.SettingsActivity;

app/src/main/java/net/i2p/android/preferences/LoggingPreferenceFragment.java

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences;
 
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.SettingsActivity;

app/src/main/java/net/i2p/android/preferences/TransportsPreferenceFragment.java

@@ -1,12 +1,18 @@
 package net.i2p.android.preferences;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.CheckBoxPreference;
+//import android.support.v7.preference.Preference;
+//import android.support.v7.preference.PreferenceManager;
+//import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
 import android.widget.Toast;
 
 import net.i2p.android.router.R;
@@ -30,6 +36,7 @@ public class TransportsPreferenceFragment extends I2PreferenceFragment {
         ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_label_transports);
     }
 
+    @SuppressLint("ApplySharedPref")
     private void loadProperties() {
         Context context= getActivity();
         RouterContext ctx = Util.getRouterContext();

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

@@ -2,7 +2,8 @@ package net.i2p.android.preferences.util;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.preference.EditTextPreference;
+//import android.support.v7.preference.EditTextPreference;
+import androidx.preference.EditTextPreference;
 import android.util.AttributeSet;
 
 import net.i2p.android.router.R;

app/src/main/java/net/i2p/android/preferences/util/ConnectionLimitPreferenceDialog.java

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.os.Bundle;
-import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+//import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+import androidx.preference.EditTextPreferenceDialogFragmentCompat;
 import android.text.InputType;
 import android.view.View;
 import android.widget.EditText;

app/src/main/java/net/i2p/android/preferences/util/CustomPreferenceFragment.java

@@ -1,8 +1,9 @@
 package net.i2p.android.preferences.util;
 
-import android.support.v4.app.DialogFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 
 /**
  * Handles custom Preferences.

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.content.Context;
-import android.support.v7.preference.EditTextPreference;
+//import android.support.v7.preference.EditTextPreference;
+import androidx.preference.EditTextPreference;
 import android.util.AttributeSet;
 
 public class IntEditTextPreference extends EditTextPreference {

app/src/main/java/net/i2p/android/preferences/util/IntEditTextPreferenceDialog.java

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.os.Bundle;
-import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+//import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+import androidx.preference.EditTextPreferenceDialogFragmentCompat;
 import android.text.InputType;
 import android.view.View;
 import android.widget.EditText;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.content.Context;
-import android.support.v7.preference.ListPreference;
+//import android.support.v7.preference.ListPreference;
+import androidx.preference.ListPreference;
 import android.util.AttributeSet;
 
 public class IntListPreference extends ListPreference {
@@ -20,7 +21,7 @@ public class IntListPreference extends ListPreference {
                 getPersistedInt(0);
             } catch (ClassCastException e) {
                 // Fix for where this preference was previously stored in a ListPreference
-                getSharedPreferences().edit().remove(getKey()).commit();
+                getSharedPreferences().edit().remove(getKey()).apply();
             }
         }
 

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.content.Context;
-import android.support.v7.preference.EditTextPreference;
+//import android.support.v7.preference.EditTextPreference;
+import androidx.preference.EditTextPreference;
 import android.util.AttributeSet;
 
 import net.i2p.android.router.R;

app/src/main/java/net/i2p/android/preferences/util/PortPreferenceDialog.java

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.os.Bundle;
-import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+//import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+import androidx.preference.EditTextPreferenceDialogFragmentCompat;
 import android.text.InputType;
 import android.view.View;
 import android.widget.EditText;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.content.Context;
-import android.support.v7.preference.EditTextPreference;
+//import android.support.v7.preference.EditTextPreference;
+import android.preference.EditTextPreference;
 import android.util.AttributeSet;
 
 public class SummaryEditTextPreference extends EditTextPreference {

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

@@ -3,7 +3,8 @@ package net.i2p.android.router;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -12,6 +13,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import net.i2p.android.ext.floatingactionbutton.FloatingActionsMenu;
+import net.i2p.android.ext.floatingactionbutton.FloatingActionsMenu.OnFloatingActionsMenuUpdateListener;
 import net.i2p.android.router.dialog.AboutDialog;
 import net.i2p.android.router.dialog.TextResourceDialog;
 import net.i2p.android.router.log.LogActivity;
@@ -42,6 +44,17 @@ public class ConsoleContainer extends Fragment {
         }
 
         mConsoleMenu = (FloatingActionsMenu) v.findViewById(R.id.console_action_menu);
+        // update visibility based on router state
+        mConsoleMenu.setOnFloatingActionsMenuUpdateListener(new OnFloatingActionsMenuUpdateListener() {
+            public void onMenuExpanded() {
+                // this is called after the animation starts, sadly
+                setMenuVisibility();
+            }
+            public void onMenuCollapsed() {
+                // call it here too so the expand animation isn't glitchy as often
+                setMenuVisibility();
+            }
+        });
         mConsoleMenu.findViewById(R.id.action_news).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

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

@@ -1,7 +1,8 @@
 package net.i2p.android.router;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import net.i2p.android.router.util.Util;
 import net.i2p.router.CommSystemFacade;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.router;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivityBase;
 

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

@@ -1,7 +1,8 @@
 package net.i2p.android.router;
 
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;

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

@@ -1,17 +1,24 @@
 package net.i2p.android.router;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Typeface;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.PowerManager;
 import android.preference.PreferenceManager;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AlertDialog;
+import android.provider.Settings;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
+import android.util.AndroidRuntimeException;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,6 +30,7 @@ import android.widget.ScrollView;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.ToggleButton;
 
 import net.i2p.android.I2PActivityBase;
@@ -69,6 +77,7 @@ public class MainFragment extends I2PFragmentBase {
     private TextView vAdvStatusText;
 
     private static final String PREF_CONFIGURE_BROWSER = "app.dialog.configureBrowser";
+    private static final String PREF_CONFIGURE_BATTERY = "app.dialog.configureBattery";
     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";
@@ -320,7 +329,10 @@ public class MainFragment extends I2PFragmentBase {
         }
     }
 
-    public void updateState(State newState) {
+    /**
+     *  Changes the logo based on the state.
+     */
+    private void updateState(State newState) {
         if (newState == State.INIT ||
                 newState == State.STOPPED ||
                 newState == State.MANUAL_STOPPED ||
@@ -328,13 +340,13 @@ public class MainFragment extends I2PFragmentBase {
                 newState == State.NETWORK_STOPPED) {
             mConsoleLights.setImageResource(R.drawable.routerlogo_0);
         } else if (newState == State.STARTING ||
-                //newState == State.GRACEFUL_SHUTDOWN || // Don't change lights for graceful
                 newState == State.STOPPING ||
                 newState == State.MANUAL_STOPPING ||
                 newState == State.MANUAL_QUITTING ||
                 newState == State.NETWORK_STOPPING) {
             mConsoleLights.setImageResource(R.drawable.routerlogo_1);
-        } else if (newState == State.RUNNING) {
+        } else if (newState == State.RUNNING ||
+                   newState == State.GRACEFUL_SHUTDOWN) {
             mConsoleLights.setImageResource(R.drawable.routerlogo_2);
         } else if (newState == State.ACTIVE) {
             mConsoleLights.setImageResource(R.drawable.routerlogo_3);
@@ -375,9 +387,9 @@ public class MainFragment extends I2PFragmentBase {
             String uptime = DataHelper.formatDuration(ctx.router().getUptime());
             int active = ctx.commSystem().countActivePeers();
             int known = Math.max(ctx.netDb().getKnownRouters() - 1, 0);
-            vUptime.setText("" + uptime);
-            vActive.setText("" + active);
-            vKnown.setText("" + known);
+            vUptime.setText(uptime);
+            vActive.setText(Integer.toString(active));
+            vKnown.setText(Integer.toString(known));
 
             // Load running tunnels
             loadDestinations(ctx);
@@ -396,20 +408,21 @@ public class MainFragment extends I2PFragmentBase {
                 //ctx.commSystem().getReachabilityStatus();
 
                 String status =
-                        "Exploratory Tunnels in/out: " + inEx + " / " + outEx
-                                + "\nClient Tunnels in/out: " + inCl + " / " + outCl;
+                        getString(R.string.notification_status_expl, inEx, outEx) + '\n' +
+                        getString(R.string.notification_status_client, inCl, outCl);
 
 
                 // Need to see if we have the participation option set to on.
                 // I thought there was a router method for that? I guess not! WHY NOT?
                 // It would be easier if we had a number to test status.
-                String participate = "\nParticipation: " + tunnelStatus + " (" + part + ")";
+                String participate = '\n' + getString(R.string.settings_label_hiddenMode) + ": " + tunnelStatus + " (" + part + ")";
 
                 String details =
-                        "\nMemory: " + DataHelper.formatSize(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())
-                                + "B / " + DataHelper.formatSize(Runtime.getRuntime().maxMemory()) + 'B'
-                                + "\nJob Lag: " + jobLag
-                                + "\nMsg Delay: " + msgDelay;
+                        '\n' + getString(R.string.stats_memory) + ": " +
+                        DataHelper.formatSize(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) +
+                        "B / " + DataHelper.formatSize(Runtime.getRuntime().maxMemory()) + 'B' +
+                        '\n' + getString(R.string.stats_lag) + ": " + jobLag +
+                        '\n' + getString(R.string.stats_delay) + ": " + msgDelay;
 
                 _savedStatus = status + participate + details;
                 vAdvStatusText.setText(_savedStatus);
@@ -437,6 +450,7 @@ public class MainFragment extends I2PFragmentBase {
             // network but no router context
             vStatusContainer.setVisibility(View.GONE);
             getActivity().findViewById(R.id.console_usage_stats).setVisibility(View.INVISIBLE);
+            updateState(State.STOPPED);
             /**
              * **
              * RouterService svc = _routerService; String status = "connected? "
@@ -526,8 +540,8 @@ public class MainFragment extends I2PFragmentBase {
      * compare translated nicknames - put "shared clients" first in the sort
      */
     private class AlphaComparator implements Comparator<Destination> {
-        private String xsc;
-        private RouterContext _ctx;
+        private final String xsc;
+        private final RouterContext _ctx;
 
         public AlphaComparator(RouterContext ctx) {
             _ctx = ctx;
@@ -578,16 +592,18 @@ public class MainFragment extends I2PFragmentBase {
         );
         if (language == null) {
             AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
+            // avoid ISE caused by fragment detachment ticket #2631
+            final String languages[] = getResources().getStringArray(R.array.languages);
             b.setTitle(R.string.choose_language)
                     .setItems(R.array.language_names, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             // Save the language choice
-                            String language = getResources().getStringArray(R.array.languages)[which];
+                            String language = languages[which];
                             PreferenceManager.getDefaultSharedPreferences(getActivity())
                                     .edit()
                                     .putString(getString(R.string.PREF_LANGUAGE), language)
-                                    .commit();
+                                    .apply();
                             // Close the dialog
                             dialog.dismiss();
                             // Broadcast the change to RouterService just in case the router is running
@@ -614,16 +630,62 @@ public class MainFragment extends I2PFragmentBase {
                             ab.setPref(PREF_CONFIGURE_BROWSER, false);
                             Intent hi = new Intent(getActivity(), BrowserConfigActivity.class);
                             startActivity(hi);
+                            checkDialog();
                         }
                     })
                     .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int i) {
-                            dialog.cancel();
+                            dialog.dismiss();
                             ab.setPref(PREF_CONFIGURE_BROWSER, false);
+                            checkDialog();
                         }
                     })
                     .show();
+        } else if (ab.getPref(PREF_CONFIGURE_BATTERY, true)) {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                // only for Marshmallow and newer versions
+                final Intent intent = new Intent();
+                final Context mContext = ab.getApplicationContext();
+                String packageName = mContext.getPackageName();
+                PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+                if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+                    AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
+                    b.setTitle(R.string.configure_no_doze_title);
+                    b.setMessage(R.string.configure_no_doze);
+                    b.setCancelable(false);
+                    b.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int i) {
+                            String packageName = mContext.getPackageName();
+                            ab.setPref(PREF_CONFIGURE_BATTERY, false);
+                            dialog.dismiss();
+                            // Simply do not re-attempt a battery optimization after the first time,
+                            // even if an error occurs. http://trac.i2p2.i2p/ticket/2783
+                            intent.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                            intent.setData(Uri.parse("package:" + packageName));
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            try {
+                                mContext.startActivity(intent);
+                            } catch (ActivityNotFoundException activityNotFound) {
+                                ab.setPref(PREF_CONFIGURE_BATTERY, false);
+                            } catch (AndroidRuntimeException activityNotFound) {
+                                ab.setPref(PREF_CONFIGURE_BATTERY, false);
+                            }
+                        }
+                    });
+                    b.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int i) {
+                            dialog.cancel();
+                            ab.setPref(PREF_CONFIGURE_BATTERY, false);
+                        }
+                    });
+                    b.show();
+                }
+            } else {
+                ab.setPref(PREF_CONFIGURE_BATTERY, false);
+            }
         }
         /*VersionDialog dialog = new VersionDialog();
         String oldVersion = ((I2PActivityBase) getActivity()).getPref(PREF_INSTALLED_VERSION, "??");

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

@@ -1,7 +1,8 @@
 package net.i2p.android.router;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivityBase;
 

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

@@ -13,6 +13,7 @@ import android.widget.TextView;
 
 import net.i2p.android.apps.NewsFetcher;
 import net.i2p.android.router.util.Util;
+import net.i2p.router.RouterContext;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -33,12 +34,16 @@ public class NewsFragment extends I2PFragmentBase {
     @Override
     public void onResume() {
         super.onResume();
-        NewsFetcher nf = NewsFetcher.getInstance();
-        if (nf != null) {
-            // Always update the status
-            TextView tv = (TextView) getActivity().findViewById(R.id.news_status);
-            tv.setText(nf.status().replace(" ", " "));
-            tv.setVisibility(View.VISIBLE);
+        RouterContext ctx = getRouterContext();
+        if (ctx != null) {
+            NewsFetcher nf = (NewsFetcher) ctx.clientAppManager().getRegisteredApp(NewsFetcher.APP_NAME);
+            if (nf != null) {
+                // Always update the status
+                // This is the news last updated/checked text at the bottom
+                TextView tv = (TextView) getActivity().findViewById(R.id.news_status);
+                tv.setText(nf.status().replace(" ", " "));
+                tv.setVisibility(View.VISIBLE);
+            }
         }
 
         // Only update the content if we need to

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

@@ -3,13 +3,20 @@ package net.i2p.android.router;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceFragmentCompat;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivity;
 import net.i2p.android.preferences.AdvancedPreferenceFragment;

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

@@ -1,8 +1,9 @@
 package net.i2p.android.router.addressbook;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.router.addressbook;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import net.i2p.android.router.util.NamingServiceUtil;
 import net.i2p.android.router.util.Util;

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

@@ -6,9 +6,11 @@ import android.content.Context;
 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.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import net.i2p.android.wizard.model.AbstractWizardModel;
 import net.i2p.android.wizard.ui.AbstractWizardActivity;

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

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import net.i2p.android.router.R;
 import net.i2p.android.wizard.model.AbstractWizardModel;
-import net.i2p.android.wizard.model.I2PB64DestinationPage;
+import net.i2p.android.wizard.model.I2PDestinationPage;
 import net.i2p.android.wizard.model.PageList;
 import net.i2p.android.wizard.model.SingleTextFieldPage;
 
@@ -22,7 +22,7 @@ public class AddressbookAddWizardModel extends AbstractWizardModel {
                 .setDescription(res.getString(R.string.addressbook_add_wizard_desc_name))
                 .setRequired(true),
 
-            new I2PB64DestinationPage(this, res.getString(R.string.addressbook_add_wizard_k_destination))
+            new I2PDestinationPage(this, res.getString(R.string.i2ptunnel_wizard_k_dest))
                 .setDescription(res.getString(R.string.addressbook_add_wizard_desc_destination))
                 .setRequired(true)
             );

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

@@ -6,13 +6,21 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.SearchView;
+//import android.support.v4.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentPagerAdapter;
+//import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.FragmentTransaction;
+//import android.support.v4.view.MenuItemCompat;
+import androidx.core.view.MenuItemCompat;
+//import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
+//import android.support.v7.widget.SearchView;
+import androidx.appcompat.widget.SearchView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -20,18 +28,27 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.viewpagerindicator.TitlePageIndicator;
+import net.lucode.hackware.magicindicator.MagicIndicator;
+import net.lucode.hackware.magicindicator.ViewPagerHelper;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.util.NamingServiceUtil;
 import net.i2p.android.router.util.Util;
 import net.i2p.client.naming.NamingService;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView;
 
 public class AddressbookContainer extends Fragment
         implements AddressbookFragment.OnAddressSelectedListener,
         SearchView.OnQueryTextListener {
     public static final int ADD_WIZARD_REQUEST = 1;
     public static final String ADD_WIZARD_DATA = "add_wizard_data";
+    private MagicIndicator mPageIndicator;
 
     /**
      * Whether or not the container is in two-pane mode, i.e. running on a tablet
@@ -41,7 +58,6 @@ public class AddressbookContainer extends Fragment
 
     ViewPager mViewPager;
     FragmentPagerAdapter mFragPagerAdapter;
-
     private static final String FRAGMENT_ROUTER = "router_fragment";
     private static final String FRAGMENT_PRIVATE = "private_fragment";
     private static final int FRAGMENT_ID_ROUTER = 0;
@@ -66,6 +82,17 @@ public class AddressbookContainer extends Fragment
             // activity should be in two-pane mode.
             mTwoPane = true;
         }
+    
+        if (!mTwoPane) {
+            // Initialize ViewPager and adapter first
+            mViewPager = (ViewPager) v.findViewById(R.id.pager);
+            mFragPagerAdapter = new AddressbookPagerAdapter(getActivity(), getChildFragmentManager());
+            mViewPager.setAdapter(mFragPagerAdapter);
+            
+            // Then set up MagicIndicator
+            mPageIndicator = v.findViewById(R.id.magic_indicator);
+            setupMagicIndicator();
+        }
 
         if (savedInstanceState != null) {
             mRouterFrag = (AddressbookFragment) getChildFragmentManager().getFragment(
@@ -90,14 +117,6 @@ public class AddressbookContainer extends Fragment
             ft.commit();
         }
 
-        if (!mTwoPane) {
-            mViewPager = (ViewPager) v.findViewById(R.id.pager);
-            TitlePageIndicator pageIndicator = (TitlePageIndicator) v.findViewById(R.id.page_indicator);
-            mFragPagerAdapter = new AddressbookPagerAdapter(getActivity(), getChildFragmentManager());
-            mViewPager.setAdapter(mFragPagerAdapter);
-            pageIndicator.setViewPager(mViewPager);
-        }
-
         return v;
     }
 
@@ -250,4 +269,38 @@ public class AddressbookContainer extends Fragment
         if (mPrivateFrag != null)
             mPrivateFrag.filterAddresses(query);
     }
+
+    private void setupMagicIndicator() {
+        if (mPageIndicator == null || mFragPagerAdapter == null || mViewPager == null) {
+            return;
+        }
+    
+        CommonNavigator commonNavigator = new CommonNavigator(getContext());
+        commonNavigator.setAdapter(new CommonNavigatorAdapter() {
+            @Override
+            public int getCount() {
+                return mFragPagerAdapter.getCount();
+            }
+    
+            @Override
+            public IPagerTitleView getTitleView(Context context, int index) {
+                SimplePagerTitleView titleView = new ColorTransitionPagerTitleView(context);
+                titleView.setText(mFragPagerAdapter.getPageTitle(index));
+                titleView.setNormalColor(ContextCompat.getColor(context, R.color.primary_text_disabled_material_dark));
+                titleView.setSelectedColor(ContextCompat.getColor(context, R.color.primary_text_default_material_dark));
+                titleView.setOnClickListener(v -> mViewPager.setCurrentItem(index));
+                return titleView;
+            }
+    
+            @Override
+            public IPagerIndicator getIndicator(Context context) {
+                LinePagerIndicator indicator = new LinePagerIndicator(context);
+                indicator.setColors(ContextCompat.getColor(context, R.color.primary));
+                return indicator;
+            }
+        });
+    
+        mPageIndicator.setNavigator(commonNavigator);
+        ViewPagerHelper.bind(mPageIndicator, mViewPager);
+    }
 }

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

@@ -6,12 +6,18 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 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.v4.content.LocalBroadcastManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;

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

@@ -2,8 +2,10 @@ package net.i2p.android.router.addressbook;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;

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

@@ -4,9 +4,11 @@ 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.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,16 +27,16 @@ public class AboutDialog extends DialogFragment {
         View view = li.inflate(R.layout.fragment_dialog_about, null);
 
         final String currentVersion = Util.getOurVersion(getActivity());
-        TextView tv = (TextView)view.findViewById(R.id.about_version);
+        TextView tv = (TextView) view.findViewById(R.id.about_version);
         tv.setText(currentVersion);
 
-        tv = (TextView)view.findViewById(R.id.url_project);
+        tv = (TextView) view.findViewById(R.id.url_project);
         Linkify.addLinks(tv, I2Patterns.I2P_WEB_URL, "http://");
-        tv = (TextView)view.findViewById(R.id.url_android_bugs);
+        tv = (TextView) view.findViewById(R.id.url_android_bugs);
         Linkify.addLinks(tv, I2Patterns.I2P_WEB_URL, "http://");
-        tv = (TextView)view.findViewById(R.id.url_android_volunteer);
+        tv = (TextView) view.findViewById(R.id.url_android_volunteer);
         Linkify.addLinks(tv, I2Patterns.I2P_WEB_URL, "http://");
-        tv = (TextView)view.findViewById(R.id.url_donate);
+        tv = (TextView) view.findViewById(R.id.url_gitlab);
         Linkify.addLinks(tv, I2Patterns.I2P_WEB_URL, "http://");
 
         AlertDialog.Builder b = new AlertDialog.Builder(getActivity());

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

@@ -7,9 +7,11 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;

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

@@ -4,9 +4,11 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;

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

@@ -3,9 +3,11 @@ package net.i2p.android.router.dialog;
 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.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import net.i2p.android.I2PActivityBase;
 import net.i2p.android.router.MainFragment;

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

@@ -3,7 +3,8 @@ package net.i2p.android.router.log;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.router.log;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivityBase;
 import net.i2p.android.router.R;

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

@@ -4,9 +4,12 @@ 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.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.router.log;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import net.i2p.I2PAppContext;
 

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

@@ -2,8 +2,10 @@ package net.i2p.android.router.netdb;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;

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

@@ -2,7 +2,8 @@ package net.i2p.android.router.netdb;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivityBase;
 import net.i2p.android.router.R;

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

@@ -154,6 +154,8 @@ public class NetDbDetailFragment extends I2PFragmentBase {
             String val = (String)e.getValue();
             addTableRow(table, DataHelper.stripHTML(key), DataHelper.stripHTML(val));
         }
+        // spacer
+        addTableRow(table, "", "");
 
         addresses.addView(table);
     }
@@ -230,9 +232,11 @@ public class NetDbDetailFragment extends I2PFragmentBase {
         TextView tl1, tl2;
 
         row = new TableRow(getActivity());
+        // left top right bottom
         row.setPadding(10, 0, 0, 0);
 
         tl1 = new TextView(getActivity());
+        tl1.setPadding(0, 0, 20, 0);
         tl2 = new TextView(getActivity());
 
         tl1.setText(key);

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

@@ -1,10 +1,12 @@
 package net.i2p.android.router.netdb;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import net.i2p.android.router.util.Util;
 import net.i2p.data.Destination;
+import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.router.RouterInfo;
 import net.i2p.router.RouterContext;
@@ -24,14 +26,27 @@ public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
         mRouters = routers;
     }
 
+    /** put us on top */
     private static class RouterInfoComparator implements Comparator<RouterInfo> {
+        private final Hash _us;
+
+        public RouterInfoComparator(Hash us) {
+            _us = us;
+        }
+
         public int compare(RouterInfo l, RouterInfo r) {
-            return l.getIdentity().getHash().toBase64().compareTo(r.getIdentity().getHash().toBase64());
+            Hash lh = l.getIdentity().getHash();
+            Hash rh = r.getIdentity().getHash();
+            if (lh.equals(_us))
+                return -1;
+            if (rh.equals(_us))
+                return 1;
+            return lh.toBase64().compareTo(rh.toBase64());
         }
     }
 
     private class LeaseSetComparator implements Comparator<LeaseSet> {
-        private RouterContext mRContext;
+        private final RouterContext mRContext;
 
         public LeaseSetComparator(RouterContext rContext) {
             super();
@@ -53,9 +68,9 @@ public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
     public List<NetDbEntry> loadInBackground() {
         List<NetDbEntry> ret = new ArrayList<>();
         RouterContext routerContext = Util.getRouterContext();
-        if (routerContext != null && routerContext.netDb().isInitialized()) {
+        if (routerContext != null && routerContext.netDb().isInitialized() && routerContext.routerHash() != null) {
             if (mRouters) {
-                Set<RouterInfo> routers = new TreeSet<>(new RouterInfoComparator());
+                Set<RouterInfo> routers = new TreeSet<>(new RouterInfoComparator(routerContext.routerHash()));
                 routers.addAll(routerContext.netDb().getRouters());
                 for (RouterInfo ri : routers) {
                     NetDbEntry entry = NetDbEntry.fromRouterInfo(routerContext, ri);

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

@@ -2,9 +2,12 @@ package net.i2p.android.router.netdb;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.router.netdb;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import net.i2p.android.router.R;
 import net.i2p.data.Hash;
@@ -17,7 +18,7 @@ import java.util.Set;
 import java.util.TreeSet;
 
 public class NetDbStatsLoader extends AsyncTaskLoader<List<ObjectCounter<String>>> {
-    private RouterContext mRContext;
+    private final RouterContext mRContext;
     private List<ObjectCounter<String>> mData;
 
     public NetDbStatsLoader(Context context, RouterContext rContext) {
@@ -95,7 +96,7 @@ public class NetDbStatsLoader extends AsyncTaskLoader<List<ObjectCounter<String>
         int rv = 0;
         for (RouterAddress addr : info.getAddresses()) {
             String style = addr.getTransportStyle();
-            if (style.equals("NTCP")) {
+            if (style.equals("NTCP") || style.equals("NTCP2")) {
                 rv |= NTCP;
             } else if (style.equals("SSU")) {
                 if (addr.getOption("iport0") != null)
@@ -108,7 +109,12 @@ public class NetDbStatsLoader extends AsyncTaskLoader<List<ObjectCounter<String>
                 rv |= IPV6;
 
         }
-        return getContext().getString(TNAMES[rv]);
+        int tname = TNAMES[rv];
+        // remap cases with no string to "Hidden or starting up"
+        // so we don't crash NotFoundException
+        if (tname == 0)
+            tname = TNAMES[0];
+        return getContext().getString(tname);
     }
 
     @Override

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

@@ -1,12 +1,18 @@
 package net.i2p.android.router.netdb;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.view.ViewPager;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
+//import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.router.netdb;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -77,6 +78,7 @@ public class NetDbSummaryTableFragment extends Fragment {
         titleRow.setPadding(10, 0, 0, 0);
 
         tl1 = new TextView(getActivity());
+        tl1.setPadding(0, 0, 20, 0);
         tl1.setTextSize(20);
         tl2 = new TextView(getActivity());
         tl2.setTextSize(20);
@@ -108,6 +110,7 @@ public class NetDbSummaryTableFragment extends Fragment {
         row.setPadding(10, 0, 0, 0);
 
         tl1 = new TextView(getActivity());
+        tl1.setPadding(0, 0, 20, 0);
         tl2 = new TextView(getActivity());
 
         tl1.setText(name);

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

@@ -2,6 +2,7 @@ package net.i2p.android.router.provider;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
@@ -18,6 +19,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -153,7 +155,7 @@ public class CacheProvider extends ContentProvider {
         // first seg is empty since string starts with /
         String nonce = segs.length > 1 ? segs[1] : null;
         String scheme = segs.length > 2 ? segs[2] : null;
-        String host = segs.length > 3 ? segs[3].toLowerCase() : null;
+        String host = segs.length > 3 ? segs[3].toLowerCase(Locale.US) : null;
         String realPath = segs.length > 4 ? segs[4] : "";
         String query = uri.getEncodedQuery();
         if (query == null) {
@@ -230,10 +232,11 @@ public class CacheProvider extends ContentProvider {
     }
 
     private ParcelFileDescriptor eepFetch(Uri uri) throws FileNotFoundException {
-        AppCache cache = AppCache.getInstance(getContext());
+        Context ctx = getContext();
+        AppCache cache = AppCache.getInstance(ctx);
         OutputStream out;
         try {
-            out = cache.createCacheFile(uri);
+            out = cache.createCacheFile(ctx, uri);
         } catch (IOException ioe) {
             throw new FileNotFoundException(ioe.toString());
         }
@@ -244,7 +247,7 @@ public class CacheProvider extends ContentProvider {
             File file = cache.getCacheFile(uri);
             if (file.length() > 0) {
                 // this call will insert it back to us (don't set as current base)
-                Uri content = cache.addCacheFile(uri, false);
+                Uri content = cache.addCacheFile(ctx, uri, false);
                 return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
             } else {
                  Util.d("CacheProvider Sucess but no data " + uri);
@@ -252,7 +255,7 @@ public class CacheProvider extends ContentProvider {
         } else {
             Util.d("CacheProvider Eepget fail " + uri);
         }
-        AppCache.getInstance().removeCacheFile(uri);
+        cache.removeCacheFile(ctx, uri);
         throw new FileNotFoundException("eepget fail");
     }
 
@@ -319,7 +322,7 @@ public class CacheProvider extends ContentProvider {
             for (String key : toDelete) {
                 edit.remove(key);
             }
-            edit.commit();
+            edit.apply();
         }
     }
 
@@ -355,11 +358,10 @@ public class CacheProvider extends ContentProvider {
         return _sharedPrefs.getString(pref, null);
     }
 
-    /** @return success */
-    private boolean setPref(String pref, String val) {
+    private void setPref(String pref, String val) {
         SharedPreferences.Editor edit = _sharedPrefs.edit();
         edit.putString(pref, val);
-        return edit.commit();
+        edit.apply();
     }
 
     /** @return success */

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import net.i2p.android.router.util.Util;
 
 import net.i2p.android.router.I2PConstants;
 import net.i2p.android.router.service.RouterService;
@@ -14,12 +15,26 @@ public class OnBootReceiver extends BroadcastReceiver implements I2PConstants {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        if (!Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+            Util.e("spoofed BOOT_COMPLETED");
+            return;
+        }
+
         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);
+            // Ticket #2404
+            try {
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O){
+                    context.startForegroundService(routerService);
+                } else {
+                    context.startService(routerService);
+                }
+            } catch (IllegalStateException ex) {
+                Util.e("Error: ", ex);
+            }
         }
     }
 }

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

@@ -0,0 +1,23 @@
+package net.i2p.android.router.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.widget.Toast;
+
+import net.i2p.android.router.service.RouterService;
+import net.i2p.android.router.util.Util;
+
+public class RemoteStartReceiver extends BroadcastReceiver {
+    public void onReceive(Context context, Intent intent) {
+        if(Util.getRouterContext() == null){
+            Intent rsIntent = new Intent(context, RouterService.class);
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O){
+                context.startForegroundService(rsIntent);
+            } else {
+                context.startService(rsIntent);
+            }
+            Toast.makeText(context, "Starting I2P Router", Toast.LENGTH_SHORT).show();
+        }
+    }
+}

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

@@ -0,0 +1,174 @@
+package net.i2p.android.router.service;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import java.util.concurrent.CountDownLatch;
+import androidx.appcompat.app.AppCompatActivity;
+
+import net.i2p.android.I2PActivity;
+import net.i2p.android.I2PActivityBase;
+import net.i2p.android.router.R;
+import net.i2p.android.router.util.Notifications;
+import net.i2p.android.router.util.Util;
+import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
+import net.i2p.sam.*;
+import net.i2p.sam.SAMException;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+
+/**
+ * Implements SAMSecureSessionInterface on Android platforms using a Toast
+ * as the interactive channel.
+ *
+ * @since 1.8.0
+ */
+public class AndroidSAMSecureSession extends AppCompatActivity implements SAMSecureSessionInterface {
+    private static final String URI_I2P_ANDROID = "net.i2p.android";
+    private final Context mCtx;
+    private final RouterService _routerService;
+    private final StatusBar _statusBar;
+    static private Map<String, Integer> results = new HashMap<>();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    public static void affirmResult(String clientId) {
+        Util.d("Affirmed result for: " + clientId);
+        results.put(clientId, 1);
+    }
+
+    private AndroidSAMSecureSession(Context ctx, RouterService rCtx, StatusBar statusBar) {
+        mCtx = ctx;
+        _routerService = rCtx;
+        _statusBar = statusBar;
+    }
+
+    public static AndroidSAMSecureSession create(Context ctx, RouterService rCtx, StatusBar statusBar) {
+        if (Looper.getMainLooper().getThread() == Thread.currentThread()) {
+            // We're on the main thread, create directly
+            return new AndroidSAMSecureSession(ctx, rCtx, statusBar);
+        } else {
+            // We're not on the main thread, post to main thread
+            final AndroidSAMSecureSession[] result = new AndroidSAMSecureSession[1];
+            final CountDownLatch latch = new CountDownLatch(1);
+            
+            new Handler(Looper.getMainLooper()).post(() -> {
+                result[0] = new AndroidSAMSecureSession(ctx, rCtx, statusBar);
+                latch.countDown();
+            });
+
+            try {
+                latch.await();
+                return result[0];
+            } catch (InterruptedException e) {
+                throw new RuntimeException("Failed to create AndroidSAMSecureSession", e);
+            }
+        }
+    }
+
+    private void waitForResult(String clientId) {
+        for (int i=0;i<60;i++) {
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                Util.e("SAMSecureSession Error", e);
+            }
+            Integer result = results.get(clientId);
+            if (result == null)
+                continue;
+            if (result != -1)
+                break;
+            Util.d("Waiting on user to approve SAM connection for: "+clientId);
+        }
+    }
+
+    private boolean isResult(String clientId) {
+        waitForResult(clientId);
+        final Integer finResult = results.get(clientId);
+        if (finResult == null)
+            return false;
+        _routerService.updateStatus();
+        if (finResult == 0) {
+            Util.w("SAM connection cancelled by user request");
+            return false;
+        }
+        if (finResult == 1) {
+            Util.w("SAM connection allowed by user action");
+            return true;
+        }
+        Util.w("SAM connection denied by timeout.");
+        return false;
+    }
+
+    private boolean checkResult(String clientId) {
+        Intent intent = new Intent("net.i2p.android.router.service.APPROVE_SAM", null, mCtx, I2PActivity.class );
+        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setPackage(URI_I2P_ANDROID);
+        Bundle bundle = new Bundle();
+        bundle.putBoolean("approveSAMConnection", true);
+        bundle.putString("ID", clientId);
+        intent.putExtras(bundle);
+        PendingIntent pendingIntent;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+            pendingIntent = PendingIntent.getActivity(
+                    mCtx, 7656,
+                    intent,
+                    PendingIntent.FLAG_MUTABLE,
+                    bundle);
+        } else {
+            pendingIntent = PendingIntent.getActivity(
+                    mCtx, 7656,
+                    intent,
+                    PendingIntent.FLAG_UPDATE_CURRENT,
+                    bundle);
+        }
+        String dlgText = mCtx.getString(R.string.settings_confirm_sam) + "\n";//""</br>";
+        dlgText += mCtx.getString(R.string.settings_confirm_sam_id) + clientId + "\n";//""</br>";
+        dlgText += mCtx.getString(R.string.settings_confirm_allow_sam) + "\n";//""</br>";
+        dlgText += mCtx.getString(R.string.settings_confirm_deny_sam) + "\n";//""</br>";
+
+
+        _statusBar.replaceIntent(StatusBar.ICON_ACTIVE, dlgText, pendingIntent);
+        return isResult(clientId);
+    }
+
+    @Override
+    public boolean approveOrDenySecureSession(Properties i2cpProps, Properties props) throws SAMException {
+        String ID = props.getProperty("USER");
+        if (ID == null)
+            ID = i2cpProps.getProperty("inbound.nickname");
+        if (ID == null)
+            ID = i2cpProps.getProperty("outbound.nickname");
+        if (ID == null)
+            ID = props.getProperty("ID");
+        if (ID == null) {
+            MessageDigest messageDigest = null;
+            try {
+                messageDigest = MessageDigest.getInstance("SHA-256");
+            } catch (NoSuchAlgorithmException e) {
+                ID = "No_ID_Present";
+            }
+            if (messageDigest != null) {
+                String combinedProps = i2cpProps.toString() + props.toString();
+                messageDigest.update(combinedProps.getBytes());
+                ID = messageDigest.digest().toString();
+            }else{
+                ID = "No_ID_Present";
+            }
+        }
+        return checkResult(ID);
+    }
+}

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

@@ -1,20 +1,30 @@
 package net.i2p.android.router.service;
 
+import android.app.Notification;
 import android.content.Context;
 
-import net.i2p.BOB.BOB;
-import net.i2p.I2PAppContext;
+//import net.i2p.BOB.BOB;
 import net.i2p.addressbook.DaemonThread;
+
+import android.content.Intent;
+import android.os.Looper;
+import android.preference.PreferenceManager;
 import net.i2p.android.apps.NewsFetcher;
+import net.i2p.android.router.service.AndroidSAMSecureSession;
 import net.i2p.android.router.util.Notifications;
 import net.i2p.android.router.util.Util;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
+import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.I2PAppThread;
+import net.i2p.sam.SAMBridge;
+import net.i2p.sam.SAMSecureSessionInterface;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.Properties;
 
 /**
  * Load the clients we want.
@@ -22,7 +32,8 @@ import java.io.IOException;
  * We can't use LoadClientAppsJob (reading in clients.config) directly
  * because Class.forName() needs a PathClassLoader argument -
  * http://doandroids.com/blogs/2010/6/10/android-classloader-dynamic-loading-of/
- * ClassLoader cl = new PathClassLoader(_apkPath, ClassLoader.getSystemClassLoader());
+ * ClassLoader cl = new PathClassLoader(_apkPath,
+ * ClassLoader.getSystemClassLoader());
  *
  * We can't extend LoadClientAppsJob to specify a class loader,
  * even if we use it only for Class.forName() and not for
@@ -37,47 +48,70 @@ import java.io.IOException;
  */
 class LoadClientsJob extends JobImpl {
 
-    private Context mCtx;
-    private Notifications _notif;
+    private final Context mCtx;
+    private final RouterService _routerService;
+    private final Notifications _notif;
     private DaemonThread _addressbook;
-    private BOB _bob;
+    public SAMBridge SAM_BRIDGE;
+    private final StatusBar _statusBar;
+    // private BOB _bob;
 
     /** this is the delay to load (and start) the clients. */
-    private static final long LOAD_DELAY = 90*1000;
+    private static final long LOAD_DELAY = 60 * 1000;
 
+    public LoadClientsJob(Context ctx, RouterContext rCtx, Notifications notif, StatusBar status) {
+        super(rCtx);
+        mCtx = ctx;
+        _routerService = null;
+        _notif = notif;
+        getTiming().setStartAfter(getContext().clock().now() + LOAD_DELAY);
+        _statusBar = status;
+    }
+
+    public LoadClientsJob(Context ctx, RouterContext rCtx, RouterService rSvc, Notifications notif, StatusBar status) {
+        super(rCtx);
+        mCtx = ctx;
+        _routerService = rSvc;
+        _notif = notif;
+        getTiming().setStartAfter(getContext().clock().now() + LOAD_DELAY);
+        _statusBar = status;
+    }
 
     public LoadClientsJob(Context ctx, RouterContext rCtx, Notifications notif) {
         super(rCtx);
         mCtx = ctx;
+        _routerService = null;
         _notif = notif;
         getTiming().setStartAfter(getContext().clock().now() + LOAD_DELAY);
+        _statusBar = null;
     }
 
-    public String getName() { return "Start Clients"; }
+    public String getName() {
+        return "Start Clients";
+    }
 
     public void runJob() {
-        Job j = new RunI2PTunnel(getContext());
-        getContext().jobQueue().addJob(j);
+        Job jtunnel = new RunI2PTunnel(getContext());
+        getContext().jobQueue().addJob(jtunnel);
 
         Thread t = new I2PAppThread(new StatSummarizer(), "StatSummarizer", true);
         t.setPriority(Thread.NORM_PRIORITY - 1);
         t.start();
 
-        NewsFetcher fetcher = NewsFetcher.getInstance(mCtx, getContext(), _notif);
-        t = new I2PAppThread(fetcher, "NewsFetcher", true);
-        t.start();
-
-        _addressbook = new DaemonThread(new String[] {"addressbook"});
-        _addressbook.setName("Addressbook");
-        _addressbook.setDaemon(true);
-        _addressbook.start();
-
         // add other clients here
-        _bob = new BOB(I2PAppContext.getGlobalContext(), null, new String[0]);
-        try {
-            _bob.startup();
-        } catch (IOException ioe) {}
-
+        // _bob = new BOB(I2PAppContext.getGlobalContext(), null, new String[0]);
+        // try {
+        // _bob.startup();
+        // } catch (IOException ioe) {}
+        boolean useSAM = PreferenceManager.getDefaultSharedPreferences(mCtx).getBoolean("i2pandroid.client.SAM", true);
+        Util.i("SAM API " + useSAM);
+        if (useSAM) {
+            Job jsam = new RunI2PSAM(getContext());
+            getContext().jobQueue().addJob(jsam);
+            Util.i("SAM API started successfully" + useSAM);
+        } else {
+            Util.i("SAM API disabled, not starting " + useSAM);
+        }
         getContext().addShutdownTask(new ClientShutdownHook());
     }
 
@@ -87,15 +121,35 @@ class LoadClientsJob extends JobImpl {
             super(ctx);
         }
 
-        public String getName() { return "Start I2P Tunnel"; }
+        public String getName() {
+            return "Start I2P Tunnel";
+        }
 
         public void runJob() {
+            if (!getContext().router().isRunning()) {
+                if (getContext().router().isAlive()) {
+                    requeue(1000);
+                } else {
+                    Util.e("Router stopped before i2ptunnel could start");
+                }
+                return;
+            }
             Util.d("Starting i2ptunnel");
-            TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
+            TunnelControllerGroup tcg = TunnelControllerGroup.getInstance(getContext());
             try {
                 tcg.startup();
                 int sz = tcg.getControllers().size();
                 Util.d("i2ptunnel started " + sz + " clients");
+
+                // no use starting these until i2ptunnel starts
+                RouterContext ctx = getContext();
+                NewsFetcher fetcher = NewsFetcher.getInstance(mCtx, getContext(), _notif);
+                ctx.routerAppManager().addAndStart(fetcher, new String[0]);
+
+                _addressbook = new DaemonThread(new String[] { "addressbook" });
+                _addressbook.setName("Addressbook");
+                _addressbook.setDaemon(true);
+                _addressbook.start();
             } catch (IllegalArgumentException iae) {
                 Util.e("i2ptunnel failed to start", iae);
             }
@@ -103,14 +157,63 @@ class LoadClientsJob extends JobImpl {
         }
     }
 
+    private class RunI2PSAM extends JobImpl {
+
+        public RunI2PSAM(RouterContext ctx) {
+            super(ctx);
+        }
+
+        public String getName() {
+            return "Start SAM API";
+        }
+
+        public void runJob() {
+            if (!getContext().router().isRunning()) {
+                if (getContext().router().isAlive()) {
+                    requeue(1000);
+                } else {
+                    Util.e("Router stopped before SAM API could start");
+                }
+                return;
+            }
+            Util.d("Starting SAM");
+            try {
+                Util.i("Starting the SAM API");
+                Looper.prepare();
+                //AndroidSAMSecureSession _androidSecureSession = new AndroidSAMSecureSession(mCtx, _routerService, _statusBar);
+                AndroidSAMSecureSession _androidSecureSession = AndroidSAMSecureSession.create(mCtx, _routerService, _statusBar);
+                SAMSecureSessionInterface _secureSession = _androidSecureSession;
+                SAM_BRIDGE = new SAMBridge("127.0.0.1",
+                 7656,
+                 false,
+                 SAM_PROPERTIES(),
+                 "sam.keys",
+                 new File("sam_config"),
+                 _secureSession);
+                SAM_BRIDGE.run();
+            } catch (IOException e) {
+                Util.e(e.toString());
+                e.printStackTrace();
+            }
+        }
+
+        public Properties SAM_PROPERTIES() throws IOException {
+            Util.i("Getting the default properties");
+            Properties sam_properties = new Properties();
+            return sam_properties;
+        }
+    }
+
     private class ClientShutdownHook implements Runnable {
         public void run() {
             Util.d("client shutdown hook");
             // i2ptunnel registers its own hook
             // StatSummarizer registers its own hook
             // NewsFetcher registers its own hook
-            if (_bob != null)
-                _bob.shutdown(null);
+            // if (_bob != null)
+            // _bob.shutdown(null);
+            if (SAM_BRIDGE != null)
+                SAM_BRIDGE.shutdown(null);
             if (_addressbook != null)
                 _addressbook.halt();
         }

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

@@ -1,17 +1,21 @@
 package net.i2p.android.router.service;
 
+import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE;
+
 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.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
-import android.support.v4.content.LocalBroadcastManager;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.receiver.I2PReceiver;
@@ -105,7 +109,7 @@ public class RouterService extends Service {
         if(lastState == State.RUNNING || lastState == State.ACTIVE) {
             Intent intent = new Intent(this, RouterService.class);
             intent.putExtra(EXTRA_RESTART, true);
-            onStartCommand(intent, 12345, 67890);
+            onStartCommand(intent, START_FLAG_REDELIVERY | START_FLAG_RETRY, 67890);
         } else if(lastState == State.MANUAL_QUITTING || lastState == State.GRACEFUL_SHUTDOWN) {
             synchronized(_stateLock) {
                 setState(State.MANUAL_QUITTED);
@@ -168,10 +172,25 @@ public class RouterService extends Service {
         }
         _handler.removeCallbacks(_updater);
         _handler.postDelayed(_updater, 50);
+
+        // We need to *not* check if we're restarting on Android greater than Oreo due to
+        // changes in how notifications work and the use of NotificationChannels.
         if(!restart) {
-            startForeground(1337, _statusBar.getNote());
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(1337, _statusBar.getNote(), FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+            } else {
+                startForeground(1337, _statusBar.getNote());
+            }
+        } else {
+            if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                startForeground(1337, _statusBar.getNote());
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(1337, _statusBar.getNote(), FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+            }
         }
 
+
         //return START_STICKY;
         return START_NOT_STICKY;
     }
@@ -214,6 +233,7 @@ public class RouterService extends Service {
             // Launch the router!
             // TODO Store this somewhere instead of relying on global context?
             Router r = new Router();
+            r.setUPnPScannerCallback(new SSDPLocker(RouterService.this));
             r.runRouter();
             synchronized(_stateLock) {
                 if(_state != State.STARTING) {
@@ -226,7 +246,7 @@ public class RouterService extends Service {
                     throw new IllegalStateException("Router has no context?");
                 }
                 _context.router().setKillVMOnEnd(false);
-                Job loadJob = new LoadClientsJob(RouterService.this, _context, _notif);
+                Job loadJob = new LoadClientsJob(RouterService.this, _context, RouterService.this, _notif, _statusBar);
                 _context.jobQueue().addJob(loadJob);
                 _context.addShutdownTask(new ShutdownHook());
                 _context.addFinalShutdownTask(new FinalShutdownHook());
@@ -252,6 +272,16 @@ public class RouterService extends Service {
     private String _currTitle;
     private boolean _hadTunnels;
 
+    public void updateStatus() {
+        RouterContext ctx = _context;
+        if(ctx != null && (_state == State.RUNNING || _state == State.ACTIVE || _state == State.GRACEFUL_SHUTDOWN)) {
+            Router router = ctx.router();
+            if(router.isAlive()) {
+                updateStatus(ctx);
+            }
+        }
+    }
+
     private void updateStatus(RouterContext ctx) {
         int active = ctx.commSystem().countActivePeers();
         int known = Math.max(ctx.netDb().getKnownRouters() - 1, 0);
@@ -794,12 +824,12 @@ public class RouterService extends Service {
     }
 
     /**
-     * @return success
+     * Saves state in background thread
      */
-    private boolean saveState() {
+    private void saveState() {
         SharedPreferences prefs = getSharedPreferences(SHARED_PREFS, 0);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putString(LAST_STATE, _state.toString());
-        return edit.commit();
+        edit.apply();
     }
 }

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

@@ -0,0 +1,33 @@
+package net.i2p.android.router.service;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.MulticastLock;
+
+import net.i2p.router.transport.UPnPScannerCallback;
+
+/**
+ *  To lock/unlock UPnP, so it works on some phones.
+ *  Many many phones don't require this, but do be safe...
+ *
+ *  @since 0.9.41
+ */
+public class SSDPLocker implements UPnPScannerCallback {
+
+    private final MulticastLock lock;
+
+    public SSDPLocker(Context context) {
+        WifiManager wifi = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        lock = wifi.createMulticastLock("ssdp");
+        lock.setReferenceCounted(false);
+    }
+
+    public void beforeScan() {
+        lock.acquire();
+    }
+
+    public void afterScan() {
+        if (lock.isHeld())
+            lock.release();
+    }
+}