#1042 replaced some int constants with enums

Created enum FragAction in CreateKeyActivity.java and enum State in
KeyFormattingUtils.java and replaced int constants with them

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java

@@ -28,9 +28,11 @@ public class CreateKeyActivity extends BaseActivity {
     public static final String EXTRA_NAME = "name";
     public static final String EXTRA_EMAIL = "email";
 
-    public static final int FRAG_ACTION_START = 0;
+    public static enum FragAction {
-    public static final int FRAG_ACTION_TO_RIGHT = 1;
+        START,
-    public static final int FRAG_ACTION_TO_LEFT = 2;
+        TO_RIGHT,
+        TO_LEFT
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -42,7 +44,7 @@ public class CreateKeyActivity extends BaseActivity {
                         getIntent().getStringExtra(EXTRA_NAME),
                         getIntent().getStringExtra(EXTRA_EMAIL)
                 );
-        loadFragment(null, frag, FRAG_ACTION_START);
+        loadFragment(null, frag, FragAction.START);
     }
 
     @Override
@@ -50,7 +52,7 @@ public class CreateKeyActivity extends BaseActivity {
         setContentView(R.layout.create_key_activity);
     }
 
-    public void loadFragment(Bundle savedInstanceState, Fragment fragment, int action) {
+    public void loadFragment(Bundle savedInstanceState, Fragment fragment, FragAction action) {
         // However, if we're being restored from a previous state,
         // then we don't need to do anything and should return or else
         // we could end up with overlapping fragments.
@@ -63,15 +65,15 @@ public class CreateKeyActivity extends BaseActivity {
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
         switch (action) {
-            case FRAG_ACTION_START:
+            case START:
                 transaction.setCustomAnimations(0, 0);
                 transaction.replace(R.id.create_key_fragment_container, fragment)
                         .commitAllowingStateLoss();
                 break;
-            case FRAG_ACTION_TO_LEFT:
+            case TO_LEFT:
                 getSupportFragmentManager().popBackStackImmediate();
                 break;
-            case FRAG_ACTION_TO_RIGHT:
+            case TO_RIGHT:
                 transaction.setCustomAnimations(R.anim.frag_slide_in_from_right, R.anim.frag_slide_out_to_left,
                         R.anim.frag_slide_in_from_left, R.anim.frag_slide_out_to_right);
                 transaction.addToBackStack(null);

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java

@@ -43,6 +43,7 @@ import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel;
+import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.Preferences;
 
@@ -117,7 +118,7 @@ public class CreateKeyFinalFragment extends Fragment {
         mBackButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mCreateKeyActivity.loadFragment(null, null, CreateKeyActivity.FRAG_ACTION_TO_LEFT);
+                mCreateKeyActivity.loadFragment(null, null, FragAction.TO_LEFT);
             }
         });
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java

@@ -32,6 +32,7 @@ import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
 import org.sufficientlysecure.keychain.util.ContactHelper;
 
 import java.util.regex.Matcher;
@@ -161,7 +162,7 @@ public class CreateKeyInputFragment extends Fragment {
                     );
 
             hideKeyboard();
-            mCreateKeyActivity.loadFragment(null, frag, CreateKeyActivity.FRAG_ACTION_TO_RIGHT);
+            mCreateKeyActivity.loadFragment(null, frag, FragAction.TO_RIGHT);
         }
     }
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java

@@ -31,6 +31,7 @@ import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 
 public abstract class DecryptFragment extends Fragment {
     private static final int RESULT_CODE_LOOKUP_KEY = 0x00007006;
@@ -141,16 +142,16 @@ public abstract class DecryptFragment extends Fragment {
 
             if (signatureResult.isSignatureOnly()) {
                 mEncryptionText.setText(R.string.decrypt_result_not_encrypted);
-                KeyFormattingUtils.setStatusImage(getActivity(), mEncryptionIcon, mEncryptionText, KeyFormattingUtils.STATE_NOT_ENCRYPTED);
+                KeyFormattingUtils.setStatusImage(getActivity(), mEncryptionIcon, mEncryptionText, State.NOT_ENCRYPTED);
             } else {
                 mEncryptionText.setText(R.string.decrypt_result_encrypted);
-                KeyFormattingUtils.setStatusImage(getActivity(), mEncryptionIcon, mEncryptionText, KeyFormattingUtils.STATE_ENCRYPTED);
+                KeyFormattingUtils.setStatusImage(getActivity(), mEncryptionIcon, mEncryptionText, State.ENCRYPTED);
             }
 
             switch (signatureResult.getStatus()) {
                 case OpenPgpSignatureResult.SIGNATURE_SUCCESS_CERTIFIED: {
                     mSignatureText.setText(R.string.decrypt_result_signature_certified);
-                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_VERIFIED);
+                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.VERIFIED);
 
                     setSignatureLayoutVisibility(View.VISIBLE);
                     setShowAction(mSignatureKeyId);
@@ -161,7 +162,7 @@ public abstract class DecryptFragment extends Fragment {
 
                 case OpenPgpSignatureResult.SIGNATURE_SUCCESS_UNCERTIFIED: {
                     mSignatureText.setText(R.string.decrypt_result_signature_uncertified);
-                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_UNVERIFIED);
+                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.UNVERIFIED);
 
                     setSignatureLayoutVisibility(View.VISIBLE);
                     setShowAction(mSignatureKeyId);
@@ -172,7 +173,7 @@ public abstract class DecryptFragment extends Fragment {
 
                 case OpenPgpSignatureResult.SIGNATURE_KEY_MISSING: {
                     mSignatureText.setText(R.string.decrypt_result_signature_missing_key);
-                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_UNKNOWN_KEY);
+                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.UNKNOWN_KEY);
 
                     setSignatureLayoutVisibility(View.VISIBLE);
                     mSignatureAction.setText(R.string.decrypt_result_action_Lookup);
@@ -190,7 +191,7 @@ public abstract class DecryptFragment extends Fragment {
 
                 case OpenPgpSignatureResult.SIGNATURE_KEY_EXPIRED: {
                     mSignatureText.setText(R.string.decrypt_result_signature_expired_key);
-                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_EXPIRED);
+                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.EXPIRED);
 
                     setSignatureLayoutVisibility(View.VISIBLE);
                     setShowAction(mSignatureKeyId);
@@ -201,7 +202,7 @@ public abstract class DecryptFragment extends Fragment {
 
                 case OpenPgpSignatureResult.SIGNATURE_KEY_REVOKED: {
                     mSignatureText.setText(R.string.decrypt_result_signature_revoked_key);
-                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_REVOKED);
+                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.REVOKED);
 
                     setSignatureLayoutVisibility(View.VISIBLE);
                     setShowAction(mSignatureKeyId);
@@ -212,7 +213,7 @@ public abstract class DecryptFragment extends Fragment {
 
                 case OpenPgpSignatureResult.SIGNATURE_ERROR: {
                     mSignatureText.setText(R.string.decrypt_result_invalid_signature);
-                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_INVALID);
+                    KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.INVALID);
 
                     setSignatureLayoutVisibility(View.GONE);
 
@@ -224,9 +225,9 @@ public abstract class DecryptFragment extends Fragment {
             setSignatureLayoutVisibility(View.GONE);
 
             mSignatureText.setText(R.string.decrypt_result_no_signature);
-            KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_NOT_SIGNED);
+            KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, State.NOT_SIGNED);
             mEncryptionText.setText(R.string.decrypt_result_encrypted);
-            KeyFormattingUtils.setStatusImage(getActivity(), mEncryptionIcon, mEncryptionText, KeyFormattingUtils.STATE_ENCRYPTED);
+            KeyFormattingUtils.setStatusImage(getActivity(), mEncryptionIcon, mEncryptionText, State.ENCRYPTED);
 
             valid = true;
         }

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java

@@ -70,6 +70,7 @@ import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
 import org.sufficientlysecure.keychain.ui.util.Highlighter;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.util.ExportHelper;
 import org.sufficientlysecure.keychain.util.FabContainer;
@@ -716,13 +717,13 @@ public class KeyListFragment extends LoaderFragment
 
                 // Note: order is important!
                 if (isRevoked) {
-                    KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, null, KeyFormattingUtils.STATE_REVOKED, R.color.bg_gray);
+                    KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, null, State.REVOKED, R.color.bg_gray);
                     h.mStatus.setVisibility(View.VISIBLE);
                     h.mSlinger.setVisibility(View.GONE);
                     h.mMainUserId.setTextColor(context.getResources().getColor(R.color.bg_gray));
                     h.mMainUserIdRest.setTextColor(context.getResources().getColor(R.color.bg_gray));
                 } else if (isExpired) {
-                    KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, null, KeyFormattingUtils.STATE_EXPIRED, R.color.bg_gray);
+                    KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, null, State.EXPIRED, R.color.bg_gray);
                     h.mStatus.setVisibility(View.VISIBLE);
                     h.mSlinger.setVisibility(View.GONE);
                     h.mMainUserId.setTextColor(context.getResources().getColor(R.color.bg_gray));
@@ -735,10 +736,10 @@ public class KeyListFragment extends LoaderFragment
                 } else {
                     // this is a public key - show if it's verified
                     if (isVerified) {
-                        KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, KeyFormattingUtils.STATE_VERIFIED);
+                        KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, State.VERIFIED);
                         h.mStatus.setVisibility(View.VISIBLE);
                     } else {
-                        KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, KeyFormattingUtils.STATE_UNVERIFIED);
+                        KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, State.UNVERIFIED);
                         h.mStatus.setVisibility(View.VISIBLE);
                     }
                     h.mSlinger.setVisibility(View.GONE);

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java

@@ -46,6 +46,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
 import org.sufficientlysecure.keychain.ui.adapter.SelectKeyCursorAdapter;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 
 import java.util.Vector;
 
@@ -376,15 +377,15 @@ public class SelectPublicKeyFragment extends ListFragmentWorkaround implements T
                 // Check if key is viable for our purposes
                 if (cursor.getInt(mIndexHasEncrypt) == 0) {
                     h.statusIcon.setVisibility(View.VISIBLE);
-                    KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, KeyFormattingUtils.STATE_UNAVAILABLE);
+                    KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, State.UNAVAILABLE);
                     enabled = false;
                 } else if (cursor.getInt(mIndexIsVerified) != 0) {
                     h.statusIcon.setVisibility(View.VISIBLE);
-                    KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, KeyFormattingUtils.STATE_VERIFIED);
+                    KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, State.VERIFIED);
                     enabled = true;
                 } else {
                     h.statusIcon.setVisibility(View.VISIBLE);
-                    KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, KeyFormattingUtils.STATE_UNVERIFIED);
+                    KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, State.UNVERIFIED);
                     enabled = true;
                 }
             }

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

@@ -74,6 +74,7 @@ import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.ui.util.QrCodeUtils;
 import org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView;
@@ -839,7 +840,7 @@ public class ViewKeyActivity extends BaseActivity implements
                         mStatusText.setText(R.string.view_key_revoked);
                         mStatusImage.setVisibility(View.VISIBLE);
                         KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
-                                KeyFormattingUtils.STATE_REVOKED, R.color.icons, true);
+                                State.REVOKED, R.color.icons, true);
                         color = getResources().getColor(R.color.android_red_light);
 
                         mActionEncryptFile.setVisibility(View.GONE);
@@ -855,7 +856,7 @@ public class ViewKeyActivity extends BaseActivity implements
                         }
                         mStatusImage.setVisibility(View.VISIBLE);
                         KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
-                                KeyFormattingUtils.STATE_EXPIRED, R.color.icons, true);
+                                State.EXPIRED, R.color.icons, true);
                         color = getResources().getColor(R.color.android_red_light);
 
                         mActionEncryptFile.setVisibility(View.GONE);
@@ -915,7 +916,7 @@ public class ViewKeyActivity extends BaseActivity implements
                             mStatusText.setText(R.string.view_key_verified);
                             mStatusImage.setVisibility(View.VISIBLE);
                             KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
-                                    KeyFormattingUtils.STATE_VERIFIED, R.color.icons, true);
+                                    State.VERIFIED, R.color.icons, true);
                             color = getResources().getColor(R.color.primary);
                             photoTask.execute(mFingerprint);
 
@@ -924,7 +925,7 @@ public class ViewKeyActivity extends BaseActivity implements
                             mStatusText.setText(R.string.view_key_unverified);
                             mStatusImage.setVisibility(View.VISIBLE);
                             KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
-                                    KeyFormattingUtils.STATE_UNVERIFIED, R.color.icons, true);
+                                    State.UNVERIFIED, R.color.icons, true);
                             color = getResources().getColor(R.color.android_orange_light);
 
                             mFab.setVisibility(View.VISIBLE);

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java

@@ -37,6 +37,7 @@ import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.Highlighter;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -175,9 +176,9 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
         }
 
         if (entry.isRevoked()) {
-            KeyFormattingUtils.setStatusImage(getContext(), holder.status, null, KeyFormattingUtils.STATE_REVOKED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), holder.status, null, State.REVOKED, R.color.bg_gray);
         } else if (entry.isExpired()) {
-            KeyFormattingUtils.setStatusImage(getContext(), holder.status, null, KeyFormattingUtils.STATE_EXPIRED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), holder.status, null, State.EXPIRED, R.color.bg_gray);
         }
 
         if (entry.isRevoked() || entry.isExpired()) {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java

@@ -33,6 +33,7 @@ import org.sufficientlysecure.keychain.pgp.KeyRing;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.ui.util.Highlighter;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 
 
 /**
@@ -133,11 +134,11 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter {
         boolean enabled;
         if (cursor.getInt(mIndexIsRevoked) != 0) {
             h.statusIcon.setVisibility(View.VISIBLE);
-            KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, null, KeyFormattingUtils.STATE_REVOKED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, null, State.REVOKED, R.color.bg_gray);
             enabled = false;
         } else if (cursor.getInt(mIndexIsExpiry) != 0) {
             h.statusIcon.setVisibility(View.VISIBLE);
-            KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, null, KeyFormattingUtils.STATE_EXPIRED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(mContext, h.statusIcon, null, State.EXPIRED, R.color.bg_gray);
             enabled = false;
         } else {
             h.statusIcon.setVisibility(View.GONE);

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java

@@ -36,6 +36,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 
 public class UserIdsAdapter extends UserAttributesAdapter {
     protected LayoutInflater mInflater;
@@ -127,7 +128,7 @@ public class UserIdsAdapter extends UserAttributesAdapter {
 
         if (isRevoked) {
             // set revocation icon (can this even be primary?)
-            KeyFormattingUtils.setStatusImage(mContext, vVerified, null, KeyFormattingUtils.STATE_REVOKED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(mContext, vVerified, null, State.REVOKED, R.color.bg_gray);
 
             // disable revoked user ids
             vName.setEnabled(false);
@@ -149,13 +150,13 @@ public class UserIdsAdapter extends UserAttributesAdapter {
             int isVerified = cursor.getInt(INDEX_VERIFIED);
             switch (isVerified) {
                 case Certs.VERIFIED_SECRET:
-                    KeyFormattingUtils.setStatusImage(mContext, vVerified, null, KeyFormattingUtils.STATE_VERIFIED, KeyFormattingUtils.DEFAULT_COLOR);
+                    KeyFormattingUtils.setStatusImage(mContext, vVerified, null, State.VERIFIED, KeyFormattingUtils.DEFAULT_COLOR);
                     break;
                 case Certs.VERIFIED_SELF:
-                    KeyFormattingUtils.setStatusImage(mContext, vVerified, null, KeyFormattingUtils.STATE_UNVERIFIED, KeyFormattingUtils.DEFAULT_COLOR);
+                    KeyFormattingUtils.setStatusImage(mContext, vVerified, null, State.UNVERIFIED, KeyFormattingUtils.DEFAULT_COLOR);
                     break;
                 default:
-                    KeyFormattingUtils.setStatusImage(mContext, vVerified, null, KeyFormattingUtils.STATE_INVALID, KeyFormattingUtils.DEFAULT_COLOR);
+                    KeyFormattingUtils.setStatusImage(mContext, vVerified, null, State.INVALID, KeyFormattingUtils.DEFAULT_COLOR);
                     break;
             }
         }

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java

@@ -379,27 +379,29 @@ public class KeyFormattingUtils {
 
     public static final int DEFAULT_COLOR = -1;
 
-    public static final int STATE_REVOKED = 1;
+    public static enum State {
-    public static final int STATE_EXPIRED = 2;
+        REVOKED,
-    public static final int STATE_VERIFIED = 3;
+        EXPIRED,
-    public static final int STATE_UNAVAILABLE = 4;
+        VERIFIED,
-    public static final int STATE_ENCRYPTED = 5;
+        UNAVAILABLE,
-    public static final int STATE_NOT_ENCRYPTED = 6;
+        ENCRYPTED,
-    public static final int STATE_UNVERIFIED = 7;
+        NOT_ENCRYPTED,
-    public static final int STATE_UNKNOWN_KEY = 8;
+        UNVERIFIED,
-    public static final int STATE_INVALID = 9;
+        UNKNOWN_KEY,
-    public static final int STATE_NOT_SIGNED = 10;
+        INVALID,
+        NOT_SIGNED
+    }
 
-    public static void setStatusImage(Context context, ImageView statusIcon, int state) {
+    public static void setStatusImage(Context context, ImageView statusIcon, State state) {
         setStatusImage(context, statusIcon, null, state);
     }
 
-    public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText, int state) {
+    public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText, State state) {
         setStatusImage(context, statusIcon, statusText, state, KeyFormattingUtils.DEFAULT_COLOR, false);
     }
 
     public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText,
-                                      int state, int color) {
+                                      State state, int color) {
         setStatusImage(context, statusIcon, statusText, state, color, false);
     }
 
@@ -407,10 +409,10 @@ public class KeyFormattingUtils {
      * Sets status image based on constant
      */
     public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText,
-                                      int state, int color, boolean big) {
+                                      State state, int color, boolean big) {
         switch (state) {
             /** GREEN: everything is good **/
-            case STATE_VERIFIED: {
+            case VERIFIED: {
                 if (big) {
                     statusIcon.setImageDrawable(
                             context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_96px));
@@ -428,7 +430,7 @@ public class KeyFormattingUtils {
                 }
                 break;
             }
-            case STATE_ENCRYPTED: {
+            case ENCRYPTED: {
                 statusIcon.setImageDrawable(
                         context.getResources().getDrawable(R.drawable.status_lock_closed_24px));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
@@ -442,7 +444,7 @@ public class KeyFormattingUtils {
                 break;
             }
             /** ORANGE: mostly bad... **/
-            case STATE_UNVERIFIED: {
+            case UNVERIFIED: {
                 if (big) {
                     statusIcon.setImageDrawable(
                             context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_96px));
@@ -460,7 +462,7 @@ public class KeyFormattingUtils {
                 }
                 break;
             }
-            case STATE_UNKNOWN_KEY: {
+            case UNKNOWN_KEY: {
                 statusIcon.setImageDrawable(
                         context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
@@ -474,7 +476,7 @@ public class KeyFormattingUtils {
                 break;
             }
             /** RED: really bad... **/
-            case STATE_REVOKED: {
+            case REVOKED: {
                 if (big) {
                     statusIcon.setImageDrawable(
                             context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_96px));
@@ -492,7 +494,7 @@ public class KeyFormattingUtils {
                 }
                 break;
             }
-            case STATE_EXPIRED: {
+            case EXPIRED: {
                 if (big) {
                     statusIcon.setImageDrawable(
                             context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_96px));
@@ -510,7 +512,7 @@ public class KeyFormattingUtils {
                 }
                 break;
             }
-            case STATE_NOT_ENCRYPTED: {
+            case NOT_ENCRYPTED: {
                 statusIcon.setImageDrawable(
                         context.getResources().getDrawable(R.drawable.status_lock_open_24px));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
@@ -523,7 +525,7 @@ public class KeyFormattingUtils {
                 }
                 break;
             }
-            case STATE_NOT_SIGNED: {
+            case NOT_SIGNED: {
                 statusIcon.setImageDrawable(
                         context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
@@ -536,7 +538,7 @@ public class KeyFormattingUtils {
                 }
                 break;
             }
-            case STATE_INVALID: {
+            case INVALID: {
                 statusIcon.setImageDrawable(
                         context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {
@@ -550,7 +552,7 @@ public class KeyFormattingUtils {
                 break;
             }
             /** special **/
-            case STATE_UNAVAILABLE: {
+            case UNAVAILABLE: {
                 statusIcon.setImageDrawable(
                         context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px));
                 if (color == KeyFormattingUtils.DEFAULT_COLOR) {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java

@@ -31,6 +31,7 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 
 public class CertifyKeySpinner extends KeySpinner {
     private long mHiddenMasterKeyId = Constants.key.none;
@@ -103,16 +104,16 @@ public class CertifyKeySpinner extends KeySpinner {
     @Override
     boolean setStatus(Context context, Cursor cursor, ImageView statusView) {
         if (cursor.getInt(mIndexIsRevoked) != 0) {
-            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, KeyFormattingUtils.STATE_REVOKED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, State.REVOKED, R.color.bg_gray);
             return false;
         }
         if (cursor.getInt(mIndexIsExpired) != 0) {
-            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, KeyFormattingUtils.STATE_EXPIRED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, State.EXPIRED, R.color.bg_gray);
             return false;
         }
         // don't invalidate the "None" entry, which is also null!
         if (cursor.getPosition() != 0 && cursor.isNull(mIndexHasCertify)) {
-            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, KeyFormattingUtils.STATE_UNAVAILABLE, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, State.UNAVAILABLE, R.color.bg_gray);
             return false;
         }
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java

@@ -29,6 +29,7 @@ import android.widget.ImageView;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 
 public class SignKeySpinner extends KeySpinner {
     public SignKeySpinner(Context context) {
@@ -84,15 +85,15 @@ public class SignKeySpinner extends KeySpinner {
     @Override
     boolean setStatus(Context context, Cursor cursor, ImageView statusView) {
         if (cursor.getInt(mIndexIsRevoked) != 0) {
-            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, KeyFormattingUtils.STATE_REVOKED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, State.REVOKED, R.color.bg_gray);
             return false;
         }
         if (cursor.getInt(mIndexIsExpired) != 0) {
-            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, KeyFormattingUtils.STATE_EXPIRED, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, State.EXPIRED, R.color.bg_gray);
             return false;
         }
         if (cursor.getInt(mIndexHasSign) == 0) {
-            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, KeyFormattingUtils.STATE_UNAVAILABLE, R.color.bg_gray);
+            KeyFormattingUtils.setStatusImage(getContext(), statusView, null, State.UNAVAILABLE, R.color.bg_gray);
             return false;
         }