From 2f57c52d524f14302726eb2a0bba8311e115dc00 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Tue, 25 Apr 2017 15:00:11 +0200 Subject: [PATCH] rename Special key health status to Defective --- .../keychain/ui/widget/KeyHealthCardView.java | 8 ++++---- .../keychain/ui/widget/KeyHealthPresenter.java | 8 ++++---- .../main/res/drawable-hdpi/broken_heart_24dp.png | Bin 0 -> 694 bytes .../main/res/drawable-mdpi/broken_heart_24dp.png | Bin 0 -> 495 bytes .../res/drawable-xhdpi/broken_heart_24dp.png | Bin 0 -> 860 bytes .../res/drawable-xxhdpi/broken_heart_24dp.png | Bin 0 -> 1297 bytes .../res/drawable-xxxhdpi/broken_heart_24dp.png | Bin 0 -> 1696 bytes OpenKeychain/src/main/res/values/strings.xml | 4 ++-- graphics/drawables/broken_heart.svg | 3 +++ graphics/update-drawables.sh | 2 +- 10 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/broken_heart_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/broken_heart_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/broken_heart_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/broken_heart_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/broken_heart_24dp.png create mode 100644 graphics/drawables/broken_heart.svg diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java index 558cd1842..2474c8f86 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthCardView.java @@ -96,8 +96,8 @@ public class KeyHealthCardView extends CardView implements KeyHealthMvpView, OnC R.drawable.status_signature_expired_cutout_24dp, R.color.android_red_light), INSECURE (R.string.key_health_insecure_title, R.string.key_health_insecure_subtitle, R.drawable.ic_close_black_24dp, R.color.android_red_light), - SPECIAL (R.string.key_health_special_title, R.string.key_health_special_subtitle, - R.drawable.status_signature_unverified_cutout_24dp, R.color.android_orange_light), + BROKEN(R.string.key_health_broken_title, R.string.key_health_broken_subtitle, + R.drawable.broken_heart_24dp, R.color.android_red_light), SIGN_ONLY (R.string.key_health_sign_only_title, R.string.key_health_sign_only_subtitle, R.drawable.ic_check_black_24dp, R.color.android_green_light), STRIPPED (R.string.key_health_stripped_title, R.string.key_health_stripped_subtitle, @@ -139,8 +139,8 @@ public class KeyHealthCardView extends CardView implements KeyHealthMvpView, OnC case INSECURE: setKeyStatus(KeyHealthDisplayStatus.INSECURE); break; - case SPECIAL: - setKeyStatus(KeyHealthDisplayStatus.SPECIAL); + case BROKEN: + setKeyStatus(KeyHealthDisplayStatus.BROKEN); break; case STRIPPED: setKeyStatus(KeyHealthDisplayStatus.STRIPPED); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java index cc90cef9b..ae1acc97c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyHealthPresenter.java @@ -137,7 +137,7 @@ public class KeyHealthPresenter implements LoaderCallbacks { if (!subkeyStatus.keysSign.isEmpty() && subkeyStatus.keysEncrypt.isEmpty()) { SubKeyItem keySign = subkeyStatus.keysSign.get(0); if (!keySign.isValid()) { - return KeyHealthStatus.SPECIAL; + return KeyHealthStatus.BROKEN; } if (keySign.mSecurityProblem != null) { @@ -148,7 +148,7 @@ public class KeyHealthPresenter implements LoaderCallbacks { } if (subkeyStatus.keysSign.isEmpty() || subkeyStatus.keysEncrypt.isEmpty()) { - return KeyHealthStatus.SPECIAL; + return KeyHealthStatus.BROKEN; } SubKeyItem keySign = subkeyStatus.keysSign.get(0); @@ -160,7 +160,7 @@ public class KeyHealthPresenter implements LoaderCallbacks { } if (!keySign.isValid() || !keyEncrypt.isValid()) { - return KeyHealthStatus.SPECIAL; + return KeyHealthStatus.BROKEN; } if (keyCertify.mSecretKeyType == SecretKeyType.GNU_DUMMY @@ -252,7 +252,7 @@ public class KeyHealthPresenter implements LoaderCallbacks { } enum KeyHealthStatus { - OK, DIVERT, REVOKED, EXPIRED, INSECURE, SIGN_ONLY, STRIPPED, PARTIAL_STRIPPED, SPECIAL + OK, DIVERT, REVOKED, EXPIRED, INSECURE, SIGN_ONLY, STRIPPED, PARTIAL_STRIPPED, BROKEN } interface KeyHealthMvpView { diff --git a/OpenKeychain/src/main/res/drawable-hdpi/broken_heart_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/broken_heart_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..169f09dbf104b0e38972c8dda8c9bce6ea2d20d3 GIT binary patch literal 694 zcmV;n0!jUeP)fHfE>h& z3Z5zSp(8KMPJE~kTC53lrhKQWc#1WK9icGm@HH^_YRbD7(}CUzY^Vm)g6DyO1KRirSYWtXR)5H<8heUpf4Hvw&{a093${R8C(G@AWL8w>1KN5pD0HI`JdW zJCX%dX^V%{rBv40K;Kjr(8oG}eq(DQs~z70d}B#~^a_8MMO#Ia%DeCy%nR_9&6x%o zs1c@s!=mE^R^t{H26*pf4fd+-b)89MbmC18@8)X6cXPtrQR+jBMSUsMd%GG8^oSN{ zNZ>G*#J>5W(>xSr8XH4^;B-LXccrta1vhfQ6mTLGhG=&@%m|yop2YJPa>6`Ne%u6U z1zuGMOt$+2IbnveJTFX9-J-^o4jn~n4M3kn{i!Z(5?x!<;rrw9?SU}k*itV{Q9ZLj zJ&woP8x50$O259|cx*fa=Di%-JFmL%GBMfZ`2WEQFeCoLnyID^rEBib`1iG0V1}^j zU&9o&6p!MGkK<$tW>EQsts!a?okgQKlz cHPs0H0Rq^*@t1)}L5S4S;1VSbVl*|BfwoCToA@8J zwFH7f(df|9nt|XX*x=|t;NDPENOVn!n960CweSgk# ze(^u2$W6>)9lz1Q^A=_h^Wj`%=5V8({4ts+TDD)f6__4u*DwWsU_2!sz(HcLz)FRE zmEoGHmAuOg#qCL8d$E(@-qsZ~Iw)Af#lTNxxUY2uhaD6Ycp3Oh*hnykQF@_L@V&0J zCXd4YCq5*Yt-6B?9bEmcKM!y=!_C(f47ZUVVJxuE+OYQ$E3=dtnhDHAC`)mRDLGtK ze!;Cn@6m-(`In)AE4c!=t-ROO!Fb=dGV&b^wUfu(#eQY@ML7N`A#dV-r}CJG%2%<# zH*{mUMt*>ilgeWrU@wR!@w!F6A1>rf8C0%d6;CVjP24%FJmxw+V>-ycDF43anrnE2 lkLW*ddCX<>{Vn;wnPa0@%aA3qJ&phX002ovPDHLkV1l7}*&_e| literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/broken_heart_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/broken_heart_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b938c5ce7dec00bf6a0027098d6ee6aea33e1b48 GIT binary patch literal 860 zcmV-i1Ec(jP)=P74VLDk5q`qi`4wd_)jD^?c;UV)k&Io9xYF zFL%QJV2Y5P@Be+9+5hZpAR!?kp_Zg9u3Zjv0i8fAuqv4U0eA}B0tNw5K_?CD0k#3{ zz_MUY4tNEO09SyI7TzLh0(yabP$+72N9ZgC&H)7jojhkL*|#*&l;>0Zal5H2R|+n)^%wjKmZ`AX}kI2T*j> zyJ`~Pb<D$W2e>vZLNhlK>_gmd&`PsnH7ja?tu>65vP70R*r^Q)kFQ=etROTonR5 z(bQ>k(3w<4=4gb+O;TENO8L0~=yT99@^*-L@4otKkpj*;Y8^BQ&_hfN#i8fdct3_teyp16{yH5Ov literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/broken_heart_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/broken_heart_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c64b545a5e589f71982fb6e7c438d83785205844 GIT binary patch literal 1297 zcmV+s1@8KZP)@~8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11dd5WK~#90?VDeSRYe@fKlff;|E%U-amg1;Aqw;%()>qiralA} z5`;kzf|mKFh!C1Vnusa*uQ#FgVI_?cEy3tPgw+Q_+R|RaWfT9Q_&3wd6<2Q$v(sKr zXXc!lGjs0VZ9edOI(N?ZH{W~C{N~J@1A#yw5C{YUfj|re2j?gPF9Y*|X~46pbNMGbO1jAM}Riqk)>8<%D_6{B2Y1i77MM> zz#8C^q1FZ9BcRDb)0zUX4DoN7BrD?)Fe9bbAVdf6T58F-4!nn(J4QNp6D%3^?yvA}7E$-bYU_Y~0WP*29My?t>?6K>6^AO`Ppg6>Yon$;#b zyOIisOVdZ9pC@QH1AlqaK7^w&X_==4D~NLce1iTakNQjOEa{_+eYHv(ZRr2WGH}b2 z_Ei#YwUX8zSPi_E@SChW4V(dfQylL`l>2!ev>Sojh)Jw5MZ`qQ=hY+QGVnw~N3M9% zK2P$LBbK>2nIq$~gnU+d)ShkZ4zMvNV`SV1p3~$r6!CBS(Edavs=KtNYL5A!0ob8A z-VJ=}Nqf3YqqF3D1<6>b$!QQ`KzFU#X=Bix8X44yxSdqI<3aPbjX^y%GN=N4tjVj0 z`^TOKHU{~c;-`tff$^H$7CP4Z)5f54H8iLKe5=W=0Gx2Bbyg*$t72y~$MWEw=2#gR z=}=4ASDitp9VTE(JK`ZZj$w#JyNM3DQ>-o^NS_g`XP-?$2h)<4hp??q*!9 zROpSv?`q~9#J-zTmO4&yk3we@aLTb(G!|zyLq)5j1XY9bFyNRY4OQ%O;)H?`!0#Co zRLzuq&62C51O4WJ6Q*FlXRaHReaw=p;~p^Cg#l?;1U$4zQZ-ZdHA|N95O~W?*VD7g zBGDHV=elWeE*F1{cebZYP{x;v^PDt1k4bEC*Ijdpz&9~T>BfQPnDcyPa1N8$i{-AV zOByhnX|Ihr#|DG;Y2z?3#BpD(F)`^9FgViw-IQ(X(j1A2NsA(FXQpgdx8_J1NcWQG zu}HfyDcYooAJA_)_6vrP&ZKC`&-#+o0s8Tk6Qu-vfxbi0lAop2w<7lK>xu%f6?Lb& zfhVheZ(Hhj(GN;_7CuDXx$2T{Q|dS8(t{jWPW-c5b;&m=^*xA%`~k(A#IFL#lApHJ z-v{2#Gx0o`$A8}%ktIJ(sqeya7qp(3iueqny5leQ9@9P5-vnODJK0(>k;fP1Wyx2S z`pYE0kw4%VPv857vgF5=`ack#M*S}ti+I&Vmi*|-Vmlr_U8*-m06!v1{u27kIf}=R z-|CG9;A>zT!kmL-cqL_^QbMd9w@`=ARe?Yt5C{YU1C4(G_<85{lF_!600000NkvXX Hu0mjf?P_i9 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/broken_heart_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/broken_heart_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e068bf7776e1d0ef41b9d5e966d6891f6afd543d GIT binary patch literal 1696 zcmV;R24DG!P)k8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11|3O6K~#90?VU?(R8<(qe;wOuL~TRSMMH!dOaw8}V8BMDg!sk~ zqlh#n+J&fLX9Sy~5ffaPs3g7;T^Kh;HyTAz!T73;#>7MftEk1df&{FV5-lyAadA57 zFx;=97`hbstzb*N( zLIcnVybX*2g@if=yaO~E@^dQC1$>aw&lvC)ux28*s-+%S2mDO(AfvP)qn{?=LDa9w zgr5TN6L2?hQbupaX$N*;F3-#YSDs%<#D z2|3_p%K?>ZT>^ir9eXSNB{=DhHhKtd5SS(OR|kCI!D9iqPv|ipSve=Wt?@M0xH#~$otu49(~>^^eCnQb2Hqmx;=sK zcRhLh1;bTQr>8)ov>&y2CSfsZF5$!HEkchXwtEVqk{(as{WVV>wc`d^3|zekG@$lEVv*c{OS5~i!g64huKaIHzEuvE8-CW*<1~y~>({Z#gST-kj5EIWSEG~%ZWMUF!;`=50&j`A##1m+k_@`n z$=<^g%sU(B$64boFhrdrGiA>8?o`Ndsd-VIP3vjpA6Q$*nL}p>Dr@$nG zZYzGzFFBcEpN;#UcOJM|1wQoxmD_!L*VLx|=M1zErxg$vRJ9J}Akc z>uZ) z`J8OFo3|y2ZF)q25Z2j}^#P_XlX1I11jRIGv z&WdAhCEGr7+_7`l=Q|4%v2>+Rhaa*mSMVE_h!n3N7j=*=tUK->3T_gWA-%o zCGAakzQXm|QeLknlV4;5$%7w3z5l12+{E8(C;xt9(N_s+ZbGG!)OIO4?UG+4=}o9q zlG-dqA21qm71B+z5;dwMwNZ-ZalEPGle>@~^olA;O_!qMz*^%`Rym!>pFb-vNllib zV>}3 zDLO(GoYkD}bO8ULO48C&bQrkOqpzCceAH%54=VZlfeXDlszK%g&!YYZneI4az!J?w qZ`=n0fj}S-2m}IwKp+sPO8y6claKexUimfv0000"This key can\'t be used anymore." "Insecure" "This key is not secure!" - "Special" - "Click for details" + "Defective" + "Click for details" "Healthy (Signing Key)" "Click for details" "Healthy (Stripped)" diff --git a/graphics/drawables/broken_heart.svg b/graphics/drawables/broken_heart.svg new file mode 100644 index 000000000..a1cda629b --- /dev/null +++ b/graphics/drawables/broken_heart.svg @@ -0,0 +1,3 @@ + + + diff --git a/graphics/update-drawables.sh b/graphics/update-drawables.sh index 18ed1b63a..4407315b7 100755 --- a/graphics/update-drawables.sh +++ b/graphics/update-drawables.sh @@ -22,7 +22,7 @@ SRC_DIR=./drawables/ #inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg -for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link" +for NAME in "broken_heart" "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link" do echo $NAME inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"