bump release version and version code

Android build updates

See merge request idk/i2p.android.base!1

.gitignore

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

CHANGELOG

@@ -1,3 +1,54 @@
+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
 

RELEASE-PROCESS.md

@@ -18,6 +18,7 @@ the override.properties that is used in the Docker container.
 
 ## 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.

app/build.gradle

@@ -5,11 +5,11 @@ repositories {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     defaultConfig {
-        versionCode 4745266
-        versionName "$I2P_VERSION"
-        minSdkVersion 14
+        versionCode 4745273
+        versionName "$I2P_ANDROID_VERSION"
+        minSdkVersion 21
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
 
         // For Espresso
@@ -31,15 +31,18 @@ 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
         disable 'MissingDefaultResource'
     }
     packagingOptions {
-        exclude 'LICENSE.txt'
+        resources {
+            excludes += ['LICENSE.txt']
+        }
     }
     flavorDimensions 'tier'
     productFlavors {
@@ -56,7 +59,6 @@ android {
             applicationId 'net.i2p.android.router'
         }
     }
-    buildToolsVersion '28.0.3'
 }
 
 dependencies {
@@ -88,6 +90,10 @@ dependencies {
     }
 }
 
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+}
+
 project.ext.i2pbase = "../i2p.i2p"
 def Properties props = new Properties()
 def propFile = new File(project(':routerjars').projectDir, 'local.properties')

app/src/main/AndroidManifest.xml

@@ -27,6 +27,8 @@
         <service
             android:name=".service.RouterService"
             android:icon="@drawable/ic_launcher_itoopie"
+            android:enabled="true"
+            android:exported="true"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="net.i2p.android.router.service.IRouterState" />
@@ -35,7 +37,9 @@
         <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>
@@ -45,7 +49,8 @@
             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" />
@@ -55,6 +60,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>
@@ -105,6 +114,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/net/i2p/android/I2PActivity.java

@@ -19,6 +19,7 @@ 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;
@@ -134,6 +135,7 @@ public class I2PActivity extends I2PActivityBase implements
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
+        setIntent(intent);
         handleIntents();
     }
 
@@ -143,17 +145,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/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);
     }
 
@@ -61,89 +62,87 @@ 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();
+        copyResourceToFile(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);
@@ -207,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];
@@ -227,6 +227,9 @@ class InitActivities {
                         f.mkdir();
                     } else {
                         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);
@@ -281,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/help/BrowserListFragment.java

@@ -102,8 +102,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

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

@@ -0,0 +1,147 @@
+package net.i2p.android.router.service;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.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);
+    }
+
+    public AndroidSAMSecureSession(Context ctx, RouterService rCtx, StatusBar statusBar) {
+        mCtx = ctx;
+        _routerService = rCtx;
+        _statusBar = statusBar;
+    }
+
+    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,21 +1,26 @@
 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.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.router.startup.RouterAppManager;
 import net.i2p.util.I2PAppThread;
 import net.i2p.sam.SAMBridge;
+import net.i2p.sam.SAMSecureSessionInterface;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,7 +32,8 @@ import java.util.Properties;
  * 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
@@ -43,46 +49,68 @@ import java.util.Properties;
 class LoadClientsJob extends JobImpl {
 
     private final Context mCtx;
+    private final RouterService _routerService;
     private final Notifications _notif;
     private DaemonThread _addressbook;
     public SAMBridge SAM_BRIDGE;
-    //private BOB _bob;
+    private final StatusBar _statusBar;
+    // private BOB _bob;
 
     /** this is the delay to load (and start) the clients. */
-    private static final long LOAD_DELAY = 60*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 jtunnel = new RunI2PTunnel(getContext());
         getContext().jobQueue().addJob(jtunnel);
 
-
         Thread t = new I2PAppThread(new StatSummarizer(), "StatSummarizer", true);
         t.setPriority(Thread.NORM_PRIORITY - 1);
         t.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);
+        } else {
+            Util.i("SAM API disabled, not starting " + useSAM);
         }
         getContext().addShutdownTask(new ClientShutdownHook());
     }
@@ -93,7 +121,9 @@ 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()) {
@@ -116,7 +146,7 @@ class LoadClientsJob extends JobImpl {
                 NewsFetcher fetcher = NewsFetcher.getInstance(mCtx, getContext(), _notif);
                 ctx.routerAppManager().addAndStart(fetcher, new String[0]);
 
-                _addressbook = new DaemonThread(new String[] {"addressbook"});
+                _addressbook = new DaemonThread(new String[] { "addressbook" });
                 _addressbook.setName("Addressbook");
                 _addressbook.setDaemon(true);
                 _addressbook.start();
@@ -133,7 +163,9 @@ class LoadClientsJob extends JobImpl {
             super(ctx);
         }
 
-        public String getName() { return "Start SAM API"; }
+        public String getName() {
+            return "Start SAM API";
+        }
 
         public void runJob() {
             if (!getContext().router().isRunning()) {
@@ -147,15 +179,19 @@ class LoadClientsJob extends JobImpl {
             Util.d("Starting SAM");
             try {
                 Util.i("Starting the SAM API");
+                Looper.prepare();
+                AndroidSAMSecureSession _androidSecureSession = new AndroidSAMSecureSession(mCtx, _routerService, _statusBar);
+                SAMSecureSessionInterface _secureSession = _androidSecureSession;
                 SAM_BRIDGE = new SAMBridge("127.0.0.1",
-                        7656,
-                        false,
-                        SAM_PROPERTIES(),
-                        "sam.keys",
-                        new File("sam_config"));
+                 7656,
+                 false,
+                 SAM_PROPERTIES(),
+                 "sam.keys",
+                 new File("sam_config"),
+                 _secureSession);
                 SAM_BRIDGE.run();
             } catch (IOException e) {
-                Util.e( e.toString());
+                Util.e(e.toString());
                 e.printStackTrace();
             }
         }
@@ -173,8 +209,8 @@ class LoadClientsJob extends JobImpl {
             // 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)

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

@@ -236,7 +236,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());
@@ -262,6 +262,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);

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

@@ -13,6 +13,7 @@ import android.widget.Toast;
 
 import net.i2p.android.I2PActivity;
 import net.i2p.android.router.R;
+import net.i2p.android.router.util.Notifications;
 
 class StatusBar {
 
@@ -45,37 +46,80 @@ class StatusBar {
         int icon = ICON_STARTING;
         // won't be shown if replace() is called
         String text = mCtx.getString(R.string.notification_status_starting);
+        mNotifyBuilder = notifyBuilder(icon, text);
+    }
 
+    private NotificationCompat.Builder notifyBuilder(int icon, String text) {
+        NotificationCompat.Builder tNotifyBuilder;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            mNotifyBuilder = new NotificationCompat.Builder(mCtx);
+            tNotifyBuilder = new NotificationCompat.Builder(mCtx);
         } else {
-            mNotifyBuilder = new NotificationCompat.Builder(mCtx, NOTIFICATION_CHANNEL_ID);
+            tNotifyBuilder = new NotificationCompat.Builder(mCtx, NOTIFICATION_CHANNEL_ID);
         }
+        tNotifyBuilder.setContentText(text);
+        tNotifyBuilder.setSmallIcon(icon);
+        tNotifyBuilder.setColor(mCtx.getResources().getColor(R.color.primary_light));
+        tNotifyBuilder.setOngoing(true);
+        tNotifyBuilder.setPriority(NotificationManager.IMPORTANCE_LOW);
+        tNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE);
 
-        mNotifyBuilder.setContentText(text);
-        mNotifyBuilder.setSmallIcon(icon);
-        mNotifyBuilder.setColor(mCtx.getResources().getColor(R.color.primary_light));
-        mNotifyBuilder.setOngoing(true);
-        mNotifyBuilder.setPriority(NotificationManager.IMPORTANCE_LOW);
-        mNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE);
+        PendingIntent pi = this.pendingIntent();
+        tNotifyBuilder.setContentIntent(pi);
+        return tNotifyBuilder;
+    }
 
+    private PendingIntent pendingIntent() {
         Intent intent = new Intent(mCtx, I2PActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        PendingIntent pi = PendingIntent.getActivity(mCtx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        mNotifyBuilder.setContentIntent(pi);
+        PendingIntent pi = null;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+            pi = PendingIntent.getActivity(mCtx,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_MUTABLE);
+        } else {
+            pi = PendingIntent.getActivity(mCtx,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_UPDATE_CURRENT);
+        }
+        return pi;
     }
 
     public void replace(int icon, int textResource) {
+        PendingIntent pi = pendingIntent();
+        mNotifyBuilder.setContentIntent(pi);
         replace(icon, mCtx.getString(textResource));
     }
 
     public void replace(int icon, String title) {
+        PendingIntent pi = pendingIntent();
+        mNotifyBuilder.setContentIntent(pi);
         mNotifyBuilder.setSmallIcon(icon)
             .setStyle(null)
             .setTicker(title);
         update(title);
     }
 
+    public void replaceIntent(int icon, String text, PendingIntent pi) {
+        mNotifyBuilder.setContentIntent(pi);
+        mNotifyBuilder.setPriority(NotificationCompat.PRIORITY_MAX);
+        mNotifyBuilder.setAutoCancel(true);
+        mNotifyBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));
+        mNotifyBuilder.setSmallIcon(icon).setContentText(text);
+        update(null, text);
+    }
+
+    public void replaceIntent(int icon, int textResource, PendingIntent pi) {
+        String text = mCtx.getString(textResource);
+        mNotifyBuilder.setContentIntent(pi);
+        mNotifyBuilder.setPriority(NotificationCompat.PRIORITY_MAX);
+        mNotifyBuilder.setAutoCancel(true);
+        mNotifyBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));
+        mNotifyBuilder.setSmallIcon(icon).setContentText(text);
+        update(null, text);
+    }
+
     public void update(String title) {
         update(title, null);
     }
@@ -87,8 +131,10 @@ class StatusBar {
     }
 
     public void update(String title, String text) {
-        mNotifyBuilder.setContentTitle(title)
-            .setContentText(text);
+        if (title != null)
+            mNotifyBuilder.setContentTitle(title);
+        if (text != null)
+            mNotifyBuilder.setContentText(text);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             mNotificationChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_LOW);
             mNotificationManager.createNotificationChannel(mNotificationChannel);

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

@@ -53,7 +53,12 @@ public class Notifications {
         if (c != null) {
             Intent intent = new Intent(mCtx, c);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            PendingIntent pi = PendingIntent.getActivity(mCtx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent pi;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                pi = PendingIntent.getActivity(mCtx, 0, intent, PendingIntent.FLAG_MUTABLE);
+            } else {
+                pi = PendingIntent.getActivity(mCtx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+            }
             b.setContentIntent(pi);
         }
 

app/src/main/java/net/i2p/android/wizard/model/I2PDestinationPage.java

@@ -29,10 +29,12 @@ public class I2PDestinationPage extends SingleTextFieldPage {
     public boolean isValid() {
         String data = mData.getString(SIMPLE_DATA_KEY);
         if (data.toLowerCase(Locale.US).endsWith(".b32.i2p")) { /* B32 */
-            if (data.length() != BASE32_HASH_LENGTH + 8) {
-                mFeedback = "Invalid B32";
-                return false;
+            if (data.length() == BASE32_HASH_LENGTH + 8 || data.length() >= BASE32_HASH_LENGTH + 12) {
+                mFeedback = "";
+                return true;
             }
+            mFeedback = "Invalid B32";
+            return false;
         } else if (data.endsWith(".i2p")) { /* Domain */
             // Valid
         } else if (data.length() >= 516) { /* B64 */

app/src/main/res/raw/help_com_stoutner_privacybrowser_standard.html

@@ -0,0 +1,17 @@
+<html>
+<head></head>
+<body>
+<h2>Privacy Brower has native I2P support!</h2>
+<p>Make sure your I2P router is started before launching Privacy Browser</p>
+<p>Privacy Browser supports both I2P and Orbot (Tor), but not at the same time.</p>
+<h2>How to configure Privacy Browser:</h2>
+<ol>
+    <li>Open the main menu and tap “Settings”</li>
+    <li>Select "Disable Javascript"(Recommended)</li>
+    <li>Select "Enable Incognito Mode"(Optional)</li>
+    <li>Tap the "Proxy" menu item and select "I2P" from the submenu</li>
+    <li>Exit the settings menu.</li>
+</ol>
+    <a href="https://eyedeekay.github.io/Configuring-Privacy-Browser-for-I2P-on-Android/">A detailed guide with screenshots to is available online</a>
+</body>
+</html>

app/src/main/res/values-fa/strings.xml

@@ -26,6 +26,7 @@
   <string name="button_router_graceful">I2P در %s خاموش خواهد شد</string>
   <string name="no_internet">هیچ اتصال اینترنتی موجود نمی باشد</string>
   <string name="hidden">پنهان</string>
+  <string name="testing">در حال تست</string>
   <string name="symmetric_nat">NAT همگام</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <string name="net_status_error_unresolved_tcp">آدرس های TCP حل نشده</string>
@@ -70,6 +71,7 @@
   <string name="transport">انتقال</string>
   <string name="versions">نسخه ها</string>
   <string name="version">نسخه</string>
+  <string name="count">شمارش</string>
   <string name="notification_status_starting">I2P در حال شروع می باشد</string>
   <string name="notification_status_restarting">I2P در حال راه اندازی مجدد است</string>
   <string name="notification_status_starting_after_waiting">شبکه اتصال یافت، I2P در حال آغاز است</string>
@@ -95,6 +97,7 @@
   <string name="settings_desc_hiddenMode">خاموش کردن حالت پنهان</string>
   <string name="settings_label_sharePercent">اشتراک گذاری درصد</string>
   <string name="settings_desc_upnp">باز کردن درگاه های دیوار آتشین به صورت خودکار</string>
+  <string name="settings_label_logging">ثبت وقایع</string>
   <string name="settings_label_appearance">ظاهر</string>
   <string name="settings_label_language">زبان</string>
   <string name="settings_default">پیش فرض</string>

app/src/main/res/values-hu/strings.xml

@@ -237,6 +237,7 @@
   <string name="tunnel_parameters">Alagút paraméterei</string>
   <string name="profile">Profil</string>
   <string name="delay_connect">Csatlakozás késleltetése</string>
+  <string name="access_control">Hozzáférés kezelése</string>
   <string name="restricted_access">Korlátozott elérés</string>
   <string name="disabled">Tiltva</string>
   <string name="whitelist">Engedélyezett-Lista</string>

app/src/main/res/values-ja/strings.xml

@@ -36,6 +36,7 @@
   <string name="net_status_error_unresolved_tcp">未解決の TCP アドレス</string>
   <string name="net_status_error_private_tcp">プライベートな TCP アドレス</string>
   <string name="net_status_warn_firewalled_inbound_tcp">着信 TCP が有効となり、ファイアーウォールされています</string>
+  <string name="net_status_warn_firewalled_floodfill">ファイアーウォールに防がれ、 Floodfill</string>
   <string name="net_status_info_disconnected">切断されました - ネットワーク接続を確認してください</string>
   <string name="net_status_error_udp_port">UDPポートが使用中 - 設定を変更して再起動してください</string>
   <string name="net_status_error_no_active_peers">アクティブなピアなし - ネットワークの接続およびファイアーウォールを確認してください</string>
@@ -82,13 +83,17 @@
   <string name="router_not_running">ルータが起動していません。</string>
   <string name="router_shutting_down">ルータはシャットダウン中です。</string>
   <string name="stats_not_ready">統計マネージャーはまだ準備出来ていません。後でやり直してください。</string>
+  <string name="select_an_address">アドレスを選択</string>
   <string name="no_graphs_configured">グラフは設定されていません。設定でどの統計をグラフにするか選択できます。すべての変更は60秒後に有効になります</string>
   <string name="configure_graphs">グラフ設定</string>
+  <string name="graphs_not_ready">グラフの準備ができていません。後でやり直してください。</string>
   <string name="statistics">統計</string>
   <string name="routers">ルータ</string>
   <string name="leasesets">リースセット</string>
+  <string name="countries">国</string>
   <string name="country">国</string>
   <string name="transport">トランスポート</string>
+  <string name="versions">バージョン</string>
   <string name="version">バージョン</string>
   <string name="count">カウント</string>
   <string name="tname_0">隠すか起動中</string>
@@ -249,7 +254,11 @@
   <string name="tunnel_cat_ports">ローカルポート</string>
   <string name="shared_client">共有クライアント</string>
   <string name="tunnel_summ_shared_client">他の共有クライアントと同じ宛先を使う</string>
+  <string name="target_destination">対象の宛先</string>
   <string name="persistent_key">永続的なキー</string>
+  <string name="persistent_key_conflict_title">新しいキーの再開放を無効にしますか？</string>
+  <string name="persistent_key_conflict_msg">再開放で新しいキーを生成するようトンネルを設定している間に永続キーを有効にできません。新しいキーの再開放を無効にしますか？</string>
+  <string name="tunnel_summ_persistent_key">再起動時にこのトンネルの宛先を維持する</string>
   <string name="reachable_on">到達可能</string>
   <string name="listen_port">着信ポート</string>
   <string name="client_ssl">クライアントSSL</string>
@@ -266,6 +275,8 @@
   <string name="tunnel_summ_use_ssl">ターゲットに接続するためにSSLを使用</string>
   <string name="tunnel_parameters">トンネル調節</string>
   <string name="profile">プロファイル</string>
+  <string name="profile_bulk">バルク接続（ダウンロード/ウェブサイト/BT）</string>
+  <string name="profile_interactive">双方向接続</string>
   <string name="delay_connect">接続延滞</string>
   <string name="tunnel_summ_delay_connect">要求/応答 接続用を有効</string>
   <string name="access_control">アクセス制御</string>
@@ -274,6 +285,7 @@
   <string name="whitelist">ホワイトリスト</string>
   <string name="blacklist">ブラックリスト</string>
   <string name="access_list">アクセスリスト</string>
+  <string name="reject_inproxies">インプロキシを拒否する</string>
   <string name="tunnel_summ_reject_inproxies">I2Pユーザーのみに接続を許可</string>
   <string name="unique_local">ユニークローカル</string>
   <string name="tunnel_summ_unique_local">クライアントごとに固有のローカルホストIPを使用</string>
@@ -294,16 +306,23 @@
   <string name="unlimited">無制限</string>
   <string name="set_zero_for_unlimited">0=無制限</string>
   <string name="post_limits">投稿制限</string>
+  <string name="limit_period">制限期間</string>
+  <string name="client_posts_per_period">期間当たりのクライアントのPOST数</string>
+  <string name="client_ban_length">クライアントの禁止の長さ</string>
+  <string name="total_posts_per_period">期間当たりの合計POST数</string>
+  <string name="total_ban_length">禁止の長さの合計</string>
   <string name="power_saving">パワーセーブ</string>
   <string name="delay_open">オープンを遅れさせる</string>
   <string name="tunnel_summ_delay_open">要求されるまでトンネルのオープンを遅らせる</string>
   <string name="reduce_quantity">数を減らす</string>
   <string name="tunnel_summ_reduce_quantity">アイドル時トンネルの数を減らす</string>
+  <string name="idle_time">アイドル時間</string>
   <string name="num_minutes">%s /分</string>
   <string name="reduced_tunnel_quantity">減らしたトンネルの数量</string>
   <string name="close_tunnels">アイドル時トンネルを閉じる</string>
   <string name="new_keys_on_reopen">再開放で新しいキーにする</string>
   <string name="new_keys_on_reopen_conflict_title">持続的なキーを無効化する？</string>
+  <string name="new_keys_on_reopen_conflict_msg">トンネルが永続キーを持つよう設定している間に新しいキーの再解放を有効にできません。永続キーを無効にしますか？</string>
   <string name="http_client">HTTPクライアント</string>
   <string name="tunnel_summ_user_agent">\'User-Agent\'ヘッダーを通す</string>
   <string name="tunnel_summ_referer">\'リファラー\'ヘッダーを通す</string>
@@ -315,16 +334,26 @@
   <string name="username">ユーザー名</string>
   <string name="password">パスワード</string>
   <string name="outproxy_auth">外部プロキシ認証</string>
+  <string name="tunnel_summ_outproxy_auth">ログインにはアウトプロキシが必要です</string>
   <string name="other">その他</string>
   <string name="signature_type">署名形式</string>
   <string name="custom_options">カスタムオプション</string>
   <string name="all">すべて</string>
   <string name="no_messages">本文がありません</string>
+  <string name="no_error_messages">エラーメッセージなし</string>
+  <plurals name="log_error_messages">
+    <item quantity="other">%d エラーメッセージ、新しい順</item>
+  </plurals>
+  <plurals name="log_messages">
+    <item quantity="other">%dメッセージ、新しい順</item>
+  </plurals>
+  <string name="log_entry">ログ項目</string>
   <string name="copy_logs">ログをコピー</string>
   <string name="i2p_android_error_logs">I2PAndroidエラーログ</string>
   <string name="i2p_android_logs">I2PAndroidログ</string>
   <string name="error_logs_copied_to_clipboard">エラーログはクリップボードにコピーされました</string>
   <string name="logs_copied_to_clipboard">ログはクリップボードにコピーされました</string>
   <string name="label_browser_configuration">ブラウザ設定</string>
+  <string name="no_market_app">マーケットのアプリが見つかりませんでした。手動でインストールしてください。</string>
   <string name="unset">解除</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -89,6 +89,7 @@
   <string name="graphs_not_ready">Gráficos não estão prontos ainda. Tente novamente.</string>
   <string name="statistics">Estatísticas</string>
   <string name="routers">Roteadores</string>
+  <string name="leasesets">LeaseSets</string>
   <string name="countries">Países</string>
   <string name="country">País</string>
   <string name="transport">Transporte</string>
@@ -97,6 +98,7 @@
   <string name="count">Contagem</string>
   <string name="tname_0">Oculto ou inicializando</string>
   <string name="netdb_routers_empty">Sem roteadores em seu NetDB.</string>
+  <string name="netdb_leases_empty">Não tem LeaseSets na sua NetDB.</string>
   <string name="notification_status_starting">O roteador I2P está inicializando</string>
   <string name="notification_status_restarting">O roteador I2P está reiniciando</string>
   <string name="notification_status_waiting">O roteador I2P está esperando por uma conexão de rede</string>
@@ -134,6 +136,7 @@
   <string name="settings_desc_sharePercent">Percentual da largura de banda compartilhada (por omissão=80)</string>
   <string name="settings_dialog_sharePercent">Porcentagem de banda para comprtilhar</string>
   <string name="settings_desc_upnp">Abrir portas do firewall automaticamente</string>
+  <string name="settings_label_logging">Registo de Eventos</string>
   <string name="settings_label_default_log_level">Nível padrão do log</string>
   <string name="settings_label_appearance">Aparência</string>
   <string name="settings_label_language">Idioma</string>

app/src/main/res/values-pt/strings.xml

@@ -55,6 +55,8 @@
   <string name="upload">Enviar</string>
   <string name="configure_browser_title">Configurar o navegador?</string>
   <string name="configure_browser_for_i2p">Gostaria de configurar um navegador para ver sites I2P? (Pode fazê-lo mais tarde através do menu de ajuda.)</string>
+  <string name="configure_no_doze_title">Gerenciar otimizações de bateria?</string>
+  <string name="configure_no_doze">I2P funciona melhor se continuar funcionando. Para evitar que o Android feche o I2P ao tentar economizar/salvar energia, você pode adicioná-lo à lista de exceções da bateria. Isto melhorá substancialmente a confiabilidade do aplicativo.\n\nMantenha I2P funcionando em segundo plano? (recomendado)</string>
   <string name="first_start_title">Parabéns por ter instalado o I2P!</string>
   <string name="first_start_welcome"><b>Bem vindo ao I2P!</b> Por favor <b>tenha paciência</b> enquanto o I2P arranca e encontra outros nós na rede.</string>
   <string name="first_start_read">Enquanto espera, pode ler as notas de lançamento e a página de boas vindas.</string>
@@ -145,6 +147,7 @@
   <string name="settings_label_transports">Transportes</string>
   <string name="settings_label_maxConns">Nr. máx. de ligações</string>
   <string name="settings_label_i2cp">Interface I2CP</string>
+  <string name="settings_desc_i2cp">Permitir que aplicações de terceiros criem túneis (requer reinicialização do roteador)</string>
   <string name="settings_label_exploratory_pool">Poço exploratório</string>
   <string name="settings_desc_exploratory_pool">Parâmetros dos túneis</string>
   <string name="settings_label_expl_inbound">Túneis de entrada</string>
@@ -209,6 +212,7 @@
   <string name="i2ptunnel_msg_tunnel_stopping">Parar túnel</string>
   <string name="i2ptunnel_delete_confirm_message">Apagar túnel?</string>
   <string name="i2ptunnel_delete_confirm_button">Apagar túnel </string>
+  <string name="i2ptunnel_no_tunnel_details">Não foi possível carregar os detalhes do túnel</string>
   <string name="i2ptunnel_wizard_k_client_server">Cliente ou Servidor</string>
   <string name="i2ptunnel_wizard_v_client">Túnel cliente </string>
   <string name="i2ptunnel_wizard_v_server">Túnel servidor </string>
@@ -241,6 +245,7 @@
   <string name="i2ptunnel_view_target">Alvo</string>
   <string name="i2ptunnel_view_access_point">Ponto de acesso</string>
   <string name="i2ptunnel_view_autostart">Iniciar automaticamente</string>
+  <string name="address_copied_to_clipboard">Endereço copiado para a área de transferência</string>
   <string name="edit_tunnel">Alterar túnel </string>
   <string name="name">Nome</string>
   <string name="description">Descrição </string>
@@ -351,5 +356,6 @@
   <string name="error_logs_copied_to_clipboard">Registos de erro copiados para a área de transferência</string>
   <string name="logs_copied_to_clipboard">Registos copiados para a área de transferência</string>
   <string name="label_browser_configuration">Configuração do navegador</string>
+  <string name="no_market_app">Nenhum aplicativo de mercado encontrado, por favor, instale manualmente</string>
   <string name="unset">Desselecionar</string>
 </resources>

app/src/main/res/values-sv/strings.xml

@@ -5,7 +5,7 @@
   <string name="choose_language">Välj språk</string>
   <string name="welcome_new_install">Välkommen till I2P! Den här appen är ALFA-mjukvara och erbjuder inte stark anonymitet.
 Läs utgåvenoteringar och licens-information.</string>
-  <string name="welcome_new_version">Ny version installerad. Vänligen läs versionsanteckningarna. Version: </string>
+  <string name="welcome_new_version">Ny version installerad. Läs versionsanteckningarna. Version: </string>
   <string name="label_tunnels">Tunnlar</string>
   <string name="label_status">Status</string>
   <string name="label_console">Konsoll</string>
@@ -59,15 +59,15 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="configure_no_doze_title">Hantera batterioptimeringar?</string>
   <string name="configure_no_doze">I2P fungerar bäst om den fortsätter att fungera. För att förhindra att Android stänger I2P när du försöker spara ström kan du lägga till den i listan över undantag från batterier. Detta kommer att förbättra applikationens tillförlitlighet avsevärt.\n\nHålla I2P igång i bakgrunden? (rekommenderad)</string>
   <string name="first_start_title">Gratulerar till din I2P-installation!</string>
-  <string name="first_start_welcome"><b>Välkommen till I2P!</b> Vänligen <b>ha tålamod</b> medan I2P startar och letar upp jämlikar.</string>
-  <string name="first_start_read">Medan du väntar, vänligen läs utgåvans meddelanden och välkomstsidan.</string>
-  <string name="first_start_faq">När du har fått klienttunnlar, vänligen <b>kolla</b> våra vanliga frågor:</string>
+  <string name="first_start_welcome"><b>Välkommen till I2P!</b> <b>Ha tålamod</b> medan I2P startar och letar upp jämlikar.</string>
+  <string name="first_start_read">Medan du väntar, läs utgåvans meddelanden och välkomstsidan.</string>
+  <string name="first_start_faq">När du har fått klienttunnlar, <b>kolla</b> våra vanliga frågor:</string>
   <string name="first_start_faq_nonanon">Använd den här icke-anonyma länken om du inte vill vänta på tunnlar:</string>
   <string name="first_start_irc">Peka din IRCclient till <b>localhost:6668</b> och säg hej till oss på:</string>
   <string name="action_search">Sök</string>
   <string name="action_add">Lägg till</string>
   <string name="action_edit">Redigera</string>
-  <string name="action_delete">Radera</string>
+  <string name="action_delete">Ta bort</string>
   <string name="action_i2ptunnel_start">Starta tunnel</string>
   <string name="action_i2ptunnel_stop">Stanna tunnel</string>
   <string name="action_i2ptunnel_start_all">Starta alla tunnlar</string>
@@ -138,7 +138,7 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="settings_dialog_sharePercent">Procent av bandbredd at dela</string>
   <string name="settings_desc_upnp">Öppna portar i brandvägg automatiskt</string>
   <string name="settings_label_logging">Loggning</string>
-  <string name="settings_label_default_log_level">Förvald log nivå</string>
+  <string name="settings_label_default_log_level">Standard loggnivå</string>
   <string name="settings_label_appearance">Stil</string>
   <string name="settings_label_language">Språk</string>
   <string name="settings_default">Förval</string>
@@ -211,8 +211,8 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="i2ptunnel_msg_config_save_failed">Misslyckades med att spara konfiguration</string>
   <string name="i2ptunnel_msg_tunnel_starting">Startar tunnel</string>
   <string name="i2ptunnel_msg_tunnel_stopping">Stannar tunnel</string>
-  <string name="i2ptunnel_delete_confirm_message">Radera tunnel?</string>
-  <string name="i2ptunnel_delete_confirm_button">Radera tunnel</string>
+  <string name="i2ptunnel_delete_confirm_message">Ta bort tunnel?</string>
+  <string name="i2ptunnel_delete_confirm_button">Ta bort tunnel</string>
   <string name="i2ptunnel_no_tunnel_details">Det gick inte att läsa in tunneldetaljer</string>
   <string name="i2ptunnel_wizard_k_client_server">Klient eller Server</string>
   <string name="i2ptunnel_wizard_v_client">Klienttunnel</string>
@@ -236,7 +236,7 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="i2ptunnel_wizard_desc_desc">Beskrivning av tunneln. Frivillig och endast för information.</string>
   <string name="i2ptunnel_wizard_desc_dest">Skriv in I2P-destinationen för den tjänst som denna klienttunnel ska ansluta till. Detta kan vara den fullständiga 64-grunddestinationsnyckeln eller ett I2P-värdnamn från din adressbok.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Om du känner till några utproxier för den här typen av tunnel (antingen HTTP eller SOCKS), fyll i dem. Separera flera proxier med kommatecken.</string>
-  <string name="i2ptunnel_wizard_desc_target_host">Detta är den IP din tjänst kör på, vanligtvis på samma maskin så 127.0.0.1 är automatiskt ifylld.</string>
+  <string name="i2ptunnel_wizard_desc_target_host">Detta är IP-adressen som din tjänst körs på, den är vanligtvis på samma maskin så 127.0.0.1 fylls i automatiskt.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Detta är den port din tjänst tar emot anslutningar på.</string>
   <string name="i2ptunnel_wizard_desc_reachable_on">Det här begränsar vilka datorer eller smartphones som kan få tillgång till denna tunnel.</string>
   <string name="i2ptunnel_wizard_desc_binding_port">Detta är den port som klienttunneln blir åtkomlig från lokalt. Detta är också klientporten för HTTP bidir servertunneln.</string>

app/src/main/res/values-tr/strings.xml

@@ -38,9 +38,9 @@
   <string name="net_status_warn_firewalled_inbound_tcp">Geliş TCP bağlantısı güvenlik duvarı etkinleştirilmiş </string>
   <string name="net_status_warn_firewalled_floodfill">Güvenlik duvarı arkasında otomatik doldurma</string>
   <string name="net_status_info_disconnected">Bağlantı kesildi - ağ bağlantısını denetleyin</string>
-  <string name="net_status_error_udp_port">UDP kapı numarası kullanılıyor - ayarları değiştirip yeniden başlatın</string>
+  <string name="net_status_error_udp_port">UDP bağlantı noktası kullanılıyor - ayarları değiştirip yeniden başlatın</string>
   <string name="net_status_error_no_active_peers">Etkin eş yok, ağ bağlantısını ve güvenlik duvarını denetleyin</string>
-  <string name="net_status_error_udp_disabled_tcp_not_set">UDP devre dışı ve Geliş TCP bağlantısı sunucu/kapı numarası ayarlanmamış</string>
+  <string name="net_status_error_udp_disabled_tcp_not_set">UDP devre dışı ve Geliş TCP bağlantısı sunucu/bağlantı noktası ayarlanmamış</string>
   <string name="net_status_warn_firewalled_udp_disabled">Güvenlik duvarı ve UDP devre dışı</string>
   <string name="shared_clients">Paylaşılmış istemciler</string>
   <string name="uptime">Çalışma süresi</string>
@@ -98,7 +98,7 @@
   <string name="count">Sayı</string>
   <string name="tname_0">Gizli ya da başlatılıyor</string>
   <string name="netdb_routers_empty">Ağ Veritabanınızda bir yöneltici bulunamadı.</string>
-  <string name="netdb_leases_empty">Ağ Veritabanınızda bir LeaseSets bulunamadı.</string>
+  <string name="netdb_leases_empty">Ağ Veritabanınızda bir Kiralama Kümesi bulunamadı.</string>
   <string name="notification_status_starting">I2P başlatılıyor</string>
   <string name="notification_status_restarting">I2P yeniden başlatılıyor</string>
   <string name="notification_status_waiting">I2P bir ağ bağlantısının kurulmasını bekliyor</string>
@@ -135,7 +135,7 @@
   <string name="settings_label_sharePercent">Paylaşım yüzdesi</string>
   <string name="settings_desc_sharePercent">Paylaşılacak bant genişliği yüzdesi (varsayılan=80)</string>
   <string name="settings_dialog_sharePercent">Paylaşılacak bant genişliği yüzdesi</string>
-  <string name="settings_desc_upnp">Güvenlik duvarı kapı numaraları kendiliğinden açılsın</string>
+  <string name="settings_desc_upnp">Güvenlik duvarı bağlantı noktaları otomatik olarak açılsın</string>
   <string name="settings_label_logging">Günlükleme</string>
   <string name="settings_label_default_log_level">Varsayılan günlük düzeyi</string>
   <string name="settings_label_appearance">Görünüm</string>
@@ -222,9 +222,9 @@
   <string name="i2ptunnel_wizard_k_dest">Hedef</string>
   <string name="i2ptunnel_wizard_k_outproxies">Çıkış vekil sunucuları</string>
   <string name="i2ptunnel_wizard_k_target_host">Hedef sunucu</string>
-  <string name="i2ptunnel_wizard_k_target_port">Hedef kapı numarası</string>
+  <string name="i2ptunnel_wizard_k_target_port">Hedef bağlantı noktası</string>
   <string name="i2ptunnel_wizard_k_reachable_on">Şuradan erişilebilir</string>
-  <string name="i2ptunnel_wizard_k_binding_port">Bağlanılacak kapı numarası</string>
+  <string name="i2ptunnel_wizard_k_binding_port">Bağlanılacak bağlantı noktası</string>
   <string name="i2ptunnel_wizard_k_auto_start">Otomatik başlat</string>
   <string name="next">Sonraki</string>
   <string name="prev">Önceki</string>
@@ -236,9 +236,9 @@
   <string name="i2ptunnel_wizard_desc_dest">Bu istemci tünelinin bağlanacağı hizmetin I2P hedefini yazın. Tam Base 64 hedef anahtarı ya da adres defterinizden bir sunucu adı olabilir.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Bu tünel türü için bildiğiniz çıkış sunucuları varsa (HTTP ya da SOCKS) buraya virgül ile ayırarak yazın. </string>
   <string name="i2ptunnel_wizard_desc_target_host">Çalıştırdığınız hizmetin IP adresi. Genellikle aynı bilgisayarda olduğundan otomatik olarak 127.0.0.1 yazılır.</string>
-  <string name="i2ptunnel_wizard_desc_target_port">Hizmetin bağlantıları kabul edeceği kapı numarası.</string>
+  <string name="i2ptunnel_wizard_desc_target_port">Hizmetin bağlantıları kabul edeceği bağlantı noktası.</string>
   <string name="i2ptunnel_wizard_desc_reachable_on">Bu seçenek bu tünele erişebilecek bilgisayar ve akıllı telefonları sınırlar.</string>
-  <string name="i2ptunnel_wizard_desc_binding_port">İstemci tüneline yerel olarak erişilebilecek kapı numarası. Aynı zamanda HTTP bidir sunucusu tünelinin istemci kapı numarasıdır.</string>
+  <string name="i2ptunnel_wizard_desc_binding_port">İstemci tüneline yerel olarak erişilebilecek bağlantı noktası. Aynı zamanda HTTP bidir sunucusu tünelinin istemci bağlantı noktasıdır.</string>
   <string name="i2ptunnel_wizard_desc_auto_start">Yöneltici başlatıldığında tünel de başlatılsın mı?</string>
   <string name="i2ptunnel_wizard_submit_confirm_message">Tünel oluşturulsun</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">Tüneli oluştur</string>
@@ -251,7 +251,7 @@
   <string name="description">Açıklama</string>
   <string name="auto_start">Otomatik başlat</string>
   <string name="tunnel_summ_auto_start">Yöneltici başlatıldığında tünel de başlatılsın.</string>
-  <string name="tunnel_cat_ports">Yerel kapı numaraları</string>
+  <string name="tunnel_cat_ports">Yerel bağlantı noktaları</string>
   <string name="shared_client">Paylaşılmış istemci</string>
   <string name="tunnel_summ_shared_client">Diğer paylaşılmış istemciler ile aynı hedef ve tüneller kullanılsın</string>
   <string name="target_destination">Hedef konum</string>
@@ -260,9 +260,9 @@
   <string name="persistent_key_conflict_msg">Tünel yeniden açıldığında yeni anahtarlar oluşturuluyorsa sürekli anahtarlar kullanılamaz. Yeniden açıldığından yeni anahtarların oluşturulması devre dışı bırakılsın mı?</string>
   <string name="tunnel_summ_persistent_key">Yeniden başlatıldığında bu tünelin hedefi korunsun</string>
   <string name="reachable_on">Şuradan erişilebilir</string>
-  <string name="listen_port">Dinlenecek kapı numarası</string>
+  <string name="listen_port">Dinlenecek bağlantı noktası</string>
   <string name="client_ssl">SSL İstemci</string>
-  <string name="tunnel_summ_client_ssl">İstemci yalnız SSL üzerinden bağlanabilir</string>
+  <string name="tunnel_summ_client_ssl">İstemci yalnızca SSL üzerinden bağlanabilir</string>
   <string name="outproxies">Çıkış vekil sunucuları</string>
   <string name="ssl_outproxies">SSL çıkış vekil sunucuları</string>
   <string name="irc">IRC</string>
@@ -270,7 +270,7 @@
   <string name="tunnel_summ_enable_dcc">IRC istemcileri DCC kullanabilsin</string>
   <string name="website_domain_name">Web sitesinin etki alanı</string>
   <string name="target_host">Hedef sunucu</string>
-  <string name="target_port">Hedef kapı numarası</string>
+  <string name="target_port">Hedef bağlantı noktası</string>
   <string name="use_ssl">SSL Kullanılsın</string>
   <string name="tunnel_summ_use_ssl">Hedefe bağlanmak için SSL kullanılsın</string>
   <string name="tunnel_parameters">Tünel parametreleri</string>
@@ -286,7 +286,7 @@
   <string name="blacklist">Kara liste</string>
   <string name="access_list">Erişim listesi</string>
   <string name="reject_inproxies">Giriş vekil sunucular reddedilsin</string>
-  <string name="tunnel_summ_reject_inproxies">Yalnız I2P kullanıcıları bağlanabilsin</string>
+  <string name="tunnel_summ_reject_inproxies">Yalnızca I2P kullanıcıları bağlanabilsin</string>
   <string name="unique_local">Benzersiz yerel</string>
   <string name="tunnel_summ_unique_local">Her istemci için benzersiz yerel sunucu IP adresi kullanılsın</string>
   <string name="multihome">Birden çok barındırma</string>

app/src/main/res/values-vi/strings.xml

@@ -110,6 +110,7 @@
   <string name="use_ssl">Sử dụng SSL</string>
   <string name="tunnel_parameters">Thông số đường hầm</string>
   <string name="profile">Hồ sơ</string>
+  <string name="access_control">Kiểm soát truy cập</string>
   <string name="disabled">Tàn tật</string>
   <string name="whitelist">Sổ trắng</string>
   <string name="blacklist">Sổ đen</string>
@@ -120,6 +121,7 @@
   <string name="http_client">Khách HTTP</string>
   <string name="username">Tên đăng nhập</string>
   <string name="password">Mật khẩu</string>
+  <string name="other">Khác</string>
   <string name="custom_options">Tùy chọn tùy ý</string>
   <string name="all">Tất cả</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -55,6 +55,8 @@
   <string name="upload">上傳</string>
   <string name="configure_browser_title">配置瀏覽器嗎?</string>
   <string name="configure_browser_for_i2p">您要配置瀏覽器來查看I2P網站嗎? (您也可以稍後在幫助清單設定。)</string>
+  <string name="configure_no_doze_title">管理电池优化？</string>
+  <string name="configure_no_doze">I2P 在持续工作时能达到最佳效果。为阻止 Android 在尝试节省电量时关闭 I2P，您可以将它添加到电池例外名单中。这将大幅提高应用稳定性。\n\n要保持 I2P 在后台运行吗？（推荐）</string>
   <string name="first_start_title">恭喜您成功安裝了 I2P ！</string>
   <string name="first_start_welcome"><b>歡迎來到I2P!</b> 請 <b>保持耐心</b> 等 I2P 啟動和找節點。</string>
   <string name="first_start_read">在您等候的同時，請在閱讀發行公告與歡迎頁面。</string>
@@ -145,6 +147,7 @@
   <string name="settings_label_transports">傳輸</string>
   <string name="settings_label_maxConns">最大連接數</string>
   <string name="settings_label_i2cp">I2CP 介面</string>
+  <string name="settings_desc_i2cp">允许第三方应用创建隧道（需要路由重启）</string>
   <string name="settings_label_exploratory_pool">導坑池</string>
   <string name="settings_desc_exploratory_pool">隧道參數</string>
   <string name="settings_label_expl_inbound">Inbound 隧道</string>
@@ -179,6 +182,12 @@
   <string name="addressbook_add_wizard_k_name">名稱</string>
   <string name="addressbook_add_wizard_k_destination">目標</string>
   <string name="addressbook_add_wizard_desc_name">名字是</string>
+  <string name="addressbook_add_wizard_desc_destination">在这里粘贴 B64 形式的目的地。如果您有安装一个文件管理器，您可以浏览包含 B64 的一个文本文件。</string>
+  <string name="nsu_iae_illegal_char">主机名称 \"%1$s\" 中包含非法字符 %2$s</string>
+  <string name="nsu_iae_cannot_start_with">主机名不能以 \"%s\"开始</string>
+  <string name="nsu_iae_cannot_end_with">主机名不能以 \"%s\"结尾</string>
+  <string name="nsu_iae_cannot_contain">主机名不能包含 \"%s\"</string>
+  <string name="nsu_iae_requires_conversion">主机名称 \"%s\" 需要转换为 ASCII，但转换库在此 Android 版本中不可用</string>
   <string name="i2ptunnel_type_client">標準客戶端</string>
   <string name="i2ptunnel_type_httpclient">HTTP 客戶端</string>
   <string name="i2ptunnel_type_ircclient">IRC客戶端</string>
@@ -188,7 +197,11 @@
   <string name="i2ptunnel_type_socksirctunnel">SOCKS IRC 代理</string>
   <string name="i2ptunnel_type_connectclient">CONNECT/SSL/HTTPS 代理</string>
   <string name="i2ptunnel_type_ircserver">IRC 伺服器</string>
+  <string name="i2ptunnel_type_streamrclient">Streamr 客户端</string>
+  <string name="i2ptunnel_type_streamrserver">Streamr 服务器</string>
+  <string name="i2ptunnel_type_httpbidirserver">双向 HTTP</string>
   <string name="install_recommended_app">安裝建議的 app ?</string>
+  <string name="app_needed_for_this_tunnel_type">您需要安装一个应用以使用此隧道。您想安装推荐的应用吗？</string>
   <string name="i2ptunnel_not_initialized">隧道尚未初始化，請在兩分鐘內重整。</string>
   <string name="no_configured_client_tunnels">客戶端隧道沒有設定。</string>
   <string name="no_configured_server_tunnels">伺服器隧道沒有設定。</string>
@@ -211,12 +224,22 @@
   <string name="i2ptunnel_wizard_k_target_host">目標主機</string>
   <string name="i2ptunnel_wizard_k_target_port">目標端口</string>
   <string name="i2ptunnel_wizard_k_reachable_on">開啟被連通</string>
+  <string name="i2ptunnel_wizard_k_binding_port">绑定端口</string>
   <string name="i2ptunnel_wizard_k_auto_start">自動啟動</string>
   <string name="next">下一個</string>
   <string name="prev">前一個</string>
   <string name="finish">提交</string>
   <string name="review">複檢</string>
   <string name="enabled">啟用</string>
+  <string name="i2ptunnel_wizard_desc_name">隧道的名称，隧道列表中的标识。</string>
+  <string name="i2ptunnel_wizard_desc_desc">隧道的描述。这是可选的，纯粹提供信息性。</string>
+  <string name="i2ptunnel_wizard_desc_dest">输入这个客户端隧道应该连接到的该服务的 I2P 目的地。这可以是完整的 base 64 目的地密钥，或者您地址簿中的 I2P 主机名。</string>
+  <string name="i2ptunnel_wizard_desc_outproxies">如果您知道任何此类型的隧道 (HTTP 或者 SOCKS) 的出口代理，填入它们。用逗号分隔多个代理服务器。</string>
+  <string name="i2ptunnel_wizard_desc_target_host">这是您正在运行服务的所在 IP，这通常是在同一台机器上，所以 127.0.0.1 会被自动填写。</string>
+  <string name="i2ptunnel_wizard_desc_target_port">这是这项服务接受连接的端口。</string>
+  <string name="i2ptunnel_wizard_desc_reachable_on">这就限制了哪些电脑或智能手机可以访问此隧道。</string>
+  <string name="i2ptunnel_wizard_desc_binding_port">这是客户端隧道从本地访问的端口。这也是 HTTP bidir 服务器隧道的客户端端口。</string>
+  <string name="i2ptunnel_wizard_desc_auto_start">启动路由器时应自动启动隧道吗？</string>
   <string name="i2ptunnel_wizard_submit_confirm_message">建立新隧道？</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">建立新隧道</string>
   <string name="i2ptunnel_view_target">目標</string>
@@ -230,21 +253,101 @@
   <string name="tunnel_summ_auto_start">當路由器啟動時一併啟動這個隧道。</string>
   <string name="tunnel_cat_ports">本地端口</string>
   <string name="shared_client">共享客戶端</string>
+  <string name="tunnel_summ_shared_client">使用相同的目的地和隧道为其他客户端共享</string>
+  <string name="target_destination">目标目的地</string>
+  <string name="persistent_key">持久密钥</string>
+  <string name="persistent_key_conflict_title">禁用重新打开时新建密钥？</string>
+  <string name="persistent_key_conflict_msg">您不能在隧道被配置为重新打开时生成新密钥的情况下启用持久密钥。您想禁用重新打开时新建密钥吗？</string>
+  <string name="tunnel_summ_persistent_key">它重启时保持此隧道的目的地</string>
   <string name="reachable_on">開啟被連通</string>
+  <string name="listen_port">监听端口</string>
+  <string name="client_ssl">客户端 SSL</string>
+  <string name="tunnel_summ_client_ssl">客户端必须使用 SSL 连接</string>
   <string name="outproxies">連外代理</string>
   <string name="ssl_outproxies">SSL 的連外代理</string>
+  <string name="irc">IRC</string>
+  <string name="enable_dcc">启用 DCC</string>
+  <string name="tunnel_summ_enable_dcc">允许 IRC 客户端使用 DCC</string>
+  <string name="website_domain_name">网站域名</string>
   <string name="target_host">目標主機</string>
   <string name="target_port">目標端口</string>
   <string name="use_ssl">使用 SSL</string>
+  <string name="tunnel_summ_use_ssl">使用 SSL 连接目标</string>
   <string name="tunnel_parameters">隧道參數</string>
   <string name="profile">個人資料</string>
+  <string name="profile_bulk">大包连接 (下载/网站/BT)</string>
+  <string name="profile_interactive">交互连接</string>
+  <string name="delay_connect">延迟连接</string>
+  <string name="tunnel_summ_delay_connect">对请求/响应连接启用</string>
   <string name="access_control">存取控制</string>
+  <string name="restricted_access">访问受限</string>
   <string name="disabled">關閉</string>
+  <string name="whitelist">白名单</string>
+  <string name="blacklist">黑名单</string>
+  <string name="access_list">访问列表</string>
+  <string name="reject_inproxies">拒绝代理访问</string>
+  <string name="tunnel_summ_reject_inproxies">只允许 I2P 用户连接</string>
+  <string name="unique_local">唯一本地</string>
+  <string name="tunnel_summ_unique_local">使用唯一的本地 IP 对每个客户端</string>
+  <string name="multihome">多宿主</string>
+  <string name="tunnel_summ_multihome">启用多宿主优化</string>
+  <string name="client_connection_limits">客户端连接数限制</string>
+  <string name="connections_per_minute">每分钟连接数</string>
+  <string name="connections_per_hour">每小时连接数</string>
+  <string name="connections_per_day">每天连接数</string>
+  <string name="total_connection_limits">总连接数限制</string>
+  <string name="total_connections_per_minute">总连接数每分钟</string>
+  <string name="total_connections_per_hour">总连接数每小时</string>
+  <string name="total_connections_per_day">总连接数每天</string>
+  <string name="max_active_connections">最大活动连接数</string>
+  <string name="num_per_minute">%s 每分钟</string>
+  <string name="num_per_hour">%s 每小时</string>
+  <string name="num_per_day">%s 每天</string>
   <string name="unlimited">無限制</string>
+  <string name="set_zero_for_unlimited">设置 0 表示无限制</string>
+  <string name="post_limits">POST 限制</string>
+  <string name="limit_period">限制周期</string>
+  <string name="client_posts_per_period">客户端 POST 数量每个周期</string>
+  <string name="client_ban_length">客户端封禁长度</string>
+  <string name="total_posts_per_period">POST 总数每个周期</string>
+  <string name="total_ban_length">总计封禁长度</string>
+  <string name="power_saving">省电</string>
+  <string name="delay_open">延迟打开</string>
+  <string name="tunnel_summ_delay_open">延迟隧道打开，直到请求</string>
+  <string name="reduce_quantity">减少数量</string>
+  <string name="tunnel_summ_reduce_quantity">减少隧道数量在空闲时</string>
+  <string name="idle_time">闲置时间</string>
+  <string name="num_minutes">%s 分钟</string>
+  <string name="reduced_tunnel_quantity">减少隧道数量</string>
+  <string name="close_tunnels">关闭隧道在闲置时</string>
+  <string name="new_keys_on_reopen">新建密钥在重新打开时</string>
+  <string name="new_keys_on_reopen_conflict_title">禁用持久密钥</string>
+  <string name="new_keys_on_reopen_conflict_msg">您不能在隧道被配置为有持久密钥情况下启用重新打开时新建密钥。您想禁用持久密钥吗？</string>
   <string name="http_client">HTTP 客戶端</string>
+  <string name="tunnel_summ_user_agent">传递 \'User-Agent\' 头通过</string>
+  <string name="tunnel_summ_referer">传递 \'Referer\' 头通过</string>
+  <string name="tunnel_summ_accept">传递 \'Accept-*\' 头通过</string>
+  <string name="tunnel_summ_allow_ssl">允许 SSL 到 I2P 地址簿</string>
+  <string name="jump_url_list">跳到 URL 列表</string>
+  <string name="proxy_auth">代理身份验证</string>
+  <string name="tunnel_summ_proxy_auth">需要登录才能使用此代理</string>
   <string name="username">使用者名稱</string>
   <string name="password">密碼</string>
+  <string name="outproxy_auth">出口代理身份验证</string>
+  <string name="tunnel_summ_outproxy_auth">该出口代理需要登录</string>
   <string name="other">其它</string>
+  <string name="signature_type">签名类型</string>
+  <string name="custom_options">自定义选项</string>
   <string name="all">全部</string>
   <string name="no_messages">沒有訊息</string>
+  <string name="no_error_messages">无错误消息</string>
+  <string name="log_entry">日志条目</string>
+  <string name="copy_logs">复制日志</string>
+  <string name="i2p_android_error_logs">I2P Android 错误日志</string>
+  <string name="i2p_android_logs">I2P Android 日志</string>
+  <string name="error_logs_copied_to_clipboard">错误日志已复制到剪贴板</string>
+  <string name="logs_copied_to_clipboard">日志已复制到剪贴板</string>
+  <string name="label_browser_configuration">浏览器配置</string>
+  <string name="no_market_app">没有找到应用商店，请手动安装</string>
+  <string name="unset">未设置</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -23,7 +23,7 @@
   <string name="button_router_off">长按启动 I2P</string>
   <string name="button_router_on">I2P 正在运行 (长按停止)</string>
   <string name="button_router_graceful">I2P 将在 %s 后关闭</string>
-  <string name="button_shutdown_now">长按现在停止</string>
+  <string name="button_shutdown_now">长按立即停止</string>
   <string name="button_cancel_graceful">长按取消关闭</string>
   <string name="no_internet">没有可用的互联网连接</string>
   <string name="hidden">隐身</string>
@@ -56,7 +56,7 @@
   <string name="configure_browser_title">配置浏览器？</string>
   <string name="configure_browser_for_i2p">您想配置一个浏览器来查看 I2P 站点吗？（您也可以以后再从帮助菜单设置这个）</string>
   <string name="configure_no_doze_title">管理电池优化？</string>
-  <string name="configure_no_doze">I2P 在持续工作时能达到最佳效果。为阻止 Android 在尝试省电时关闭 I2P，您可以将它添加到电池例外名单中。这将大幅提高应用稳定性。\n\n要保持 I2P 在后台运行吗？（推荐）</string>
+  <string name="configure_no_doze">I2P 在持续工作时能达到最佳效果。为阻止 Android 在尝试节省电量时关闭 I2P，您可以将它添加到电池例外名单中。这将大幅提高应用稳定性。\n\n要保持 I2P 在后台运行吗？（推荐）</string>
   <string name="first_start_title">恭喜，I2P 已安装！</string>
   <string name="first_start_welcome"><b>欢迎使用 I2P！</b>在 I2P 启动和寻找同伴时，请<b>保持耐心</b>。</string>
   <string name="first_start_read">在您等候时，请阅读发布说明和欢迎页面。</string>

app/src/main/res/values/arrays.xml

@@ -109,28 +109,25 @@
     </string-array>
     <string-array name="recommended_browsers">
         <item>acr.browser.lightning</item>
-        <item>io.github.forkmaintainers.iceraven</item>
+        <item>com.stoutner.privacybrowser.standard</item>
     </string-array>
     <string-array name="recommended_browser_labels">
         <item>Lightning</item>
-        <item>IceRaven(With Extension)</item>
+        <item>Privacy Browser</item>
     </string-array>
     <string-array name="supported_browsers">
-        <item>org.mozilla.firefox</item>
         <item>org.mozilla.fennec_fdroid</item>
-        <item>org.gnu.icecat</item>
     </string-array>
     <string-array name="supported_browser_labels">
-        <item>Firefox</item>
         <item>Fennec F-Droid</item>
-        <item>IceCatMobile</item>
     </string-array>
     <string-array name="unsupported_browsers">
+        <item>org.mozilla.firefox</item>
         <item>com.android.chrome</item>
         <item>com.brave.browser</item>
         <item>com.android.browser</item>
         <item>com.sec.android.app.sbrowser</item>
-        <item>com.stoutner.privacybrowser.standard</item>
+        <item>org.gnu.icecat</item>
         <item>info.guardianproject.browser</item>
         <item>mobi.mgeek.TunnyBrowser</item>
         <item>com.lastpass.lpandroid</item>
@@ -172,4 +169,28 @@
         <item>ECDSA-P521</item>
         <item>Ed25519</item>
     </string-array>
+    <string-array name="speed_increments">
+        <item>100 KB/s</item>
+        <item>200 KB/s</item>
+        <item>300 KB/s</item>
+        <item>400 KB/s</item>
+        <item>500 KB/s</item>
+        <item>600 KB/s</item>
+        <item>700 KB/s</item>
+        <item>800 KB/s</item>
+        <item>900 KB/s</item>
+        <item>1000 KB/s</item>
+    </string-array>
+    <integer-array name="speed_values">
+        <item>100</item>
+        <item>200</item>
+        <item>300</item>
+        <item>400</item>
+        <item>500</item>
+        <item>600</item>
+        <item>700</item>
+        <item>800</item>
+        <item>900</item>
+        <item>1000</item>
+    </integer-array>
 </resources>

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

@@ -188,6 +188,10 @@
     <string name="settings_desc_i2cp">Allow third-party apps to create tunnels using I2CP (requires router restart)</string>
     <string name="settings_label_sam">SAM interface</string>
     <string name="settings_desc_sam">Allow third-party apps to create tunnels using SAM (requires router restart)</string>
+    <string name="settings_confirm_sam">An application is trying to make a SAM connection.</string>
+    <string name="settings_confirm_sam_id">Connection Name/ID:</string>
+    <string name="settings_confirm_allow_sam">Tap to allow</string>
+    <string name="settings_confirm_deny_sam">Ignore to deny</string>
     <string name="settings_label_exploratory_pool">Exploratory pool</string>
     <string name="settings_desc_exploratory_pool">Tunnel parameters</string>
     <string name="settings_label_expl_inbound">Inbound tunnels</string>
@@ -290,7 +294,7 @@
 
     <string name="i2ptunnel_wizard_desc_name">The name of the tunnel, for identification in the tunnel list.</string>
     <string name="i2ptunnel_wizard_desc_desc">A description of the tunnel. This is optional and purely informative.</string>
-    <string name="i2ptunnel_wizard_desc_dest">Type in the I2P destination of the service that this client tunnel should connect to. This could be the full base 64 destination key, or an I2P host name from your address book.</string>
+    <string name="i2ptunnel_wizard_desc_dest">Specify the .i2p address or destination (hostname.i2p, b32 or b64) of the tunnel here.</string>
     <string name="i2ptunnel_wizard_desc_outproxies">If you know of any outproxies for this type of tunnel (either HTTP or SOCKS), fill them in. Separate multiple proxies with commas.</string>
     <string name="i2ptunnel_wizard_desc_target_host">This is the IP that your service is running on, this is usually on the same machine so 127.0.0.1 is autofilled.</string>
     <string name="i2ptunnel_wizard_desc_target_port">This is the port that the service is accepting connections on.</string>
@@ -420,5 +424,5 @@
     <string name="no_market_app">No market app found, please install manually</string>
 
     <string name="unset">Unset</string>
-	<string name="running_background">I2P is running in the background</string>
+    <string name="running_background">I2P is running in the background</string>
 </resources>

app/src/main/res/xml/settings_net.xml

@@ -14,26 +14,26 @@
     <PreferenceCategory
         android:key="settings_bandwidth"
         android:title="@string/settings_label_bandwidth">
-    <!--
-    i2np.bandwidth.inboundKBytesPerSecond=100
-    -->
-    <com.pavelsikun.seekbarpreference.SeekBarPreference
-        android:key="@string/PROP_INBOUND_BANDWIDTH"
-        android:title="@string/settings_desc_bw_inbound"
-        app:msbp_defaultValue="100"
-        app:msbp_maxValue="1000"
-        app:msbp_measurementUnit="KB/s"
-        />
-    <!--
-    i2np.bandwidth.outboundKBytesPerSecond=30
-    -->
-    <com.pavelsikun.seekbarpreference.SeekBarPreference
-        android:key="@string/PROP_OUTBOUND_BANDWIDTH"
-        android:title="@string/settings_desc_bw_outbound"
-        app:msbp_defaultValue="100"
-        app:msbp_maxValue="1000"
-        app:msbp_measurementUnit="KB/s"
-        />
+        <!--
+        i2np.bandwidth.inboundKBytesPerSecond=100
+        -->
+        <com.pavelsikun.seekbarpreference.SeekBarPreference
+            android:key="@string/PROP_INBOUND_BANDWIDTH"
+            android:title="@string/settings_desc_bw_inbound"
+            app:msbp_defaultValue="100"
+            app:msbp_maxValue="1000"
+            app:msbp_measurementUnit="KB/s"
+            />
+        <!--
+        i2np.bandwidth.outboundKBytesPerSecond=30
+        -->
+        <com.pavelsikun.seekbarpreference.SeekBarPreference
+            android:key="@string/PROP_OUTBOUND_BANDWIDTH"
+            android:title="@string/settings_desc_bw_outbound"
+            app:msbp_defaultValue="100"
+            app:msbp_maxValue="1000"
+            app:msbp_measurementUnit="KB/s"
+            />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -51,9 +51,9 @@
         android:summary="@string/settings_desc_hiddenMode"
         />
         -->
-    <!--
-    router.maxParticipatingTunnels=0
-    -->
+        <!--
+        router.maxParticipatingTunnels=0
+        -->
         <!--
     <com.hlidskialf.android.preference.SeekBarPreference
         android:key="router.maxParticipatingTunnels"
@@ -66,9 +66,9 @@
         android:dependency="router.hiddenMode"
         />
         -->
-    <!--
-    router.sharePercentage=10
-    -->
+        <!--
+        router.sharePercentage=10
+        -->
         <!--
     <com.hlidskialf.android.preference.SeekBarPreference
         android:key="router.sharePercentage"
@@ -83,15 +83,15 @@
         />
         -->
 
-    <!--
-    i2np.upnp.enable=false
-    -->
-    <CheckBoxPreference
-        android:key="@string/PROP_ENABLE_UPNP"
-        android:defaultValue="true"
-        android:title="UPnP"
-        android:summary="@string/settings_desc_upnp"
-        />
+        <!--
+        i2np.upnp.enable=false
+        -->
+        <CheckBoxPreference
+            android:key="@string/PROP_ENABLE_UPNP"
+            android:defaultValue="true"
+            android:title="UPnP"
+            android:summary="@string/settings_desc_upnp"
+            />
     </PreferenceCategory>
 
 </PreferenceScreen>

build.gradle

@@ -15,7 +15,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.android.tools.lint:lint-gradle:26.1.1'
     }
 }

gradle.properties

@@ -14,7 +14,8 @@ POM_DEVELOPER_ID=idk
 POM_DEVELOPER_NAME=idk
 POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
 
-ANDROID_BUILD_TARGET_SDK_VERSION=30
-ANDROID_BUILD_SDK_VERSION=28
+ANDROID_BUILD_TARGET_SDK_VERSION=31
+ANDROID_BUILD_SDK_VERSION=31
 
-I2P_VERSION=1.7.0
+I2P_VERSION=2.0.0
+I2P_ANDROID_VERSION=2.0.1

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

lib/client/build.gradle

@@ -9,7 +9,7 @@ repositories {
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     }
     buildTypes {
@@ -19,13 +19,17 @@ 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
     }
-    buildToolsVersion '28.0.3'
+}
+
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
 
 dependencies {

lib/helper/build.gradle

@@ -5,7 +5,7 @@ version = '0.9.5'
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     }
     buildTypes {
@@ -15,13 +15,13 @@ 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
     }
-    buildToolsVersion '28.0.3'
 }
 
 dependencies {
@@ -33,4 +33,8 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.11.0'
 }
 
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+}
+
 apply from: "${project.rootDir}/gradle/maven-push.gradle"

lib/helper/src/main/res/values-es-rAR/strings.xml

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="yes">Sí</string>
+  <string name="no">No</string>
+  <string name="install_i2p_android">¿Instalar I2P Android?</string>
+  <string name="you_must_have_i2p_android">Ha de tener I2P Android instalado y ejecutándose. ¿Le gustaría instalarlo?</string>
+  <string name="start_i2p_android">¿Iniciar I2P Android?</string>
+  <string name="would_you_like_to_start_i2p_android">Parece que I2P Android no se está ejecutando. ¿Desea ejecutarlo?</string>
+</resources>

lib/helper/src/main/res/values-sl/strings.xml

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="yes">Da</string>
+  <string name="no">Ne</string>
+  <string name="install_i2p_android">Namesti I2P Android?</string>
+  <string name="you_must_have_i2p_android">Vi morate imeti I2P Android nameščen in zagnan. Bi vi radi ga namestili?</string>
+  <string name="start_i2p_android">Zaženi I2P Android?</string>
+  <string name="would_you_like_to_start_i2p_android">Zgleda, da I2P Android ne teče. Želite ga zagnati?</string>
+</resources>

lib/helper/src/main/res/values-tr/strings.xml

@@ -2,8 +2,8 @@
 <resources>
   <string name="yes">Evet</string>
   <string name="no">Hayır</string>
-  <string name="install_i2p_android">I2P Android Kurulsun mu?</string>
+  <string name="install_i2p_android">I2P Android kurulsun mu?</string>
   <string name="you_must_have_i2p_android">I2P Android uygulaması kurulmuş ve çalışıyor olmalıdır. Kurmak ister misiniz?</string>
-  <string name="start_i2p_android">I2P Android Başlatılsın</string>
+  <string name="start_i2p_android">I2P Android başlatılsın</string>
   <string name="would_you_like_to_start_i2p_android">I2P Android uygulaması çalışmıyor gibi görünüyor. Başlatmak ister misiniz?</string>
 </resources>