diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-10 13:52:05 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-10 13:52:05 +0200 |
commit | eac582a313c779e77b0fd67358417d512680facd (patch) | |
tree | d425ee41af9146e757487cba221043d5350d831c /OpenKeychain/src/main/java/org/sufficientlysecure | |
parent | 7324bfcb536b4975365ab9affa0a71ef29e29b93 (diff) | |
download | open-keychain-eac582a313c779e77b0fd67358417d512680facd.tar.gz open-keychain-eac582a313c779e77b0fd67358417d512680facd.tar.bz2 open-keychain-eac582a313c779e77b0fd67358417d512680facd.zip |
import-log: some cosmetics
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
3 files changed, 7 insertions, 3 deletions
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()); } |