iNPUTmice created
src/eu/siacs/conversations/entities/Account.java | 1 -
src/eu/siacs/conversations/ui/ManageAccountActivity.java | 8 +-------
src/eu/siacs/conversations/xmpp/XmppConnection.java | 4 +---
3 files changed, 2 insertions(+), 11 deletions(-)
@@ -40,7 +40,6 @@ public class Account extends AbstractEntity{
public static final int STATUS_ONLINE = 1;
public static final int STATUS_NO_INTERNET = 2;
public static final int STATUS_UNAUTHORIZED = 3;
- public static final int STATUS_TLS_ERROR = 4;
public static final int STATUS_SERVER_NOT_FOUND = 5;
public static final int STATUS_SERVER_REQUIRES_TLS = 6;
@@ -121,11 +121,6 @@ public class ManageAccountActivity extends XmppActivity {
.setText(getString(R.string.account_status_requires_tls));
statusView.setTextColor(0xFFe92727);
break;
- case Account.STATUS_TLS_ERROR:
- statusView
- .setText(getString(R.string.account_status_error));
- statusView.setTextColor(0xFFe92727);
- break;
case Account.STATUS_REGISTRATION_FAILED:
statusView
.setText(getString(R.string.account_status_regis_fail));
@@ -163,8 +158,7 @@ public class ManageAccountActivity extends XmppActivity {
int position, long arg3) {
if (!isActionMode) {
Account account = accountList.get(position);
- if ((account.getStatus() == Account.STATUS_OFFLINE)
- || (account.getStatus() == Account.STATUS_TLS_ERROR)) {
+ if (account.getStatus() == Account.STATUS_OFFLINE) {
activity.xmppConnectionService.reconnectAccount(
accountList.get(position), true);
} else if (account.getStatus() == Account.STATUS_ONLINE) {
@@ -192,9 +192,7 @@ public class XmppConnection implements Runnable {
}
return;
} catch (IOException e) {
- if (account.getStatus() != Account.STATUS_TLS_ERROR) {
- this.changeStatus(Account.STATUS_OFFLINE);
- }
+ this.changeStatus(Account.STATUS_OFFLINE);
if (wakeLock.isHeld()) {
try { wakeLock.release();} catch (RuntimeException re) {}
}