From eac582a313c779e77b0fd67358417d512680facd Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 10 Jun 2014 13:52:05 +0200
Subject: import-log: some cosmetics
---
.../keychain/pgp/UncachedKeyRing.java | 5 ++-
.../keychain/ui/ImportKeysActivity.java | 3 +-
.../keychain/ui/LogDisplayFragment.java | 2 +-
.../res/drawable-hdpi/ic_action_view_as_list.png | Bin 0 -> 308 bytes
.../res/drawable-mdpi/ic_action_view_as_list.png | Bin 0 -> 246 bytes
.../res/drawable-xhdpi/ic_action_view_as_list.png | Bin 0 -> 337 bytes
.../res/drawable-xxhdpi/ic_action_view_as_list.png | Bin 0 -> 431 bytes
OpenKeychain/src/main/res/values/strings.xml | 49 +++++++++++----------
8 files changed, 33 insertions(+), 26 deletions(-)
create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png
create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png
create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png
create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png
(limited to 'OpenKeychain')
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
index 624b7d068..7853d0b00 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -204,7 +204,8 @@ public class UncachedKeyRing {
}
// dummy
- log.add(LogLevel.INFO, LogType.MSG_IP_BAD_TYPE_SECRET, null, 0);
+ log.add(LogLevel.START, LogType.MSG_KC,
+ new String[] { PgpKeyHelper.convertKeyIdToHex(getMasterKeyId()) }, 0);
/*
// Remove all non-verifying self certificates
@@ -218,6 +219,8 @@ public class UncachedKeyRing {
}*/
+ log.add(LogLevel.OK, LogType.MSG_KC_SUCCESS, null, 0);
+
return this;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 90d772bd1..9932e3e18 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -432,8 +432,9 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O
toast.setText(str);
toast.setDuration(duration);
toast.setIndeterminate(duration == 0);
- toast.setButtonText("View log");
toast.setSwipeToDismiss(true);
+ toast.setButtonIcon(R.drawable.ic_action_view_as_list,
+ getResources().getString(R.string.view_log));
toast.setOnClickWrapper(new OnClickWrapper("supercardtoast",
new SuperToast.OnClickListener() {
@Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
index 36d3e932e..5e038d3f6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
@@ -54,7 +54,7 @@ public class LogDisplayFragment extends ListFragment {
super(context, R.layout.log_display_item, log);
mInflater = LayoutInflater.from(getContext());
dipFactor = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
- (float) 6, getResources().getDisplayMetrics());
+ (float) 10, getResources().getDisplayMetrics());
}
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png
new file mode 100644
index 000000000..86da228e9
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png
new file mode 100644
index 000000000..ccb4c7d7b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png
new file mode 100644
index 000000000..b9c93c8c2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png
new file mode 100644
index 000000000..460041640
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png differ
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 86219da70..e1ff77c63 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -28,6 +28,7 @@
<string name="title_certify_key">Certify Identities</string>
<string name="title_key_details">Key Details</string>
<string name="title_help">Help</string>
+ <string name="title_log_display">Log</string>
<!-- section -->
<string name="section_user_ids">Identities</string>
@@ -499,28 +500,7 @@
<string name="cert_verify_error">error!</string>
<string name="cert_verify_unavailable">key unavailable</string>
- <!-- unsorted -->
- <string name="section_certifier_id">Certifier</string>
- <string name="section_cert">Certificate Details</string>
- <string name="label_user_id">Identity</string>
- <string name="unknown_uid"><unknown></string>
- <string name="empty_certs">No certificates for this key</string>
- <string name="section_uids_to_certify">Identities to certify</string>
- <string name="label_revocation">Revocation Reason</string>
- <string name="label_verify_status">Verification Status</string>
- <string name="label_cert_type">Type</string>
- <string name="error_key_not_found">Key not found!</string>
- <string name="error_key_processing">Error processing key!</string>
- <string name="no_subkey">subkey unavailable</string>
- <string name="key_stripped">stripped</string>
- <string name="secret_cannot_multiple">Secret keys can only be deleted individually!</string>
- <string name="title_view_cert">View Certificate Details</string>
- <string name="unknown_algorithm">unknown</string>
- <string name="can_sign_not">cannot sign</string>
- <string name="error_encoding">Encoding error</string>
- <string name="error_no_encrypt_subkey">No encryption subkey available!</string>
-
- <!-- Import log entries -->
+ <!-- Import Public log entries -->
<string name="msg_ip_apply_batch">Applying insert batch operation.</string>
<string name="msg_ip_bad_type_secret">Tried to import secret keyring as public. This is a bug, please file a report!</string>
<string name="msg_ip_delete_old_fail">No old key deleted (creating a new one?)</string>
@@ -556,6 +536,8 @@
<string name="msg_ip_uid_self_ignoring_old">Ignoring older self certificate</string>
<string name="msg_ip_uid_self_newer">Using more recent good self certificate</string>
<string name="msg_is_bad_type_public">Tried to import public keyring as secret. This is a bug, please file a report!</string>
+
+ <!-- Import Secret log entries -->
<string name="msg_is_importing">Importing secret key %s</string>
<string name="msg_is_importing_subkeys">Processing secret subkeys</string>
<string name="msg_is_io_excption">Error encoding keyring</string>
@@ -563,6 +545,27 @@
<string name="msg_is_subkey_ok">Marked %s as available</string>
<string name="msg_is_subkey_stripped">Marked %s as stripped</string>
<string name="msg_is_success">Successfully inserted secret keyring</string>
- <string name="title_log_display">Log</string>
+
+ <!-- unsorted -->
+ <string name="section_certifier_id">Certifier</string>
+ <string name="section_cert">Certificate Details</string>
+ <string name="label_user_id">Identity</string>
+ <string name="unknown_uid"><unknown></string>
+ <string name="empty_certs">No certificates for this key</string>
+ <string name="section_uids_to_certify">Identities to certify</string>
+ <string name="label_revocation">Revocation Reason</string>
+ <string name="label_verify_status">Verification Status</string>
+ <string name="label_cert_type">Type</string>
+ <string name="error_key_not_found">Key not found!</string>
+ <string name="error_key_processing">Error processing key!</string>
+ <string name="no_subkey">subkey unavailable</string>
+ <string name="key_stripped">stripped</string>
+ <string name="secret_cannot_multiple">Secret keys can only be deleted individually!</string>
+ <string name="title_view_cert">View Certificate Details</string>
+ <string name="unknown_algorithm">unknown</string>
+ <string name="can_sign_not">cannot sign</string>
+ <string name="error_encoding">Encoding error</string>
+ <string name="error_no_encrypt_subkey">No encryption subkey available!</string>
+ <string name="view_log">View Log</string>
</resources>
--
cgit v1.2.3