From 6b2672ff7ce2693634009b9377dcf3c4c5e177f8 Mon Sep 17 00:00:00 2001
From: Apprentice Harper <apprenticeharper@gmail.com>
Date: Wed, 18 Mar 2015 19:12:01 +0000
Subject: [PATCH] Fixes for the plugin and Android keys (help still needs
 adding)

---
 DeDRM_calibre_plugin/DeDRM_plugin.zip         | Bin 337869 -> 337969 bytes
 DeDRM_calibre_plugin/DeDRM_plugin/__init__.py |   2 +-
 .../DeDRM_plugin/androidkindlekey.py          |   4 +-
 DeDRM_calibre_plugin/DeDRM_plugin/config.py   |  65 +++++++++++-------
 DeDRM_calibre_plugin/DeDRM_plugin_ReadMe.txt  |   2 +-
 5 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin.zip b/DeDRM_calibre_plugin/DeDRM_plugin.zip
index 01a60f50a69d97850b7b16c32e171c0aab13cc55..9906f05a4d65cdd9d8461caac9ad4699179cc856 100644
GIT binary patch
delta 8744
zcmZX4bxhq&&@Sh|!L_&)cZwE=q6J#q5AIOhrRag;?)-|o7l-0d+}*8saW7Wv<GufU
z_vUUgnas1<$urr_W;4%@P2kl`;`!Huu3#Ac;?B~{tv~V1FyP?ofBJ*a(O?#cCvNBh
zRd|Vn)g(B!xn}?1@MiT4)W|HSz@`y)VafKbYHELJ8N}}7Hyf1_>sO6zIwVjy40%lQ
ziWc9%56KB$x*4s8u(uaS$h<h<$BG#AwW1EXqKbbayd)fT(fWE^+fuLgh{{zsTBSUA
zSb{$dQV;z7(1rBVPxSFzZXV{l2``d0`9Qw1zOo<u)p&3u!hPLSiqf)HVCrp4_nRrN
zK$`3o0M|gBonf(2fFu}04r{q)ffnPI%B_?JPJhRJuJ$w%J9KlSu3G9E4<UF&iSC$`
zzSV$rD&f@hEKgLh?Z%B%)?2!vGf+Og-As49;;aiTv?i?diS>?^z5+II6{4MR$W6*l
zdqGZOA8495w6g3KDZ*=yv2}JESo7}}+YJE_<(p~dAA#sK@Awv1Xx=cNJC$vdOk?lV
z3k{ONFvdsz=!JNm-de$H`2jxXhRbZaX_6P0ak|nEeluqb{inmYv!i2+wW?Pr@<i_Q
zbXd=YdG<9yyL4)U|2k|F5Meudk6l-^5@RH!V)G9`zbJVIVYHx!79Wz>pj+H2my$K+
zG164#tHsH<n_CvS>t^(9p~uc6atvq|G&b(1ZgwWG8Vi(oLj=*pm%vT-WWQzLS!=`v
z6N|=BJzTTm+I%sVEwO7)1b%<Brq}0x$H)X)4nS8wF+ubo7lmn;JiKe-ZN_BnWk_&Y
zr0Sa=Ofi9~toe<Uk`Ppw<GhzcQV(>3ra%SAshC;8g2>_SFm1T;!N9=~-Sk-E(5aLo
z+OOYZb<z||sj^gWzALsLJ|*=RI<GW1>aBKDea`d{n_WiCB%2&1-Y`Y%DB?!$@VeVz
zSC)fEz=MN>Lv9R-2DxIw{=6Q{e(8|eRbn`}>1H@Ml-D^^2YU;vFKmvUC;Hwlq&(O!
z*~A@zj$f)VP78y(#fq8gt#Uvl(?xB@!e6p8$OP6?y}3DK&&E$>1v3?IT@!zTkkS@C
zT3M_bT6Lai*Vev%VUXL(Or<zIKZod6%*-(QJXDY#|MBKq6262zp6{@YO!ti`oe!@#
zv_H*L$E4T_>YG^+Tpc9ck7(c(AFnDY6@NY~@)_#ELn)s5m3_q_o~O_Ic)3q{v(-bj
z3OX1lCH1mDuAyO$W2Iq7`?}Tkl!8Y{hnv!WnlZ6@zZCS8^^wX6+%vQ1f%k#5LXXy<
zx|#H@?t84b1W6U_tmBCwkm3h3R{@29lA6ZU)QoF)*7Jrp1DU9>ACbP#c4a<#r;p*|
zWwg*X==oZ*<Lv(6BXR>Q%a2%Q2~{iLj!{mL!orFqxHq-HQ~ciuXurf@F;M#(21D7I
zuOH?QB$qe0gC2qVv@etqIDLMENZXC;TZAqhvP&QySJ4<)e$$UIp%*ME^;CarUdCSv
z8@E8}`e)MwCC9MzX_V)`P&Cnvh>b6>YlsisdySj#q|D!i0*4ulZmqVEK@o!jLyuUO
z2Af)ur3~qJGX06OvE7f~DA@8I<?6RKxg+7#O?oCCxg*|S>Ro*F?T=u%Z|wD@VvCmJ
z8BrDeL{@SK>lRhv`8%K6`giY_JP^EC71Q})HUEqb#WNqjH9O-WmoSq7_l}5;u%Jp$
zsW(0AABrwyDVzcmxA0HGbkUaI*4NcYVBGaE)UT{(YKm{&*VB>zgU`7cEU&|-^X2$%
zW2MKyIqQT1_OMph?wb%4;xZhFUuuo2v!PJ?$<yx;cGY&U<V14D3XPUGVszT^{*sgL
zpMBA=1@TCw7Y>P0Qa0VPj*ik8B}CCA5XHV1c1#Qk$9&Vlmyjizf_QcTQH!Ra6V{S9
z!;**EdkGrbSNq4%Ti??__z?+-;);HuDT<@6unxbQ3J3dt^kE!s4yZsX-^dfE&$q0z
zysV^zIg($<Ok~N&o?lto%IdUy$!LBTCgx_;Rqpng1R*_{>Y@rp!sJIho--n`Uut$o
z8i)IN%noUUG+KA3nLLPAEz7MnR+!vnBV6u{-8T`gV9zw_lLuegN*|>`RHLs%IN`pn
z3So|MwPfjefs6;CCvWJCJ-Q6IxA!=bwme=WU`JK)C2Fwx&kdy!9pc)lM3lw_rY2Fw
zAajsF@+0Q7TMT8As=Y_InkTdx?@9Ti3hQAF0S_DDZc`S+8GciLpO@&luzQQa1^;=^
z`xNQXLNHPEcx4z_4a_-B@E8d*)f&6{dlh()?O<Lw!c;_w7{Rs4dsy<%Hb>u|xXvsm
z*aQ=lbcX6D%T?agIe8M|;p*FrqJzWJ@$vin=DILyj)&dxjb|K)@C_0F*-6uFC@y`n
z`N+rQ4|{|M;@_P=`8Y1VP&+EU`81p1kYhd+c%Q)#E{b;7bDhX2$N!M7vG$Nw^##Xl
zp`lP1`7sgu$`wz+Fe}%q>_DXyD~Fez64rR@D2#Ql_Yb79`Bch+@`KBbVc1DVj`tnd
zwC^v%)xg2K7Nb_dR5Aq_Nls_;nn>AZAu?T^`UuY5=p$5X9*M*@qq$_~lFw<L(y3Ot
zQD;I)oDIjnvDI$glNc6#Lx{-Xo?|LlpH)+kH*;6P6TXG!9NJbRStuFQyGq^$sliSb
zsUwyo`7q6yy@|$tHQc?67*FVG(hwx#L9X0(Fas1zP88LQ`i9%6dlk%;Ps<4sTl4)o
z=;@~?;kyQVjed383T$&SDJdV&d$4QokF$LYKcpYh%vWHx*3Vb<^pK23{S$+_i?o?K
zyYMFsFX|_?%cjmp1{4fbTTQaGgAkYw{CEtrnurc}Kf|fdo+Z13StD0af^}g%n$@IQ
zVUMcd3RJXr7RrOgQEU?Xh${+-1XIEfB+xo&+Yn3ejH!|YEtXB;C8udizwfLvi7U=G
zh`}VM%L@(of-gQc-G;AV(!gxn?<LZDEg){by_-?s@Ia?4gTGVMm5rnOI|_zr5{xPv
z#p?4Dm0Lj@?OUH>wl$5qk^%8wZ?2hND~U)CO$?E<pOx603$uhZ;p#w9-x;2>_2RaR
z2Sj$pEU8KOIR`-0tkiVmi)Xl8%~iRH5KAVG6x(V;qS%-|BacskYev(;eVH5eGLFdM
z+Y$koof}tHoCCATJQzm#vgxoT<WC3cZrXWE;P^2jjMVB}AyQ2~89vF|41Et6RkajB
zABjWKt@lr?e$inqV|0X;t^$0_Tul^^r_1>1UEj?)<!0gXsu4%@Fq?q`K7)Q2q}4&^
zB9l1?{Jjh3nx`&sD6^^vR*vM9+b%87)~NHCb%ZG~XYO%^KkGP+6Kk}b<Dw#6)uFNN
z*IAv9i#ck5m?%i8asU?=<o{DkqDSZDUlKz-#+oD@UdtYpk0`=rTc`!ax)p|}v(~Yp
zN@`KqzlOkG^&a0YwUUj{3j80x0(W%4?^H{NWleOZCd-)s;d~GYh#i3DgQ)o1vMYr7
z@NXskFw4|f-W7?_Lgh$Rwl)~{ZU?bs`Wk9%DN~W|Qs?RSaZ`{eM)3=4RNz?4XSmjZ
z>etn<`&@fvKf+ebg|iFHoOB_{8$Y{+UHSXro&5ukb2O3fD7dWr5+s@3&tUW6h7rN<
z4zZ}@+*bOb#EpZ~UCz@jh%?k9=NX?v@xK#z_62xNcic@=W8~*j75gd_(u&h(gv2SL
zG1Cd`9y?6iEfs2%30&H84bI(4Aa#9Qkh|1_Ni40xr%r4~ExboIEQ+<r;33nM)^fGp
z{3z&L@&P6PQubZ%l@>z0=!i<MVH{(akK;sFZ2f8BM_taq!O34TTt3OCn21_eJ~+$d
z`B@R23TRXI=r;JcA$9ex?QcNu46{SZn-W1~anr8;`-~hHXb5X{AO!6-Nyl9dR1A$F
z7zw{cP2Q~Y*`x*@i%8Nb2@eAGws-hXW#624J}grQDWKG6)jX~hy*tf3TvDWhdX@O2
zx9Z6l{SUdMRZNorv3opdE3GfEwc${}sL0sqQ)AT^=Pv}YQ-%LVRvebl;zcLXH=DD+
zv7kS<Tw^^P-H3V=($#i~+%XXIbHwYkzz#}`*9QyoA_ullP!Bb#a_j*`LyH4$N$-Ul
zedBJ28<Vn49R4@PtJB`dE)z8esQXp3;Kj0Z)T7`b9-@HIqSFh{HiOUTttx5_ePmbu
ziBliKg+*%J*#rmT{vZk$*Y+n_CPRqk#f=(+jhEc@BQMGg+_S*?yVC?^ZT^#uu=CW+
zdYOFE@g}0b(Co?*?8tN}8Kr~UE=%NXmeGms#LcGU#y3R(x4zSEg8WKSF}arHFrO+_
z4KFK}2sPLpHJ-^I#vc#a>S{`-Rdcd5h_hkKC)C@oicFHlN3Au`si%c62Epe^MGYU!
z61gBwWEUfkCC!k(kHz=M^)=Ff`3mLt{+^|p2>W#!cRD?)xCw{+Tb?m%)iqGeRUT@U
zoS8pVkYxY1VDT7}i?Ewb`6>Mn>bM{sZF(DAs1x7Ak1fR*Iwbj707~w`HgW9Vt8qH1
z@~zNSVIF#ra-JtyNy!lDv@t~@GF}xe(!^uzv60;ZKcX#zGi!Sy98fv|<I>e!Tkg~f
zpy<M$-}y;v02o}(IQPd4850$9<FW`85QJZcsLD_zCnZK&De*HW8bx+0___UV9N=8~
zarorI(l>@EN=9}{@nPj<Yh$1_aQ@OYl=Sj&80?3Rtehd3PesJXBr|MnO;EON{KxZX
zT<_Ao!_lA?kt@aisq?QA%;Xb}j?nKz*F+~h?(q~H31{BrZYXiawAPRE<*LOmOo;7U
zh#|I)l<pU2hQEl=Sj`P1e<6r*Uhqb;NQ<)`eIUNtcTEyQ6aM6;;)S5r@V)R?d{m|%
zjtXEc!xgw8><(oaVcF4NIUepV_tIIBM2(w%oYjebQ}b!m_s4tjeAp%A3%frJ`!$yl
z?c>`t4f_o}XE&P!g2pL7u<5RR_cm#WT6nj4uINB>_-+DI=dbCv-)sDdwa?#5Nc5!<
ztKn<ck)xz)3+S|mJcRM2Xp=pf=fvF1vQT))ei@eL&q*OLYXu%vrK}Z(P{ig0^>G$P
ztgIL2>+L_(XTI})2E(c`JE$CMz;X?mqnP&s4W~h&88`CV%uxP4aX1TobBcSO3~v>S
zi*5`q#gV4_#<2(DeT?Shw~8KRt-`3E091`9$cri=DrJ*F5f%;iqwY7YA3?UWmD=g+
ze$ChE8WtBhYsinN5mSSk`L+=8Nd*+)<Dj>i^2QgF2BF!u=dj15qFya-K`&H8Ty=jI
z5f=fkN#CU78t;uUm9Nee%svh>enribr7YmSs4Hw%yiuwuKb4{6Yx5y1*A88++LF3_
z!S4@*6Dp9$e%VYTuOq}8m)o&ZiGBWeq|Z&D$`qsh+|$5n35M@DIo8M7(X9o|YGh>9
zk`C&Qf2}iY$N|w(5D7F~pPr#U$%QDMq;D2D7t)UEAulJUbea2yv?K16z*|<0hmniz
z2DiYQuIN5J$5=!&^}~cAB36x`qqxYu)vzgGROmQ{2MIrbbH`hj%~u)6YaSlOz5}Q(
z1>wV}EZ1tku}8X8T&P;-=rU|7Mumx=BH|+=n2(Kb#?|sNIFEITSfZAQ{is@>Ul1K(
zp-dOK$hc{;_V|a8IT)OkTIorBvSHs)DTJtZ#QT`%-4`t&j=QvrfGBazM#Ir2txFSj
zZEhEhC;l^}8%=ZGOySttuEfC}$!_07i@OZg81)fsu8Hy1Fs1qF%)Rj7AB%(7L*}<|
z1t-oq0R><#WJOS<W9eb7HzkVi>q<HTM%eoDO$aAi-oz}LqIxI3AX3BxA~-(}9oehY
zsbV_*=qjHoF!*W{PyH)R@D~dI_<$6SP1ibZumwz!3dJXO`?qh#r(YtO>go0d;v0G}
zV@uk=H<79DkkTj5rLJ4db$=na)FFIvfiu`ONvm5k95$MBFnw!c_Q5?`CIeZ9z1%%7
zjZ5YF7m^;rw?5hCKPn-g*gth>APatZeVk-@P8o*DE*in>0}o}x+-a44b<R}owb|>;
z)f1~hY|+e%%lS`2$x|KYlo<ZPPQ)MZVRbXZrqw3RtvcPP@~jZaf2zk|slb$27;&3Y
zM2T5X-cCyC7LAH@uZnec^!3hau;voU0SNto!Vc%`tagRBkOy;Fl+L>xXV#pJfgs5X
zufk%14o%i5Mm}7%{d2V4c`xQJb=1InoPppMO^rgtAXPGx^jzE2HHZF?hAcWF*!o*?
z)k}WiUBaHUEhFfT#F_h%F4^TIe{ximE>EzySca)l&fu)|&RVW|h0wJvwZ>aw`pv}E
z0xzciSW#>G7r5ZWcxB|SOJ-c7U;sIT#dB}roM<G0O7d8_JR?+~GsHxqM1^bUqw;q$
zxi#Dctho}?pB-$r%Z#`yed|-@FgOe`--abW9<o_8<xk7<0`R-pOSE47v}Vbp`Rrez
zNY5Q8V&@hX&(_CX;0SYcY<m!d7u5f;{KG&<1WJgy-8^I3W#s1?K7(n-Dp##Xh<7vm
zrQS8oS<1JCoG7L8<@Ty~J0h*DD{2bJ2#v!CE!egNI@3HG#jRPV^oOGRFuu@TeVU*d
zvZ$Z!cxbDT_V}#bF*D^%tYHGzQc9_<n}54=iFt;3UJhS>;Li-1Q0UHxwtq5ct+r9b
zb&0@K{zS<C(UzhG;qRFLu11Vz&>wS^=*dU7{`DogUoj_%ets8!<o~S^nyBA@8;8)w
z%sAQgWu3sLjDIR6U6X1=B*I|9E(9QU8QrMpENf1kkSs}EEa{3KoaKNZlpaZ`y9`V^
zzeZ&!uD>Rp2a6bISunN#_y?e_R4O(1)+dbi6IlhpQ1Du7uz<=Gm6uXj#O~C`!I6~m
zf{uNs&Su-<KmMP#wbBee9C<R^0n|y<GrthO=AobCUTBju*a*4x^TGt&H9dMi*Q4tH
zRNGe%25y%PZ<grbYSz-=S$d2gtnd<j^%xqj9|J!dlsJD@v_U&oFgi5DweJO`n}qJ?
zmsxE`NCpP92dH^?_k5!MI4{fHh<vK1y7fk{*g|p3c*F~9s6wJe(+*>;!DznF9N0r@
z^xxQZzwz}(EN=Nx?hUIqTC3ii=)*s|3=#EgxD^p^(J^aH!1$Ku%yXYUEFt?3+KlvL
zrBRvRPeQ0UolB(J+DcLcOL!HZ@}`1=pE9#@omkym-r=h?(sJNbgQCstVkYJ?b_suG
zYTMpA7C)`Vt^4D{F{T+FTLw!0J4XMdDYv<}UKExFgy|M3)*e{p-%V|G%1*~Qan(V#
zRKi@TYzcqILtcKSSi;KU(0pnRQ~|9T>yv%Pde_<M+4td5)H<r=Za;i0>*^~1#V5EG
z+UCzVDt&O(S+(QcCi-1h0Jo#gCtr5Dyi`>CO~P_i^3Ps5|2GtmmU$fYE^$wE9@3RJ
zRM+lS7lusfquJ*$7vlS!x!v$oMZDc1xk2cxso(nC1oz==YZaFq0^F%iLAVj$H-F4B
z*EoBM?lGw-mfmIJFT8g#MJ0kqWPgVRkpjty>9TCw8e7<BWcmM|U0}y{i4`#I0=bKE
zr>iU4YZTSDEASu`kxx@6b-#LWc*0XM5W&6?y2ANzvq|tU;vf0vE_fgukVUpVTp;`s
zUl-Y)eL^;RHd?X2G*&<BAz!lD8vrwK^J?@Ochs)?5LY_3&#8_rB_Hc#1q&_5&r>^n
zmaD&L!>jxe<>xT>3eDvTVyS+6L`NU(f|eyCR78v|uhJf!LelAIvo%y7qdyb3D6-jw
zwt0_}AZ8Gjwy<6~<s+_I%_bZ!_I6=o=e@oSVo#sKDl~=NHcMu+swYX0J~}7H(a9H+
zq4O&=+^^&}izzpsP9@i*^~BGZyFUFJ{3hbBc7rhhoOv|THg7A_wPWh)6)w@2+^L!q
z-6f;H@XSy}8Mv-Q(!+=<Y)V`TtOCOM$WFc3cW8~Ub{7#W!+8N098*c#cAHZaq2KUA
z9V$neSDqB>2#3-W1?GcN1PD?LZ?HTW0wX~-QSIb6X{~jCXR@Tdh{6MBP)OSL=!=EB
zh6c_!QhUnE1}22`ZGr|q(9RrPxQZS#*ALAgZ4;1k39b~_{hc!YLZ|^>$n-cYTrYdm
zgwoIgYnQ5M$<>4kLdu!MST9!SxZC_OjuH1hyta{;Jy3R^1?d*#{@y+g)o7mBy_v#B
z2GwW@tNx||OQ}i56}OhfRqH^jcaO>DGsoPzH>*qc+x#*k5D&|~ji4p=bO)!`BCc&H
zz~}UYOxFbIVs~8X>h#=vsId2)z%I^Ja+8aM)ty;6=~K=iiBnEa2X*a`{k@g>BRSi_
zOsh<=h9!lAT)W1PmHlz830@36o_~5*hV-N>bNQveVUerMCh*37c8j?{UK09mYGMJi
zIU%<Bw}htdU>RcVA%@lyi9MXewG8lcW7-W4s1+CS<{6WcBCjzNk>gs`PfpaJmhKFJ
zttsdDC3b`?ktKc78co#d;Z$-FvxppcTt6qmjmBAd5iw5M3z%bNPT(6^H4h4M8@w*(
z+3g|#7PsEKyx03SVDQ*wO^j!N9Q$4kEuOKBwn)z<vIL&lI3sw)1Wz|=>w3blk*M#5
zFh7n_>N%wDC_ts;{b_7(|4SNlszYQIMjgE{|IGJf@*#|N%gq~-h6zv5?t=6~14HXx
zC^>=-h;ax@d`iO$Rk2xtJqxxU9!|R0*Ue(R(YVBN1hs4&rPU@1^uE+@EumS%*FSC}
zqWPdo@+z~sXr3dVrToN0qc})7N6rX5Q;e@lW$Jua^^bE|qSnV-u7+%TgSk^oI-ALj
zpd-%zwQHOzxrbXM#!b>l0D2$6qDWIg39anA>ktfSq8gsZvRZ+&^ZwjhL3227Ua2kp
zn+?s^MtVa`I=6Eavxyd9t^<+744i8<oOH@2P1Q)Y+;pwJI8|DbZyl*9w=T{W@s&>C
z&}k&@L2P@@$;{DN&2LpQ3(ITkxq2|-Im%QSY!P|z1m%rjo_@l9xC(n$Gbg?CS&Peb
zT9Wck?w(Az@3t>tmfdv<FOdhGez5E7(U&p6<BaU&X+RZrAEKK15Qzp`OMr>%rayI_
z?qrvF5HE?gAvvW#In=$_-E@lII6x-twqBUuz~oL=GGOUfw`2E>+RwZrXBoQ`Ggtam
zGAUSdg?3>NuYD`j<h*D3AHr^`yM<rwKHwIe4yjIjJfKS`z(kp*A5t+jQD2FKwtnE8
z2>zP;_%VqcD!Amg#)<=5vxn*3c&*wcI>^bLzunzRRb?X;A(Ig6!^+0YbarWw_ab{z
z_<G|2)>=pVdlKe8Xy%BPeU;)sGko6Vu1?0fjY|>KkW`istXy>-<o%NQHWtdka0o=(
z^3DGplKPi?et4NkLsq-F$w0T)*p5>W+4zyenBAH*kfFbk&&m~6r8y<kik*FkH-+t%
zC_GTplisuci|$bgi?YFfFS`Edy<Z^SJk{GbO7op5+VM|*{&vo;c8N5t?+qnm%)ZZ3
z&E;h<fwJN!Sw`@Lsn&z#IA`#A*ugDe%xA33!NoreD~~(VSBdjle$ll_n1QELUHL~m
zvm)UZ&&=QW!VA$A4}X95TnV@yBht$4G#Fd7S`JhD$438@okOwSp)p=O(yJR}Bm{Pl
z*?<ax)5*U^_pj)vZ{S9uxP^69c=dfxQ|1sSZ+rI8>gxPYvH_?FAw;2-4WL&8zZ!gF
zWdnkp42pZQv-B`tHOFux?Gu9Z8`$AtUI_2bCmylV2<0zNe=<?YN@x-=9Un1_^X80a
z*SI>GTe29;5#zs^*(Me1TojIcwi5s<9F45lSl<L`{QRMbWY5t*T#PCVC(t}k<G1_1
z$742Nn<uuv0ttHI#DZYU*W-G%En+>j4Nl?~Z8&0WPge&NF0x6`8KJYIMzFcyKT0TN
zH;wn4;#-cU>ntL$iIv(v@7fVC?a&1mzE3Dv|4zHN;%rO{_0D?XeF@732)WJ83aYVL
zFhz_VOO?s5v(J9JM8lu|Zl1AuiZ*YEyN**awpZd2DmGzfXdk}{K+Dh%TQH1MGhMiP
zw12;+NfJ4mEW6B%<?ZdU_zpH_M~1WX$FuK7MHVX^B7Sth^aL&cx+`X;xRF^EwuMh5
zzKTw(g^1l&579!1Iy{w{vsJ!f|43Y4S#^;-+wU*oo2GK}_G-Z0Vx-eD7K3%4l^w?}
zQc}EM)e0^s$o0e9tnz8;%<D|2$=>66MlX9caSw&ywMec(Vg=S?`QNZ^kwo-$a#d#X
znHn3ZAQqbo|1?rc56sFRu3Z{!qfD6=3wz?Rs!OSvnCta_R(;%pXmImAig97>)B8GE
zv{ufpsZm<?E?91>y<O%Dx96c24P);qabL7gBq>SPxra6%<-KKBs3JYY-=Y4n5Fb%m
z_?sq*U$d2pgu?^>js*dBHFUNYI-Cy0!Le#RaUpIzI|xfba(+6?n+wUG?cbEi(5W;`
zu0?g?W}js05GuYy%{m^`KR9gMXH+=c_h@sKt)^OZn)0Z6?9Zrdo=LaCL?~EZUELIz
z^ZHD)(k~_(DFYrcA@C07VXTpPx(oIz%80$N=l9w)55AibD&~i&kvT{lZB2L=_qG4a
zK!rpWpZrE}uG$KA?Q1tRpim2_u5FR2Ne&KTw%6b6K<>YXgbcY{Jjj*Vnh}4_?{Zt2
zqe&n2=3&ogW_NL@!&~E2L<-Hn{n9S|m^(rLH9yFL$Hn+#RoXUEE-9xp2A1^#i-EiF
zMdF4qGCO<^UDPOyK;}ClF_Ac9@Ckna5hlm8d`okM`IBY+eYJ*(WwLnoPW(c4YAP3W
zA#oMza#;3N?yNWbVd-eDx|!?6B!lnD7G#Ce`6JnYli^Y%!%*)lW*_?#_2h{Xngen}
z`KY6x+6JX};Bw(!_xr26XbM!QJ`(_iX$(vQC%(_uf#g(OZIeM0<5j2d#N#H%HMe!Q
zWo1oje}4Y5ybsYoMJ;;)H-d2?h2a19KLAjV58+0vACl!!GX_raA;KU(fQ0~J07?TQ
z2p|$4{(p^@_En|*Z&1G4MLOtz6<gH*1Hr+8;E3Rgu_B9K6QU5lCj1LX6G9B(?I%D0
z(*%eaU?qm21HTC&5+HwoiU{HgpSKPI^w&X5Ko=225p)S)6GLpk6o-H>@hgufV3io+
z2}ZsLpd=7G(08DZ1Y!jG4bYQ9^gsbX;D0Uy*dTocR{(J`h#?qG4#*>e=zyAmr~g9y
zuYkc@h(0JDXnPAWeq}>W{u;#sKI9NR#HDL6oDDYsqk<3tH{`FB9svOgh#o>bHar|K
ziT{e$P`si8z+Vc8KA6=MP@{yHfR2Hm|2ZFkm<nP7)>j97sa{ze1ItvebwXSbfL|^M
zZvky;h$2|j6)2^KXn_&{Fb%{AEE)iq(Y$6tivoIRUQ?I>^t2E&kS`EP`$|<50FGZh
zs2z}}gBXChi-8|>uP|CGfI$z@1M_qMHvf6NZeWQ1wcap*nE@jFzxOcUzyQIga(P04
kGc>faw{kT!eAUta?_G(NlXfdN1_~J<)QA?ikk<|TACQ8C!T<mO

delta 8613
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
P1{;I{6^RJ)QqlhfeyLRP

diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
index 169c777..ef1e1b4 100644
--- a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
@@ -479,7 +479,7 @@ class DeDRM(FileTypePlugin):
         dedrmprefs = prefs.DeDRM_Prefs()
         pids = dedrmprefs['pids']
         serials = dedrmprefs['serials']
-        serials.append(dedrmprefs['androidserials'])
+        serials.extend(dedrmprefs['androidserials'])
         kindleDatabases = dedrmprefs['kindlekeys'].items()
 
         try:
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py b/DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py
index d5cb01a..fd4c193 100644
--- a/DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py
@@ -256,14 +256,14 @@ def get_serials(path=STORAGE):
     tar = tarfile.open(fileobj=output)
     for member in tar.getmembers():
         if member.name.strip().endswith(STORAGE1):
-            write = tempfile.NamedTemporaryFile(mode='w', delete=False)
+            write = tempfile.NamedTemporaryFile(mode='wb', delete=False)
             write.write(tar.extractfile(member).read())
             write.close()
             write_path = os.path.abspath(write.name)
             serials.extend(get_serials1(write_path))
             os.remove(write_path)
         elif member.name.strip().endswith(STORAGE2):
-            write = tempfile.NamedTemporaryFile(mode='w', delete=False)
+            write = tempfile.NamedTemporaryFile(mode='wb', delete=False)
             write.write(tar.extractfile(member).read())
             write.close()
             write_path = os.path.abspath(write.name)
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/config.py b/DeDRM_calibre_plugin/DeDRM_plugin/config.py
index 1714d31..1357b49 100644
--- a/DeDRM_calibre_plugin/DeDRM_plugin/config.py
+++ b/DeDRM_calibre_plugin/DeDRM_plugin/config.py
@@ -34,6 +34,7 @@ from calibre.constants import iswindows, isosx
 from calibre_plugins.dedrm.__init__ import PLUGIN_NAME, PLUGIN_VERSION
 from calibre_plugins.dedrm.__init__ import RESOURCE_NAME as help_file_name
 from calibre_plugins.dedrm.utilities import uStrCmp
+from calibre_plugins.dedrm.androidkindlekey import get_serials
 
 import calibre_plugins.dedrm.prefs as prefs
 
@@ -199,6 +200,7 @@ class ManageKeysDialog(QDialog):
         self.import_key = (keyfile_ext != u"")
         self.binary_file = (keyfile_ext == u"der")
         self.json_file = (keyfile_ext == u"k4i")
+        self.android_file = (keyfile_ext == u"ab")
         self.wineprefix = wineprefix
 
         self.setWindowTitle("{0} {1}: Manage {2}s".format(PLUGIN_NAME, PLUGIN_VERSION, self.key_type_name))
@@ -381,32 +383,43 @@ class ManageKeysDialog(QDialog):
             for filename in files:
                 fpath = os.path.join(config_dir, filename)
                 filename = os.path.basename(filename)
-                new_key_name = os.path.splitext(os.path.basename(filename))[0]
-                with open(fpath,'rb') as keyfile:
-                    new_key_value = keyfile.read()
-                if self.binary_file:
-                    new_key_value = new_key_value.encode('hex')
-                elif self.json_file:
-                    new_key_value = json.loads(new_key_value)
-                match = False
-                for key in self.plugin_keys.keys():
-                    if uStrCmp(new_key_name, key, True):
-                        skipped += 1
-                        msg = u"A key with the name <strong>{0}</strong> already exists!\nSkipping key file  <strong>{1}</strong>.\nRename the existing key and import again".format(new_key_name,filename)
-                        inf = info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
-                                _(msg), show_copy_button=False, show=True)
-                        match = True
-                        break
-                if not match:
-                    if new_key_value in self.plugin_keys.values():
-                        old_key_name = [name for name, value in self.plugin_keys.iteritems() if value == new_key_value][0]
-                        skipped += 1
-                        info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
-                                            u"The key in file {0} is the same as the existing key <strong>{1}</strong> and has been skipped.".format(filename,old_key_name), show_copy_button=False, show=True)
-                    else:
-                        counter += 1
-                        self.plugin_keys[new_key_name] = new_key_value
-
+                if type(self.plugin_keys) != dict:
+                    # must be the new Kindle for Android section
+                    print u"Getting keys from "+fpath
+                    new_keys = get_serials(fpath)
+                    for key in new_keys:
+                        if key in self.plugin_keys:
+                            skipped += 1
+                        else:
+                            counter += 1
+                            self.plugin_keys.append(key)
+                else:
+                    new_key_name = os.path.splitext(os.path.basename(filename))[0]
+                    with open(fpath,'rb') as keyfile:
+                        new_key_value = keyfile.read()
+                    if self.binary_file:
+                        new_key_value = new_key_value.encode('hex')
+                    elif self.json_file:
+                        new_key_value = json.loads(new_key_value)
+                    match = False
+                    for key in self.plugin_keys.keys():
+                        if uStrCmp(new_key_name, key, True):
+                            skipped += 1
+                            msg = u"A key with the name <strong>{0}</strong> already exists!\nSkipping key file  <strong>{1}</strong>.\nRename the existing key and import again".format(new_key_name,filename)
+                            inf = info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                    _(msg), show_copy_button=False, show=True)
+                            match = True
+                            break
+                    if not match:
+                        if new_key_value in self.plugin_keys.values():
+                            old_key_name = [name for name, value in self.plugin_keys.iteritems() if value == new_key_value][0]
+                            skipped += 1
+                            info_dialog(None, "{0} {1}".format(PLUGIN_NAME, PLUGIN_VERSION),
+                                                u"The key in file {0} is the same as the existing key <strong>{1}</strong> and has been skipped.".format(filename,old_key_name), show_copy_button=False, show=True)
+                        else:
+                            counter += 1
+                            self.plugin_keys[new_key_name] = new_key_value
+                            
             msg = u""
             if counter+skipped > 1:
                 if counter > 0:
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin_ReadMe.txt b/DeDRM_calibre_plugin/DeDRM_plugin_ReadMe.txt
index 6e77c16..dda00d7 100644
--- a/DeDRM_calibre_plugin/DeDRM_plugin_ReadMe.txt
+++ b/DeDRM_calibre_plugin/DeDRM_plugin_ReadMe.txt
@@ -91,6 +91,6 @@ These instructions have been tested with Wine 1.4 on Ubuntu.
 Instructions for getting Kindle for PC and Adobe Digital Editions default decryption keys
 -----------------------------------------------------------------------------------------
 
-If everything has been installed in wine as above, the keys will be retrieve automatically.
+If everything has been installed in wine as above, the keys will be retrieved automatically.
 
 If you have a more complex wine installation, you may enter the appropriate WINEPREFIX in the configuration dialogs for Kindle for PC and Adobe Digital Editions. You can also test that you have entered the WINEPREFIX correctly by trying to add the default keys to the preferences by clicking on the green plus button in the configuration dialogs.