From 4ad15739e23ded8e02288612d3e18b5bf1627a7c Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 18 Jun 2014 21:43:41 +0200 Subject: [PATCH 01/12] canonicalize: missed two logging entries --- .../sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 4 +++- .../keychain/service/OperationResultParcel.java | 1 + OpenKeychain/src/main/res/values/strings.xml | 7 ++++--- 3 files changed, 8 insertions(+), 4 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 e1ce62bdf..371202217 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -547,6 +547,7 @@ public class UncachedKeyRing { // if we already have a cert, and this one is not newer: skip it if (selfCert != null && selfCert.getCreationTime().before(cert.getCreationTime())) { + log.add(LogLevel.DEBUG, LogType.MSG_KC_SUB_DUP, indent); redundantCerts += 1; continue; } @@ -574,8 +575,9 @@ public class UncachedKeyRing { continue; } - // if there is no binding (yet), or the revocation is newer than the binding: keep it + // if there is a certification that is newer than this revocation, don't bother if (selfCert != null && selfCert.getCreationTime().after(cert.getCreationTime())) { + log.add(LogLevel.DEBUG, LogType.MSG_KC_SUB_REVOKE_DUP, indent); redundantCerts += 1; continue; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java index 6e49baf92..f88df5301 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java @@ -201,6 +201,7 @@ public class OperationResultParcel implements Parcelable { MSG_KC_SUB_BAD_KEYID(R.string.msg_kc_sub_bad_keyid), MSG_KC_SUB_BAD_TIME(R.string.msg_kc_sub_bad_time), MSG_KC_SUB_BAD_TYPE(R.string.msg_kc_sub_bad_type), + MSG_KC_SUB_DUP (R.string.msg_kc_sub_dup), MSG_KC_SUB_PRIMARY_BAD(R.string.msg_kc_sub_primary_bad), MSG_KC_SUB_PRIMARY_BAD_ERR(R.string.msg_kc_sub_primary_bad_err), MSG_KC_SUB_PRIMARY_NONE(R.string.msg_kc_sub_primary_none), diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 3221cd9cd..e24ac6925 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -578,13 +578,14 @@ Subkey binding issuer id mismatch Removing subkey binding certificate with future timestamp Unknown subkey certificate type: %s + Removing redundant subkey binding certificate Removing subkey binding certificate due to invalid primary binding certificate Removing subkey binding certificate due to bad primary binding certificate Removing subkey binding certificate due to missing primary binding certificate No valid certificate found for %s, removing from ring - Removing bad subkey revocation key - Removing bad subkey revocation key - Removing redundant keyring revocation key + Removing bad subkey revocation certificate + Removing bad subkey revocation certificate + Removing redundant subkey revocation certificate Keyring canonicalization successful, no changes Keyring canonicalization successful, removed %s erroneous certificates Keyring canonicalization successful, removed %1$s erroneous and %2$s redundant certificates From ada6a121748d58e8fe0477faf8bcb210deafe264 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 18 Jun 2014 21:54:59 +0200 Subject: [PATCH 02/12] fix key export --- .../org/sufficientlysecure/keychain/pgp/PgpImportExport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java index 9b070175c..7544f7b86 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java @@ -226,7 +226,7 @@ public class PgpImportExport { try { WrappedPublicKeyRing ring = mProviderHelper.getWrappedPublicKeyRing( - KeychainContract.KeyRings.buildGenericKeyRingUri(pubKeyMasterId) + KeychainContract.KeyRings.buildUnifiedKeyRingUri(pubKeyMasterId) ); ring.encode(arOutStream); From d9ccef4899530482732eb0fada9e2d309accb8a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 18 Jun 2014 22:01:58 +0200 Subject: [PATCH 03/12] consistent button design in import activity --- .../src/main/res/layout/import_keys_keybase_fragment.xml | 9 --------- .../src/main/res/layout/import_keys_server_fragment.xml | 9 --------- 2 files changed, 18 deletions(-) diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml index bf00b77e7..749552c3b 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml @@ -18,17 +18,8 @@ android:lines="1" android:maxLines="1" android:minLines="1" - android:layout_marginRight="8dp" android:layout_gravity="center_vertical" /> - - - - Date: Wed, 18 Jun 2014 22:30:54 +0200 Subject: [PATCH 04/12] Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions --- OpenKeychain/src/main/AndroidManifest.xml | 2 +- .../main/res/drawable-hdpi/ic_action_nfc.png | Bin 0 -> 1660 bytes .../res/drawable-hdpi/ic_action_qr_code.png | Bin 2680 -> 2388 bytes .../{icon.png => ic_launcher.png} | Bin .../{icon.png => ic_launcher.png} | Bin .../main/res/drawable-mdpi/ic_action_nfc.png | Bin 0 -> 1147 bytes .../res/drawable-mdpi/ic_action_qr_code.png | Bin 2388 -> 1502 bytes .../{icon.png => ic_launcher.png} | Bin .../main/res/drawable-xhdpi/ic_action_nfc.png | Bin 0 -> 2297 bytes .../res/drawable-xhdpi/ic_action_qr_code.png | Bin 3339 -> 2592 bytes .../{icon.png => ic_launcher.png} | Bin .../res/drawable-xxhdpi/ic_action_nfc.png | Bin 0 -> 2378 bytes .../res/drawable-xxhdpi/ic_action_qr_code.png | Bin 3458 -> 3339 bytes .../{icon.png => ic_launcher.png} | Bin .../{icon.png => ic_launcher.png} | Bin .../layout/import_keys_qr_code_fragment.xml | 4 +- Resources/graphics/ic_action_nfc.svg | 61 ++ Resources/graphics/ic_action_nfc/NFC.png | Bin 0 -> 88038 bytes Resources/graphics/ic_action_qr_code.png | Bin 5377 -> 0 bytes .../ic_action_qr_code/ic_menu_qr_code.svg | 753 ++++++++++++++++++ .../graphics/{icon.png => ic_launcher.png} | Bin .../graphics/{icon.svg => ic_launcher.svg} | 0 .../graphics/{icon => ic_launcher}/AUTHORS | 0 .../graphics/{icon => ic_launcher}/COPYING | 0 .../kgpg_key2_kopete.svgz | Bin .../{update-icon.sh => update-drawables.sh} | 16 +- 26 files changed, 832 insertions(+), 4 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png rename OpenKeychain/src/main/res/drawable-hdpi/{icon.png => ic_launcher.png} (100%) rename OpenKeychain/src/main/res/drawable-ldpi/{icon.png => ic_launcher.png} (100%) create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png rename OpenKeychain/src/main/res/drawable-mdpi/{icon.png => ic_launcher.png} (100%) create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png rename OpenKeychain/src/main/res/drawable-xhdpi/{icon.png => ic_launcher.png} (100%) create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png rename OpenKeychain/src/main/res/drawable-xxhdpi/{icon.png => ic_launcher.png} (100%) rename OpenKeychain/src/main/res/drawable-xxxhdpi/{icon.png => ic_launcher.png} (100%) create mode 100644 Resources/graphics/ic_action_nfc.svg create mode 100644 Resources/graphics/ic_action_nfc/NFC.png delete mode 100644 Resources/graphics/ic_action_qr_code.png create mode 100644 Resources/graphics/ic_action_qr_code/ic_menu_qr_code.svg rename Resources/graphics/{icon.png => ic_launcher.png} (100%) rename Resources/graphics/{icon.svg => ic_launcher.svg} (100%) rename Resources/graphics/{icon => ic_launcher}/AUTHORS (100%) rename Resources/graphics/{icon => ic_launcher}/COPYING (100%) rename Resources/graphics/{icon => ic_launcher}/kgpg_key2_kopete.svgz (100%) rename Resources/graphics/{update-icon.sh => update-drawables.sh} (67%) diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index b3a4d5960..48677431c 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -65,7 +65,7 @@ android:name=".KeychainApplication" android:allowBackup="false" android:hardwareAccelerated="true" - android:icon="@drawable/icon" + android:icon="@drawable/ic_launcher" android:theme="@style/KeychainTheme" android:label="@string/app_name"> E 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 X)8f-?SHhxY00000NkvXXu0mjfwIhS? delta 2648 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 B5t#r0 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/icon.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from OpenKeychain/src/main/res/drawable-hdpi/icon.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-ldpi/icon.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from OpenKeychain/src/main/res/drawable-ldpi/icon.png rename to OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png new file mode 100644 index 0000000000000000000000000000000000000000..da5e267d059820765cf52ace51778e94e541e8b0 GIT binary patch literal 1147 zcmV->1cdvEP)7 z=|#KTGC~bZen6$jO2o( z`@_6b!o7REjs`)nCh5{J@02h)I=V%Zbkoefmed>6 zN&Zr)RL%joO)^)lR%goP@~_xj|K|a~^StGqyfXoMz2258bIvW)>-8_q>_Y&54m2HD zTwLq{Sc-w39k@RbYd3cC&IH)l*hp$^0BAHC%^(QQO8QEY0ho%b{5JrQG!6h}){#_< zw{35TcN!pyqAirYUaxfW{daxe-x~zM#VCqSle{HKW>$y+{vGF>qwo90VcwYl zrBZ2&=6T+pX0u5EhXH)x`~HhdOH0>+AUGSF?v1;y#MdVz-3@|ZEeu0%C+|#vFbtF0 z@pilYl5>tEi_W>XYqi>`nVFeN4Cu%I`Wi_`a$3?A03dl_h2lFJ411OXHu~aJE^nL$Rk|VpB z9LUJP>gsA{4HOE6CjlHK`AxA{Bmf*ccB}{B2a=b~Y)`k_9g|epb~5Ku%bNlym&=&| zW)=Z>qt$A)`ull#d3l87DFCmLoEjY+ZF-(}-pm#x-O2D6{v2pFn>IE!mLz{hQip00M%+WD+5#g$12I`zOi%e^+dl( zY-VG-m)F!1FzeH-R;!(m^ukd52M9@*8jZ#m@wu@x!2cPK{LAPuz&}+H(wA+om;V3& N002ovPDHLkV1n!gA8h~t literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png index 1c65e5af8d745a88c18f243804783bc62d176fef..570212461af60944af397177d4da4894a4ef95cf 100644 GIT binary patch delta 1460 zcmV;l1xxzW65b0TiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPN3kf;^ z00}w)@MMxokwzzf1zSl(K~z|U?N>{W6jc=dzFW7uXTSy$Z9%|{Gdv^`qI6Zy5FScP zG;ScWVaE#n0W4U!aA91qAa30#8x5OD6bU36HiNw4q^kyumIM1Uf;dVh$86$C<4&s za{0*E*w{Va_xF*!mD&tMQ8Zew*ZbP-_8|ZUKrA9Q9|u4uilWaR34r7Z023ne2LKcb z1&9bmq$ncqwcBmw`~E)9^QMe3zX5>Ox|9MsMRGOC&y6uLNy&KG%Vq&5>F)`5u&`Q4n0Gx9_E2Wl`98yXRDy2N7)Z}A5 zK`zKTlA8c{0A>N4@3t8k8CeeiaU3_b*5lo30R19jMWp0;-nE{Goe#jHL`1FvSYnJ> z@0_b>t?y>_@Ly$K03@dYG)3gLh)m^mQ520@YgdqeY&IH=3reX$5!u%Ta!N#Q18AnP zddhrHP$(9Q=K!3G-D}hYu0=>F+`UwEc%*<@k z`r&jv0XXOO#&NtSiwB^XBuQVUZ@1frI-Sl*0GH?S{|LZ60C610767!?SuH&pK)GB# z(r&kZRfasffvlaPD4O+s|Gxe3@bDWVQU_pD-NAgke4KK*>=p#jYPI$&rOsZwc=2lf zdqy%lckVpWZnpsdK@hx6vLC=106WsApUHfD-`^L<@rv{SQ)6ReqYDBcxq@VWtybG6 zB5O(BZZsO-Rw|XG)9IXSwOad0E=q$g6A^fSo;RJJs461yY&>3XGLVrTD#u!ycU34B&WkL>?R_J$g3jqEP&^nbK8P{ zAQ)K?004}Pj11!6w=9y}e(BPs>7k*auRYJZHaIwVoa8-{uNh;KFbuzGG#VGSZr$1s zU_%r|qa=T{)~+J?7l7*k?vN~r$iQO(FviqKHUaz~B6k3w*=!b^bGw_(W+898ef#$E zmMvRWCrPpazySbgG#W<%Yyxn_T6@BOId?@wu0~O`a1qw)^*)lPa_#d|5Cn@-^(SY} zoSCautM>pXt+k2cxGExb5m}5}pD$UmlH9m)V~WPM(eY}vx@+mur3V0f+MSPo-Aic@ z1RpA;zSCM?NpB!e#fL@YU>JrowOZ`}$?E`+y8#o1;Ritw90s6Cc0|OG{KYwU6Tq8M z6g>cbzFCmOal8Y-hHR6Gk|f)9`T>05dEV_*f45L5 zyyTqg>&i3#G!&6#04gM(Pq(Ch2d|E-&Cbpao$a9?B&asv!&yxh`b^q1#9hq z)_S9J?k35Fi|}zpLGrdZJIK~!jg?O9!H9Mu*6&Y79@+F+-SO#&)OoAQ&Uq=ER}*lnOoVtemBrw^VD8^^oexTXMP%r_9xw5r|!Kml9?&__h)RrN*y2a+VY004zTVVj89 zxw*OL0U(#lJ8hVV21%0S(M|@&m_0ah{%g+nzoL6)EIL= zGd~x{@iW;Xp{nC)n*OoV{MOq2ovtrM006LU+qTtz&biw}#4~f?oYN?Zrpo2=@ovU1 zg<`RIXQR;=2*Z$?KEg13@9^Qn=aw4V6#?hmZK}GLh-#`j%*^7we;dGx5b)mL&&-=t zl~uK-s>9B?0{~Wrz;a=&-3_^53RNP^ZER5qbNE90M^?306gfu|6NZ{&yuf3x9Exh z5q%~i$Fkgf8d+{$Xs7e7ZKF^qoDq@nsi~=pM~@zL*)?Y7Fp8opiYF0$=)G5FCRLqQ z)zi%U*@_X!vQ5_kn-#3X-P*S+Qr%!F0%VMT*~82;B9d3t86wIPkrL6Ii1ZNA%}rx# z?Xaru3WDIxN~LmaDd$9Vb2k61s^(Oc7V*`#h;>DPnRkdtjhTn>d6g7Z{gjzktLmAi zF*6US>JIPy1b`(80Qd?s->ItSvj4o8ujLXr5Qbq006}nN)(gW>opaPYmdoXO9LK|d z3+?W{`|dSS6zwCTsph$Ixm+(6i~E{mTkRL~<(zX@O@NsPW@l&fZ@lrwiFP)?{AexM!py=@7I z$d7{{*a)CwFQlrwRCUM6lPC8ryyl#L`#At4N%CaY3*FXk9%D?Xs!uR;O;v}(Fs!NS zurcN_0FA3A(27#2bZev0C;*rPkQ*Bt`*ZW%41(ZI@BM^xZf6*VecjC0M6p=h;GEkU zMbYbNnw}jQ8F`V2Rs;Bssvc9-b7Ny;zSA6CZD>T~7G~bX%=a?$E@RB47qwDTOnSvbC4uM-ii6_FYdfr$D63{Or@uHCX_%Y}C9p>Bk&LZJ|=>Rx=Fn;%P( zs0j+5zUH7Pt%vG{yhkSwl|?;5F29xW`0Ojzm}%y3nFsGWAxtN!^{s24GmrKS}X=4 z`YwPU06@81{vb`$7XW;JlZYNj)AWTTNnURCMMQsTiUEtE;}b~J)Wvc9jC1Zh066Df z>gnluHA#|7K}AG|i0I$z*RP*GapJ@kmAF_e4teh%!F=Hw$bOfBng7&iH1YsojM+p) z4>I#ViRdz4S4F^D+gB_WLjbkj-d>bSrGehw-WdQh#bU94`}XaB>YSr|K0oW6s~tRe zP>eAyTj;c^PR-5D34kDqq9Fhg5#0*ll&a3O`Vx_;o}Qiy0HCTlA{uHm8jXBDU+Ywb zfet}zt$iH8CL(IrV0}tNtD6BE1i`)|M~+M_IvIeh55xIkz`v6du zmAv;pAfi(u@|vpN8^`gvYPI^GWf53Px5;#&J6q2==e7nxu#1R}0{{{2X|~0IZ z_j`%xH2@t65Yf-P_v2`zigZOF48!-Fa|fEjtM^`iqbO>d^Ou5i?jkcEXcYu7uYf#4 zL}9BCp{jof!?50VZQVG`RN@s=)3U-;U2vM1**4qhCek!bJI%Ee0k+oeUs#FJ@_~bh zCYr`uw{HD<5Cr>(sMb7JDwWnc=bj{@zg4T%m#nqF0vi(p zKWwdd{b_%H|1Xxcp=p)-08C?ES(sMU34H#E>1_6ysOFq=Q54OH$he4{XXc67+1XhD z$mMe5M06GaRP`hgeY((>i1;*3FSQKDn2!P6c+*WcEw2~)vfxYqmGU})YmMs!t~LG( X)8f-?SHhxY00000NkvXXu0mjfb83Uk diff --git a/OpenKeychain/src/main/res/drawable-mdpi/icon.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from OpenKeychain/src/main/res/drawable-mdpi/icon.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png new file mode 100644 index 0000000000000000000000000000000000000000..ff569927cdce887fc5cb02e948ffb35d09e6b886 GIT binary patch literal 2297 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 VNbmoDl?wm>002ovPDHLkV1lw<(ggqj literal 3339 zcmZvfc{H2b8pgk<67zUkV-aIY%}T}GXizazs)BN8ILy>J%svPm z7U>z{14KqfD*FfC4fXQ8@1q4ZPXqus)6C(<4pC1&yCJj0UjK563LpLS<-JSM ztPq%2FjGP*H;VcN^Q3{-1#W8vhiCA7c&xw=F;sxCD%uGuv)OVR7}@Z1m!!$Gaj_3P zy#8306)_k#IwwkHRdP<3fRP&oc1B_%Dk@%}xLv2J@K32v7cWh)9Kq<@)d}=~#mVjJ zLzJU{MyXK(Z#2hW{)p$;C$cJQZYkS1kb|NeVyM@!4TBNAb&scmSO2m%g1 z&$rE!KbyNr3$v!^9?q|)|KVLG9bJK3|nXT_6@8R#AQTiTFeKDFQ` z5Fv8!7AWg-LOqii5!=nYnl&li#mx5`z97pLiB<*y8Y;^_u8RP-hx7==cemElD%nah zF0~&n#tzPtF{0}HXeMrl(}`?7E&MsuzRCVF0L}eCQU~{Y>UwmW8f`Q-FK=*_by>#%3=E?~Wx+`m zF;k?efC@k+q`mG~jPD`zk_Ld1Gs_X5un~%vB1Fb7{g`i<6R&0} z{1yS3Bh|smpW6+1i-?$xS9y|QoN(Kgi6*5hu}l6N4PG0+vkeGe7Y9kmiuL``(^Rt! zlFVNIF}+Q13m4`aHisgBuBIAV^cx+p0hwKrP_ITa2-oM4w8icmCk`MRa0-?-BMO3# zHR}8Y!cM;KN@p*NoyU%kkK4|KCsqumZJ44H_<(~?RO#XMJ2U#6C4~N4Ns>Bywr`$X zm}y}uboq67fnz58W(r9Z&b)LuAAbqC^=EJ#^3mSi+wIopQgoS;c@cC72{r~vetfj# zH-E6%@{*Cg_V#uiuXnn+E*|H|m}l7pGun76ytrI5X%l6`S67T0_AGHC zb?`{$`i3c<9kpMCM{<-FIMKpuVgYTngQWzMratE6@NFqe6WqR^C{9dFOsR540!Bh9 zd%fub*R^2qmOkEFzCm=_dQc@R`Q~0UUD&*Mg?5tXzZjuw} zb!lm7`u7GU#l}bQNl*J8Rm(+Cz7PIt9{yUDJW;Q}sl2MH>IME=NqKtzmZP;rv=w+a zOG@P?bmq+@hJUy-?A5uU$a%)^R$H1XoUj&uzg^IlEAIfDIw48$>Tr6Jq@Q$Z)!L1- z6qxBV$;rzHvEF9|cx|2QXMW_EVmCK81DdIpYe{()#A!vXM$zo$xEy?tjSQb{lbJMO zQ%RjKr+ugMnA?wXSN2_FH&4%B65sc-S&ReD^N#D^2>8g4wPXkP+)phIxO}9^q8bd> zyplXyu~NvB^!|`C6uzM1oAV}EEHjNCUxvGQW$>-qhnx96vJ+#NdGa^sLB$1rb^)A5 z$`%KOHUdMCgO&n8Mt|H{Q{~Ln_T*(AMvW$WDojB*fUY6gnQ%qGgYvANgTRVH>7AdZQ&zS4OJkzCoDUh}YmqAyz}gnHbee2+ldY%0OZF4xOD^Ss94__) zv~+O-9;OJW(j2)ewM8CYr(A)qZUbm+?`}c=iq6O~yu~$V{efgug7be}myMulXh0}D zG9!w$@LLk^N0q;GCrMIO&$NlPf_kpWcv(G9!buXI)@`5KOxO(=&XdIz)ptuMbuT!& zjF-oYG2(hrW4E21qq^I}JAylU?s0SteqRiFAlb?^NiN|y=YToj7&C(gjoX_6T%U88 z0rcX)<=Ct=O+&C0is7Ey34&6+g-$0oFjth6z_}9G%p(&bLEb0d$0z2|1x8uj8TLoL zroCiCe(f}@k1PdCji}P}8qi6Aj9g_V8T1ZZb0r*^01q>!@tV|_K@G=zGBY#hPQr{V z{$TQ0Y!7#>kMZvsI*clwVZu6*!kvP|!~}04LGYF$d}4`zUvP2n+=%(t&P2|x#^ESS zD=Py|BVQ#~fIk7gpR{vaUzP&}CuIUdztAQCgWME^b{TFdWv1s3xRjr1{UD^@orAa1&LDut@$92xH!F5 zd*xgvf&!#NlXgscq=|RNe2-LVf5dd0 z62=Sq(l_KBFR)7;RNiHKUo(Efj}4yciv-COoiZvZNf%)P-i@hsI$r-&V;4re>2FnQ)V%KyiW~ZC`$Je13v0p zlBm>R`RO+zJdAD#l0kTCw1bS9)1#8(V>qNMYV8mJ5GL02GS*a+P?hdmhLfNA z-buO#p?FVj_haP<`3AASmR5aoQgt|Q29zdP?Y*LE9Gt6m+hLT$UVOg)f zs*fBPnuMbhVjue}X#9AAsy|#w)Uqusc@m7=!R@4MQ{MRhPLI+5*ka#KPb<8}G(D8P z=3eVW)%)s5tO9#{c236Qg(n(kuSS>s^4_ZyVAvmgzoxvRyc`8Q_ID5AWqvh16Ciuy z3ixS?@L|1WPex!nan`Wq3l}a}fua`Q?>7GjITE4*I2QOm;^`bpxnODHaOc&J)2FtA z@%9sB%n$mo_R>(;!GmR;N5(`Q^-xS;U|>QnLiew92L|l>Vi$bZGRUhL30!wmgM)nNp$&pQf-DNHK<*hDtcHK5bmmb02`%|Jx|EF4;KA3kE1L&2j@n zClU~KjYq>Rw3YsgbWm#XeX(_8NDMq@+rXUgA$k!7U5(Uot95!d?Gj{fZ~sV@_Mp19 zxpT*GKJ_7+zst0B>@N%!M>mf$Q2R>A+bi18Tfc!VhP`})Y@F)mgSJU91*_G4v48ba z9IY%$KMG9kzJ28RHouWBXg6T{ps(v6w1nRxMrn}B4WWko;%f?{sDIH^X;8Pe^8z#Q zH~ewJpB9PMEY3fK6`?+_MxF7-xot$8{(J^OA)QLTUE3TG%8VUR@_`%`;6lvbbdH0~ z=H~iIP@>-GkhyDtihCfYE7ZP>d*Gsw^1qd20{Ynnp7mH~!usEEInlgQ%%}+eHlFct O0nAOU;B_V*N&f`-A1Sc_ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from OpenKeychain/src/main/res/drawable-xhdpi/icon.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png new file mode 100644 index 0000000000000000000000000000000000000000..1f96ce37b58e00278169d9439545fedeed43de43 GIT binary patch literal 2378 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 O0nAOU;B_V*N&f`-A1Sc_ literal 3458 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 Ty7nF6_e+44g$=sQ%r)xYNU~hq diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from OpenKeychain/src/main/res/drawable-xxhdpi/icon.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png rename to OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml index 09a31b4a8..3f131b9ce 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml @@ -33,12 +33,12 @@ android:layout_marginTop="8dp" android:background="?android:attr/listDivider" /> -