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 @@ Certify Identities Key Details Help + Log Identities @@ -499,28 +500,7 @@ error! key unavailable - - Certifier - Certificate Details - Identity - <unknown> - No certificates for this key - Identities to certify - Revocation Reason - Verification Status - Type - Key not found! - Error processing key! - subkey unavailable - stripped - Secret keys can only be deleted individually! - View Certificate Details - unknown - cannot sign - Encoding error - No encryption subkey available! - - + Applying insert batch operation. Tried to import secret keyring as public. This is a bug, please file a report! No old key deleted (creating a new one?) @@ -556,6 +536,8 @@ Ignoring older self certificate Using more recent good self certificate Tried to import public keyring as secret. This is a bug, please file a report! + + Importing secret key %s Processing secret subkeys Error encoding keyring @@ -563,6 +545,27 @@ Marked %s as available Marked %s as stripped Successfully inserted secret keyring - Log + + + Certifier + Certificate Details + Identity + <unknown> + No certificates for this key + Identities to certify + Revocation Reason + Verification Status + Type + Key not found! + Error processing key! + subkey unavailable + stripped + Secret keys can only be deleted individually! + View Certificate Details + unknown + cannot sign + Encoding error + No encryption subkey available! + View Log