From 9586d6b9b8193d3b7d990578eb97fab35c3e11eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 17 Sep 2014 23:06:49 +0200 Subject: Use key icons in spinners --- .../keychain/ui/widget/SignKeySpinner.java | 31 +++++++++++++--------- 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java index 648fcd4eb..ce1f7bb44 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java @@ -24,9 +24,11 @@ import android.os.Bundle; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; import android.util.AttributeSet; +import android.widget.ImageView; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.provider.KeychainContract; +import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; public class SignKeySpinner extends KeySpinner { public SignKeySpinner(Context context) { @@ -69,25 +71,30 @@ public class SignKeySpinner extends KeySpinner { private int mIndexHasSign, mIndexIsRevoked, mIndexIsExpired; @Override - public void onLoadFinished(Loader loader, Cursor cursor) { - super.onLoadFinished(loader, cursor); - mIndexHasSign = cursor.getColumnIndex(KeychainContract.KeyRings.HAS_SIGN); - mIndexIsRevoked = cursor.getColumnIndex(KeychainContract.KeyRings.IS_REVOKED); - mIndexIsExpired = cursor.getColumnIndex(KeychainContract.KeyRings.IS_EXPIRED); + public void onLoadFinished(Loader loader, Cursor data) { + super.onLoadFinished(loader, data); + mIndexHasSign = data.getColumnIndex(KeychainContract.KeyRings.HAS_SIGN); + mIndexIsRevoked = data.getColumnIndex(KeychainContract.KeyRings.IS_REVOKED); + mIndexIsExpired = data.getColumnIndex(KeychainContract.KeyRings.IS_EXPIRED); } @Override - String getStatus(Context context, Cursor cursor) { + boolean setStatus(Context context, Cursor cursor, ImageView statusView) { if (cursor.getInt(mIndexIsRevoked) != 0) { - return context.getString(R.string.revoked); - } - if (cursor.getInt(mIndexHasSign) == 0) { - return context.getString(R.string.key_unavailable); + KeyFormattingUtils.setStatusImage(getContext(), statusView, KeyFormattingUtils.STATE_REVOKED); + return false; } if (cursor.getInt(mIndexIsExpired) != 0) { - return context.getString(R.string.expired); + KeyFormattingUtils.setStatusImage(getContext(), statusView, KeyFormattingUtils.STATE_EXPIRED); + return false; } - return null; + if (cursor.getInt(mIndexHasSign) == 0) { + KeyFormattingUtils.setStatusImage(getContext(), statusView, KeyFormattingUtils.STATE_UNAVAILABLE); + return false; + } + + // valid key + return true; } } -- cgit v1.2.3