Play store required a new android number even the first wasn't published.

Short: We had to upgrade to sdk 26 to ensure the app can run on all devices.

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
     defaultConfig {
-        versionCode 4745243
+        versionCode 4745245
         versionName "$I2P_VERSION"
         minSdkVersion 9
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)

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

@@ -111,7 +111,8 @@ public class GeneralTunnelPreferenceFragment extends BaseTunnelPreferenceFragmen
                 generalCategory.removePreference(generalCategory.findPreference(getString(R.string.TUNNEL_SHARED_CLIENT)));
                 addPreferencesFromResource(R.xml.tunnel_gen_server_port, portCategory);
                 portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_TARGET_PORT)));
-                portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+                // # TODO: See trac issue #2296
+                //portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
             }
         }
 
@@ -168,8 +169,11 @@ public class GeneralTunnelPreferenceFragment extends BaseTunnelPreferenceFragmen
 
         @Override
         protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            /*
+            # TODO: See trac issue #2296
             if (!isStandardOrIrc)
                 portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+                 */
         }
 
         @Override
@@ -185,7 +189,8 @@ public class GeneralTunnelPreferenceFragment extends BaseTunnelPreferenceFragmen
         @Override
         protected void generalServerHttpBidirOrStreamr(boolean isStreamr) {
             addPreferencesFromResource(R.xml.tunnel_gen_client_port, portCategory);
-            portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+            // # TODO: See trac issue #2296
+            //portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
             if (isStreamr)
                 portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_LISTEN_PORT)));
 
@@ -201,7 +206,8 @@ public class GeneralTunnelPreferenceFragment extends BaseTunnelPreferenceFragmen
         protected void generalServerPortStreamr(boolean isStreamr) {
             if (isStreamr) {
                 portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_TARGET_HOST)));
-                portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
+                // # TODO: See trac issue #2296
+                //portCategory.removePreference(portCategory.findPreference(getString(R.string.TUNNEL_USE_SSL)));
             }
         }
 

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

@@ -182,8 +182,10 @@ public class TunnelUtil extends GeneralHelper {
 
         @Override
         protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            /* # TODO: See trac issue #2296
             if (isStandardOrIrc)
                 ed.putBoolean(res.getString(R.string.TUNNEL_USE_SSL), isSSLEnabled(tunnel));
+                */
         }
 
         @Override
@@ -212,7 +214,8 @@ public class TunnelUtil extends GeneralHelper {
         protected void generalServerPortStreamr(boolean isStreamr) {
             if (!isStreamr) {
                 ed.putString(res.getString(R.string.TUNNEL_TARGET_HOST), getTargetHost(tunnel));
-                ed.putBoolean(res.getString(R.string.TUNNEL_USE_SSL), isSSLEnabled(tunnel));
+                // # TODO: See trac issue #2296
+                //ed.putBoolean(res.getString(R.string.TUNNEL_USE_SSL), isSSLEnabled(tunnel));
             }
         }
 
@@ -414,8 +417,10 @@ public class TunnelUtil extends GeneralHelper {
 
         @Override
         protected void generalClientStandardOrIrc(boolean isStandardOrIrc) {
+            /* # TODO: See trac issue #2296
             if (isStandardOrIrc)
                 cfg.setUseSSL(prefs.getBoolean(res.getString(R.string.TUNNEL_USE_SSL), false));
+                */
         }
 
         @Override
@@ -444,7 +449,8 @@ public class TunnelUtil extends GeneralHelper {
         protected void generalServerPortStreamr(boolean isStreamr) {
             if (!isStreamr) {
                 cfg.setTargetHost(prefs.getString(res.getString(R.string.TUNNEL_TARGET_HOST), "127.0.0.1"));
-                cfg.setUseSSL(prefs.getBoolean(res.getString(R.string.TUNNEL_USE_SSL), false));
+                // # TODO: See trac issue #2296
+                //cfg.setUseSSL(prefs.getBoolean(res.getString(R.string.TUNNEL_USE_SSL), false));
             }
         }
 

app/src/main/res/layout/listitem_i2ptunnel.xml

@@ -37,7 +37,7 @@
             android:layout_toRightOf="@id/tunnel_name"
             android:ellipsize="start"
             android:gravity="end"
-            android:maxLines="1"
+            android:singleLine="true"
             android:text="Interface:port"
             android:textAppearance="@style/TextAppearance.AppCompat.Secondary" />
 

app/src/main/res/layout/listitem_routerinfo.xml

@@ -29,7 +29,7 @@
         android:layout_marginLeft="@dimen/listitem_horizontal_margin"
         android:layout_marginStart="@dimen/listitem_horizontal_margin"
         android:ellipsize="marquee"
-        android:maxLines="1"
+        android:singleLine="true"
         android:text="RouterInfo hash"
         android:textAppearance="@style/TextAppearance.AppCompat.Primary" />
 

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

@@ -149,10 +149,12 @@
   <string name="settings_label_expl_backupQuantity">Quantitat de còpies de seguretat</string>
   <string name="settings_summ_expl_backupQuantity">%s túnels</string>
   <string name="settings_desc_expl_backupQuantity">Quantitat de còpies de seguretat del túnel</string>
+  <string name="menu_about">Quant a</string>
   <string name="about_version">Versió:</string>
   <string name="about_helpwanted">Es necessita ajuda!</string>
   <string name="about_volunteer">Voleu ajudar a millorar l\'aplicació? Oferiu-vos voluntaris al fòrum Android:</string>
   <string name="menu_help">Ajuda</string>
+  <string name="general">Generals</string>
   <string name="label_router">Adreces públiques</string>
   <string name="label_private">Adreces privades</string>
   <string name="addressbook_add_wizard_k_name">Nom</string>
@@ -176,6 +178,7 @@
   <string name="i2ptunnel_wizard_desc_desc">Una descripció del túnel. És opcional i purament informativa.</string>
   <string name="i2ptunnel_wizard_submit_confirm_message">Voleu crear el túnel?</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">Crea el túnel</string>
+  <string name="i2ptunnel_view_target">Objectiu</string>
   <string name="i2ptunnel_view_access_point">Punt d\'accés</string>
   <string name="edit_tunnel">Edita el túnel</string>
   <string name="name">Nom</string>
@@ -190,6 +193,7 @@
   <string name="profile">Perfil</string>
   <string name="profile_interactive">Connexió interactiva</string>
   <string name="access_control">Control d\'accés</string>
+  <string name="disabled">Desactivat</string>
   <string name="access_list">Llista d\'accés</string>
   <string name="client_connection_limits">Límit de connexions del client</string>
   <string name="connections_per_minute">Connexions per minut</string>

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

@@ -114,6 +114,7 @@
   <string name="settings_desc_upnp">Avaa palomuuriportit automaattisesti</string>
   <string name="settings_label_logging">Lokit</string>
   <string name="settings_label_default_log_level">Oletus loggaustaso</string>
+  <string name="settings_label_appearance">Ulkoasu</string>
   <string name="settings_label_language">Kieli</string>
   <string name="settings_default">Oletus</string>
   <string name="settings_label_advanced">Lisätietoja</string>
@@ -198,6 +199,7 @@
   <string name="use_ssl">Käytä SSL:ää</string>
   <string name="tunnel_parameters">Tunneliparametrit</string>
   <string name="profile">Profiili</string>
+  <string name="disabled">Otettu pois käytöstä</string>
   <string name="whitelist">Valkoinen lista</string>
   <string name="blacklist">Musta lista</string>
   <string name="connections_per_minute">Yhteyksiä minuutissa</string>

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

@@ -31,6 +31,7 @@
   <!--Character to indicate a server tunnel. Usually first letter of the word "server".-->
   <string name="char_server_tunnel">S</string>
   <string name="download">ダウンロード</string>
+  <string name="upload">アップロード</string>
   <string name="configure_browser_title">ブラウザの設定をしますか？</string>
   <string name="configure_browser_for_i2p">I2Pサイトを見るためにブラウザを設定しますか？(あとでヘルプメニューからも設定できます)</string>
   <string name="first_start_title">I2P のインストールおめでとうございます！</string>
@@ -92,7 +93,9 @@
   <string name="settings_desc_upnp">自動的にファイアーウォールのポートを開く</string>
   <string name="settings_label_logging">ロギング</string>
   <string name="settings_label_default_log_level">デフォルトのログ水準</string>
+  <string name="settings_label_appearance">外観</string>
   <string name="settings_label_language">言語</string>
+  <string name="settings_default">デフォルト</string>
   <string name="settings_label_advanced">高度</string>
   <string name="settings_label_showStats">ルーターの統計</string>
   <string name="settings_summ_showStats">メインコンソールに高度な統計を表示</string>
@@ -217,6 +220,7 @@
   <string name="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>

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

@@ -25,7 +25,9 @@
   <string name="hidden">Skrytý</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <!--Character to indicate a client tunnel. Usually first letter of the word "client".-->
+  <string name="char_client_tunnel">C</string>
   <!--Character to indicate a server tunnel. Usually first letter of the word "server".-->
+  <string name="char_server_tunnel">S</string>
   <string name="first_start_title">Gratulácia k nainštalovaniu I2P!</string>
   <string name="first_start_welcome"><b>Vitajte v I2P!</b> Prosím <b>majte trpezlivosť</b>, kým sa I2P nabootuje a nájde peerov.</string>
   <string name="first_start_read">Zatiaľ čo budete čakať, prosím prečítajte si poznámky k vydaniu a úvodnú stránku.</string>
@@ -47,6 +49,8 @@
   <string name="action_reload_subscriptions">Obnoviť príspevky</string>
   <string name="router_not_running">Router nie je spustený.</string>
   <string name="stats_not_ready">Správca štatistík zatiaľ nie je pripravený. Prosím vyskúšajte to znova neskôr.</string>
+  <string name="country">Krajina</string>
+  <string name="version">Verzia</string>
   <string name="count">Počet</string>
   <string name="netdb_routers_empty">Žiadne routre vo vašej NetDB.</string>
   <string name="netdb_leases_empty">Žiadne prenajaté sady vo vašej NetDB.</string>
@@ -74,6 +78,8 @@
   <string name="settings_desc_upnp">Automaticky otvoriť porty firewallu</string>
   <string name="settings_label_logging">Logovanie</string>
   <string name="settings_label_default_log_level">Predvolená úroveń logovania</string>
+  <string name="settings_label_appearance">Vzhľad</string>
+  <string name="settings_label_language">Jazyk</string>
   <string name="settings_default">Predvolené</string>
   <string name="settings_label_advanced">Pokročilé</string>
   <string name="settings_label_showStats">Štatistiky routra</string>
@@ -106,6 +112,7 @@
   <string name="about_volunteer">Chceli by ste urobiť aplikáciu lepšou? Prihláste sa na androidovom fóre:</string>
   <string name="about_donate">Chcete darovať peniaze alebo bitcoiny za účelom zakúpenia ďalších zariadení s Androidom pre vývoj a testovanie? Choďte na:</string>
   <string name="menu_help">Pomoc</string>
+  <string name="general">Všeobecné</string>
   <string name="addressbook_search_header">%s nájdených</string>
   <string name="addressbook_add_wizard_k_name">Názov</string>
   <string name="addressbook_add_wizard_k_destination">Cieľ</string>
@@ -174,6 +181,7 @@
   <string name="enable_dcc">Povoliť DCC</string>
   <string name="target_host">Cieľový host</string>
   <string name="target_port">Cieľový port</string>
+  <string name="use_ssl">Použiť SSL</string>
   <string name="tunnel_parameters">Parametre tunelov</string>
   <string name="profile">Profil</string>
   <string name="disabled">Zrušené</string>

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

@@ -23,7 +23,9 @@
   <string name="hidden">Fshehur</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <!--Character to indicate a client tunnel. Usually first letter of the word "client".-->
+  <string name="char_client_tunnel">C</string>
   <!--Character to indicate a server tunnel. Usually first letter of the word "server".-->
+  <string name="char_server_tunnel">S</string>
   <string name="download">Shkarkim</string>
   <string name="first_start_title">Urime që arritët ta instaloni I2P\'në!</string>
   <string name="first_start_welcome">&lt;b&gt;Mirë se vini në I2P!&lt;b&gt; Ju lutem &lt;b&gt;duroni&lt;b&gt; deri sa I2P të boot dhe tåe gjejë peers, </string>
@@ -48,6 +50,8 @@
   <string name="stats_not_ready">menaxheri i statistikave nuk është gati ende. Provoni përsëri më vone. </string>
   <string name="no_graphs_configured">Asnjë graf nuk është konfigururar. Mund të zgjedhni statistikat për graf në menynë e cilësimeve. Ndryshimet do të kenë efekt pas 60 sekondave.</string>
   <string name="configure_graphs">Konfiguro grafët</string>
+  <string name="country">Vendi</string>
+  <string name="version">Version</string>
   <string name="netdb_routers_empty">Nuk ka routerë në NetDB\'në tuaj. </string>
   <string name="netdb_leases_empty">Nuk ka LeaseSets në NetDB\'në tuaj.</string>
   <string name="notification_status_peers">Peers: %1$d aktivë, %2$d të njohur</string>
@@ -74,6 +78,7 @@
   <string name="settings_desc_upnp">Hapni portalet e firewall\'ëve automatikisht</string>
   <string name="settings_label_logging">Logimet</string>
   <string name="settings_label_default_log_level">Niveli i logimit mesatar</string>
+  <string name="settings_label_appearance">Paraqitja</string>
   <string name="settings_label_language">Gjuhë</string>
   <string name="settings_default">Parazgjedhje</string>
   <string name="settings_label_advanced">I/e avancuar</string>
@@ -174,6 +179,7 @@
   <string name="outproxies">Prokurët jashtësor</string>
   <string name="target_host">Host\'i i shënjuar</string>
   <string name="target_port">Portalja e shenjuar</string>
+  <string name="use_ssl">Përdorni SSL</string>
   <string name="tunnel_parameters">Parametrat e tunelëve</string>
   <string name="profile">Profil</string>
   <string name="disabled">E çaktivizuar</string>

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

@@ -4,7 +4,7 @@
     <string name="TUNNEL_TYPE" translatable="false">type</string>
     <string name="TUNNEL_NAME" translatable="false">name</string>
     <string name="TUNNEL_DESCRIPTION" translatable="false">description</string>
-    <string name="TUNNEL_USE_SSL" translatable="false">useSSL</string>
+    <!--<string name="TUNNEL_USE_SSL" translatable="false">useSSL</string>-->
     <string name="TUNNEL_START_ON_LOAD" translatable="false">startOnLoad</string>
     <string name="TUNNEL_PRIV_KEY_FILE" translatable="false">privKeyFile</string>
 

app/src/main/res/xml/tunnel_gen_client_port.xml

@@ -10,10 +10,12 @@
         android:key="@string/TUNNEL_LISTEN_PORT"
         android:title="@string/listen_port" />
 
+    <!--
+    # TODO: See trac issue #2296
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="@string/TUNNEL_USE_SSL"
         android:summary="@string/tunnel_summ_client_ssl"
-        android:title="@string/client_ssl" />
+        android:title="@string/client_ssl" />-->
 
 </PreferenceScreen>

app/src/main/res/xml/tunnel_gen_server_port.xml

@@ -9,10 +9,12 @@
         android:key="@string/TUNNEL_TARGET_PORT"
         android:title="@string/target_port" />
 
+    <!--
+    # TODO: See trac issue #2296
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="@string/TUNNEL_USE_SSL"
         android:summary="@string/tunnel_summ_use_ssl"
-        android:title="@string/use_ssl" />
+        android:title="@string/use_ssl" />-->
 
 </PreferenceScreen>

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.android.tools.lint:lint-gradle:26.1.1'
     }
 }

gradle.properties

@@ -13,6 +13,6 @@ POM_DEVELOPER_ID=str4d
 POM_DEVELOPER_NAME=str4d
 POM_DEVELOPER_EMAIL=str4d@i2pmail.org
 
-I2P_VERSION=0.9.36
-ANDROID_BUILD_TARGET_SDK_VERSION=25
-ANDROID_BUILD_SDK_VERSION=25
+I2P_VERSION=0.9.37
+ANDROID_BUILD_TARGET_SDK_VERSION=26
+ANDROID_BUILD_SDK_VERSION=26

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Nov 25 01:31:50 NZDT 2017
+#Tue Oct 09 23:18:43 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

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

@@ -3,7 +3,7 @@
   <string name="yes">Kyllä</string>
   <string name="no">Ei</string>
   <string name="install_i2p_android">Asennetaanko I2P Android?</string>
-  <string name="you_must_have_i2p_android">Sinulla on oltava I2P Android asennettuna ja käynnissä. Haluaisitko asentaa sen?</string>
+  <string name="you_must_have_i2p_android">I2P Androidin on oltava asennettu ja käynnissä. Haluatko asentaa sen?</string>
   <string name="start_i2p_android">Käynnistetäänkö I2P Android?</string>
-  <string name="would_you_like_to_start_i2p_android">Näyttää siltä, että I2P Android ei ole käynnissä. Haluaisitko käynnistää sen?</string>
+  <string name="would_you_like_to_start_i2p_android">Näyttää siltä, että I2P Android ei ole käynnissä. Haluatko käynnistää sen?</string>
 </resources>