diff options
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java index 77d4b9a26..029a851cb 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java @@ -91,28 +91,28 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> { TextView status = (TextView) view.findViewById(R.id.status); status.setText(""); + // main user id String userId = entry.userIds.get(0); if (userId != null) { String[] userIdSplit = PgpKeyHelper.splitUserId(userId); + // name if (userIdSplit[0] != null && userIdSplit[0].length() > 0) { // show red user id if it is a secret key if (entry.secretKey) { - userId = mActivity.getString(R.string.secret_key) + " " + userIdSplit[0]; + userIdSplit[0] = mActivity.getString(R.string.secret_key) + " " + userIdSplit[0]; mainUserId.setTextColor(Color.RED); - mainUserId.setText(userId); - } else { - mainUserId.setText(userIdSplit[0]); } + mainUserId.setText(userIdSplit[0]); } + // email if (userIdSplit[1] != null && userIdSplit[1].length() > 0) { mainUserIdRest.setText(userIdSplit[1]); mainUserIdRest.setVisibility(View.VISIBLE); } else { mainUserIdRest.setVisibility(View.GONE); } - } keyId.setText(entry.hexKeyId); diff --git a/libraries/AndroidBootstrap/project.properties b/libraries/AndroidBootstrap/project.properties index 1b8c5a340..91d2b0246 100644 --- a/libraries/AndroidBootstrap/project.properties +++ b/libraries/AndroidBootstrap/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-18 +target=android-19 android.library=true diff --git a/libraries/HtmlTextView/project.properties b/libraries/HtmlTextView/project.properties index 5ca3505c8..484dab075 100644 --- a/libraries/HtmlTextView/project.properties +++ b/libraries/HtmlTextView/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-7 +target=android-17 android.library=true |