fix error message for unavailable I2P server

Signed-off-by: R4SAS <[email protected]>

Author: r4sas

Diff for: src/main/java/eu/siacs/conversations/entities/Account.java

@@ -801,6 +801,7 @@ public enum State {
         INCOMPATIBLE_SERVER,
         INCOMPATIBLE_CLIENT,
         TOR_NOT_AVAILABLE,
+        I2P_NOT_AVAILABLE,
         DOWNGRADE_ATTACK,
         SESSION_FAILURE,
         BIND_FAILURE,
@@ -876,6 +877,8 @@ public int getReadableId() {
                     return R.string.account_status_incompatible_client;
                 case TOR_NOT_AVAILABLE:
                     return R.string.account_status_tor_unavailable;
+                case I2P_NOT_AVAILABLE:
+                    return R.string.account_status_i2p_unavailable;
                 case BIND_FAILURE:
                     return R.string.account_status_bind_failure;
                 case SESSION_FAILURE:

Diff for: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -941,7 +941,7 @@ private synchronized void manageAccountConnectionStates(final String action, fin
 
     private void handleOrbotStartedEvent() {
         for (final Account account : accounts) {
-            if (account.getStatus() == Account.State.TOR_NOT_AVAILABLE) {
+            if (account.getStatus() == Account.State.TOR_NOT_AVAILABLE || account.getStatus() == Account.State.I2P_NOT_AVAILABLE) {
                 reconnectAccount(account, true, false);
             }
         }

Diff for: src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java

@@ -175,6 +175,7 @@ public void onClick(final View v) {
 
             XmppConnection connection = mAccount == null ? null : mAccount.getXmppConnection();
             final boolean startOrbot = mAccount != null && mAccount.getStatus() == Account.State.TOR_NOT_AVAILABLE;
+            final boolean startI2P = mAccount != null && mAccount.getStatus() == Account.State.I2P_NOT_AVAILABLE;
             if (startOrbot) {
                 if (TorServiceUtils.isOrbotInstalled(EditAccountActivity.this)) {
                     TorServiceUtils.startOrbot(EditAccountActivity.this, REQUEST_ORBOT);
@@ -184,6 +185,10 @@ public void onClick(final View v) {
                 return;
             }
 
+            if (startI2P) {
+                return; // just exit
+            }
+
             if (inNeedOfSaslAccept()) {
                 mAccount.resetPinnedMechanism();
                 if (!xmppConnectionService.updateAccount(mAccount)) {

Diff for: src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java

@@ -510,7 +510,11 @@ protected void connect() {
                 | SocksSocketFactory.HostNotFoundException e) {
             this.changeStatus(Account.State.SERVER_NOT_FOUND);
         } catch (final SocksSocketFactory.SocksProxyNotFoundException e) {
-            this.changeStatus(Account.State.TOR_NOT_AVAILABLE);
+            if (!account.isI2P()) {
+                this.changeStatus(Account.State.TOR_NOT_AVAILABLE);
+            } else {
+                this.changeStatus(Account.State.I2P_NOT_AVAILABLE);
+            }
         } catch (final IOException | XmlPullParserException e) {
             Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": " + e.getMessage());
             this.changeStatus(Account.State.OFFLINE);

Diff for: src/main/res/values-ru/strings.xml

@@ -462,6 +462,7 @@
     <string name="download_failed_could_not_connect">Загрузка не удалась: не удалось подключиться к серверу</string>
     <string name="download_failed_could_not_write_file">Загрузка не удалась: ошибка записи файла</string>
     <string name="account_status_tor_unavailable">Сеть Tor недоступна</string>
+    <string name="account_status_i2p_unavailable">Сеть I2P недоступна</string>
     <string name="account_status_bind_failure">Ошибка связывания</string>
     <string name="account_status_host_unknown">Сервер не ответственен за этот домен</string>
     <string name="server_info_broken">Повреждено</string>

Diff for: src/main/res/values/strings.xml

@@ -470,6 +470,7 @@
     <string name="download_failed_could_not_write_file">Download failed: Could not write file</string>
     <string name="download_failed_invalid_file">Download failed: Invalid file</string>
     <string name="account_status_tor_unavailable">Tor network unavailable</string>
+    <string name="account_status_i2p_unavailable">I2P network unavailable</string>
     <string name="account_status_bind_failure">Bind failure</string>
     <string name="account_status_host_unknown">The server is not responsible for this domain</string>
     <string name="server_info_broken">Broken</string>