diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-16 16:24:34 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-16 16:24:34 +0100 |
commit | aa22a0defcf94d5f734d3a00288f5c8d916d2e57 (patch) | |
tree | 0ff46adfb84ca35334a38bb31b2c71ed04d24bde /OpenKeychain | |
parent | 6c153b15430c00b5213062be4bb5830d52f2589a (diff) | |
download | open-keychain-aa22a0defcf94d5f734d3a00288f5c8d916d2e57.tar.gz open-keychain-aa22a0defcf94d5f734d3a00288f5c8d916d2e57.tar.bz2 open-keychain-aa22a0defcf94d5f734d3a00288f5c8d916d2e57.zip |
small language fix
Diffstat (limited to 'OpenKeychain')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java) | 30 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
2 files changed, 19 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java index a778c7fa7..7b8670f22 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java @@ -39,28 +39,32 @@ import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import java.util.ArrayList; -public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemClickListener { +public class UserAttributesAdapter extends CursorAdapter implements AdapterView.OnItemClickListener { private LayoutInflater mInflater; private final ArrayList<Boolean> mCheckStates; private SaveKeyringParcel mSaveKeyringParcel; - public static final String[] USER_IDS_PROJECTION = new String[]{ + public static final String[] USER_PACKETS_PROJECTION = new String[]{ UserPackets._ID, + UserPackets.TYPE, UserPackets.USER_ID, + UserPackets.ATTRIBUTE_DATA, UserPackets.RANK, UserPackets.VERIFIED, UserPackets.IS_PRIMARY, UserPackets.IS_REVOKED }; private static final int INDEX_ID = 0; - private static final int INDEX_USER_ID = 1; - private static final int INDEX_RANK = 2; - private static final int INDEX_VERIFIED = 3; - private static final int INDEX_IS_PRIMARY = 4; - private static final int INDEX_IS_REVOKED = 5; - - public UserIdsAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes, - SaveKeyringParcel saveKeyringParcel) { + private static final int INDEX_TYPE = 1; + private static final int INDEX_USER_ID = 2; + private static final int INDEX_ATTRIBUTE_DATA = 3; + private static final int INDEX_RANK = 4; + private static final int INDEX_VERIFIED = 5; + private static final int INDEX_IS_PRIMARY = 6; + private static final int INDEX_IS_REVOKED = 7; + + public UserAttributesAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes, + SaveKeyringParcel saveKeyringParcel) { super(context, c, flags); mInflater = LayoutInflater.from(context); @@ -68,15 +72,15 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC mSaveKeyringParcel = saveKeyringParcel; } - public UserIdsAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes) { + public UserAttributesAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes) { this(context, c, flags, showCheckBoxes, null); } - public UserIdsAdapter(Context context, Cursor c, int flags, SaveKeyringParcel saveKeyringParcel) { + public UserAttributesAdapter(Context context, Cursor c, int flags, SaveKeyringParcel saveKeyringParcel) { this(context, c, flags, false, saveKeyringParcel); } - public UserIdsAdapter(Context context, Cursor c, int flags) { + public UserAttributesAdapter(Context context, Cursor c, int flags) { this(context, c, flags, false, null); } diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d989b1a47..5eba28921 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -403,11 +403,11 @@ <!-- Import result toast --> <plurals name="import_keys_added_and_updated_1"> - <item quantity="one">"Successfully imported key"</item> + <item quantity="one">"Successfully imported one key"</item> <item quantity="other">"Successfully imported %1$d keys"</item> </plurals> <plurals name="import_keys_added_and_updated_2"> - <item quantity="one">"and updated key%2$s."</item> + <item quantity="one">"and updated one key%2$s."</item> <item quantity="other">"and updated %1$d keys%2$s."</item> </plurals> <plurals name="import_keys_added"> |