Merge pull request #668 from SamWhited/auth-pinning

Auth mechanism pinning

1 files changed, 13 insertions, 61 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index d0ba3374..139f3657 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
@@ -36,67 +36,19 @@ public class AccountAdapter extends ArrayAdapter<Account> {
 		ImageView imageView = (ImageView) view.findViewById(R.id.account_image);
 		imageView.setImageBitmap(activity.avatarService().get(account,
 				activity.getPixel(48)));
-		switch (account.getStatus()) {
-		case Account.STATUS_DISABLED:
-			statusView.setText(getContext().getString(
-					R.string.account_status_disabled));
-			statusView.setTextColor(activity.getSecondaryTextColor());
-			break;
-		case Account.STATUS_ONLINE:
-			statusView.setText(getContext().getString(
-					R.string.account_status_online));
-			statusView.setTextColor(activity.getPrimaryColor());
-			break;
-		case Account.STATUS_CONNECTING:
-			statusView.setText(getContext().getString(
-					R.string.account_status_connecting));
-			statusView.setTextColor(activity.getSecondaryTextColor());
-			break;
-		case Account.STATUS_OFFLINE:
-			statusView.setText(getContext().getString(
-					R.string.account_status_offline));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_UNAUTHORIZED:
-			statusView.setText(getContext().getString(
-					R.string.account_status_unauthorized));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_SERVER_NOT_FOUND:
-			statusView.setText(getContext().getString(
-					R.string.account_status_not_found));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_NO_INTERNET:
-			statusView.setText(getContext().getString(
-					R.string.account_status_no_internet));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_REGISTRATION_FAILED:
-			statusView.setText(getContext().getString(
-					R.string.account_status_regis_fail));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_REGISTRATION_CONFLICT:
-			statusView.setText(getContext().getString(
-					R.string.account_status_regis_conflict));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_REGISTRATION_SUCCESSFULL:
-			statusView.setText(getContext().getString(
-					R.string.account_status_regis_success));
-			statusView.setTextColor(activity.getSecondaryTextColor());
-			break;
-		case Account.STATUS_REGISTRATION_NOT_SUPPORTED:
-			statusView.setText(getContext().getString(
-					R.string.account_status_regis_not_sup));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		default:
-			statusView.setText("");
-			break;
-		}
-
+        statusView.setText(getContext().getString(account.getStatus().getReadableId()));
+        switch (account.getStatus()) {
+            case ONLINE:
+                statusView.setTextColor(activity.getPrimaryColor());
+                break;
+            case DISABLED:
+            case CONNECTING:
+                statusView.setTextColor(activity.getSecondaryTextColor());
+                break;
+            default:
+                statusView.setTextColor(activity.getWarningTextColor());
+                break;
+        }
 		return view;
 	}
 }