diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 23:19:21 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 23:19:21 +0200 |
commit | db7da6525ee12af54002f7edf6574b0b49f17b41 (patch) | |
tree | 79e7995a5076dd2ecf2c398308025161f35eb662 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter | |
parent | f50c0e1905f699e929d5f4962d700214aff4c684 (diff) | |
download | open-keychain-db7da6525ee12af54002f7edf6574b0b49f17b41.tar.gz open-keychain-db7da6525ee12af54002f7edf6574b0b49f17b41.tar.bz2 open-keychain-db7da6525ee12af54002f7edf6574b0b49f17b41.zip |
Fix custom key configuration for primary user ids
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter')
2 files changed, 18 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java index 6d4613aee..9f5d5341e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java @@ -42,11 +42,14 @@ import java.util.TimeZone; public class SubkeysAddedAdapter extends ArrayAdapter<SaveKeyringParcel.SubkeyAdd> { private LayoutInflater mInflater; private Activity mActivity; + private boolean mNewKeyring; - public SubkeysAddedAdapter(Activity activity, List<SaveKeyringParcel.SubkeyAdd> data) { + public SubkeysAddedAdapter(Activity activity, List<SaveKeyringParcel.SubkeyAdd> data, + boolean newKeyring) { super(activity, -1, data); mActivity = activity; mInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + mNewKeyring = newKeyring; } static class ViewHolder { @@ -107,7 +110,7 @@ public class SubkeysAddedAdapter extends ArrayAdapter<SaveKeyringParcel.SubkeyAd holder.mModel.mCurve ); - boolean isMasterKey = position == 0; + boolean isMasterKey = mNewKeyring && position == 0; if (isMasterKey) { holder.vKeyId.setTypeface(null, Typeface.BOLD); } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java index 15ac11e0b..4c0e7a492 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java @@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.ui.adapter; import android.app.Activity; import android.content.Context; +import android.graphics.Typeface; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -35,14 +36,16 @@ import java.util.List; public class UserIdsAddedAdapter extends ArrayAdapter<String> { private LayoutInflater mInflater; + private boolean mNewKeyring; // hold a private reference to the underlying data List private List<String> mData; - public UserIdsAddedAdapter(Activity activity, List<String> data) { + public UserIdsAddedAdapter(Activity activity, List<String> data, boolean newKeyring) { super(activity, -1, data); mInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mData = data; + mNewKeyring = newKeyring; } public List<String> getData() { @@ -111,6 +114,15 @@ public class UserIdsAddedAdapter extends ArrayAdapter<String> { holder.vComment.setVisibility(View.GONE); } + boolean isPrimary = mNewKeyring && position == 0; + if (isPrimary) { + holder.vName.setTypeface(null, Typeface.BOLD); + holder.vAddress.setTypeface(null, Typeface.BOLD); + } else { + holder.vName.setTypeface(null, Typeface.NORMAL); + holder.vAddress.setTypeface(null, Typeface.NORMAL); + } + return convertView; } |