From eac582a313c779e77b0fd67358417d512680facd Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 10 Jun 2014 13:52:05 +0200 Subject: [PATCH] import-log: some cosmetics --- .../keychain/pgp/UncachedKeyRing.java | 5 +- .../keychain/ui/ImportKeysActivity.java | 3 +- .../keychain/ui/LogDisplayFragment.java | 2 +- .../drawable-hdpi/ic_action_view_as_list.png | Bin 0 -> 308 bytes .../drawable-mdpi/ic_action_view_as_list.png | Bin 0 -> 246 bytes .../drawable-xhdpi/ic_action_view_as_list.png | Bin 0 -> 337 bytes .../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 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 0000000000000000000000000000000000000000..86da228e978a34f5fa521e94f8b4ecbf3eda9302 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G*F0SuLn>~)nR$@6*?@;Z`bs`q0;3p5b_uT$!{rMzPcW@H z$gpx^MM!N(s9{^jW|5DMoBE$T>Im6>XfYE|JA;MEyZ!rS6o31a(erB7oZ`(|2crHY zun458$N(i{JMAB@j5+P>mdmDadyZB^&gFw54nlnv3UNwRfNDef~fLGeb^x z%Gx63=xHe%a#9?BCReGrJ!(?%Qz{IZRgmvv4FO#mY=aRdMW literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ccb4c7d7b2a505b6dfb862afbb78ea0a12fb0dea GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GGdx`!Ln>}1B}lL?PH13MwmbR%|Nrw#x>S35Uha4j!STX$ zSt*ABZ;1%c4(5oCkm-Cq$2TvL;PJ6v@M5;7F8di4DT_^u7l?P{Pt4dRB_JMrnsJ}Q zpP4S~AA*couCQ5gZDaUoEOd4nQ_}pz$sDz8w-~pd@M+1qQgk3KD%IKP>PJbf(Bo>0 sr(VoRHA%UAAhIpcfUC`#fy017>at4Mx~uA6fo^2*boFyt=akR{0BOxw)&Kwi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b9c93c8c2038d2bfc36c679ef8ca2c2008f3ff31 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XK6|=2hE&{oGxIg?VFezxg{Op0O05yRmat;o#B~Ry5_ukZ zNiJA=qUfnL=hJYx7{hbdTY#Dv80_dJPOL3Ji>Ww;ovk4+pxE5#;O# c+Ioy^3>WS@v@Ctmy9y-Y>FVdQ&MBb@0B}!#EC2ui literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..46004164086edec3c8b6e95541e90817db41aa08 GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7y~_B978H@y}5fa_mF`I>xCVUrZXlmh@Fty;5M_3an{TP zMz#hGrWNo89;R7}E^7*$(H*o@pw;b zP>!@KXAyq^zec7{@SltuXBik3fT-bJm}9Yc&59bIvcvC<->Nb1SnBs9q*C2R%h4;q z?DVDZ8}@6W`4T4g$zR_qq{6_Wz`%0huF;n#6PHLXU|A@9jdL*zC(w2WhLWv3bA!}v zuG%PM&a_#7$<5e-bJ0;D6FalrC5PT~El8;iZ4zi;5NHU!a9MrNGOPTV`q8`(gyVv* za_(loP@?|EG}PFE0cZ{oF&VHh2{16dm}Xz_W4BKI0|qc)y~8TO5M^(FDfCj$2at%T LtDnm{r-UW|l+l=o literal 0 HcmV?d00001 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