From fa9985aed5131e8916111d1183ef11d411e47111 Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Wed, 16 May 2012 10:41:53 -0400 Subject: [PATCH] Cleaned Up code related to broadcasting and receving locations updates Signed-off-by: Ricky Barrette --- LocationLib/bin/locationlib.jar | Bin 65379 -> 64550 bytes .../android/SkyHook/SkyHookService.java | 11 +++-- .../debug/LocationLibraryConstants.java | 17 ++++--- ...eceiver.java => BaseLocationReceiver.java} | 12 ++--- .../android/location/LocationReceiver.java | 46 ------------------ .../android/location/LocationService.java | 9 ++-- .../location/PassiveLocationListener.java | 6 +-- 7 files changed, 31 insertions(+), 70 deletions(-) rename LocationLib/src/com/TwentyCodes/android/location/{PassiveLocationChangedReceiver.java => BaseLocationReceiver.java} (77%) delete mode 100644 LocationLib/src/com/TwentyCodes/android/location/LocationReceiver.java diff --git a/LocationLib/bin/locationlib.jar b/LocationLib/bin/locationlib.jar index f886d681a68d90da35088b67042b2a2523785952..ca2cbd391af5047bab4a0e17663d297ad6d37810 100644 GIT binary patch delta 10540 zcmZvCWk4KV(lzex8iEH1?wa84KDZOy0|_v=`(VK(xJz(?TaW-DxCD2H;P6g{-Tj{I ze*EdC`qa5~@2#5dI^FA!u!YyK=qmECaClHiNJvnQ8rAXW(y$I1)u1#){+hU8xPPC6 z91jrdbl~5>{4vy}A<`f~PP)*sVIe0!u_lor*e-NF(B2_V-318%9%4{^DG$UI#S`w) zYA_&Z!NXR;n-Y_g)e$k2p=skHNyk%s<=@-5>*42b5pr-q1^1YU{A$&o;#VxkvaYSh z@*W+p>-I?V_L#8X3UF}=R;RBm5;|m4COb$lJ6MjDq=iXgP?L9}mb4+3b=lVE{-b^5 zhJsXH%UWJ17TGE1i++9bAPS(MG?knI8i&SX&cY|PHeA$@t_zj4Jq~x9%b7j&pAIs# zKNLg006O|mThZW$U;CTPhDPQgB3e+;!l5aR;(TK+=?y*jOr4Nv)L2pP*1K+yCDVHB z4=)JQW0U>9xN;mxDS-hKH`RrGsCp_pAhyV}Uu8p;M!{hXNHkG@n0*KI^d}C%2JQW5 z2)k+w9$HJZEaN5=VfVDpq>cBaKWsC5l6yV3B4^pIsahVbfv86%JY_(kxo@soCPn2b z=kBY{5YJ`m5XF{CyG|Y^7+mkvWh$+(x&HwQ6)4K6c;QM)c;G5KY5}0@-3+S2oY35#Rs<}@jzO)NyQ37 zOfiLEVFd#P^&RfN@yxWcKr##bCt$i6Z#t!YBcd?nTiN%#+@vIdZ*$@t8V*D3NoyBE zlBtzEiiYBrJ{=y|rH8#tA)|T~fmj@dgolqGXNRH+r-64O)^`V`jKTU=HNNM{(lYk* zTtn&#>z%>z$K$6X#}^+T9uc9+v7;TD;N}xP&?V01TW@*lC^Iz2l>-aV3>1Uc^4Ce- zed_u8@y#03G!~2TQ;j~y*UhQy<{19!wHcZGpvI$VfNHODA!6`zB()A(-L)`}A%ygW z|4(mWUI7uYv){!b30f}A<5_krQ&niVnI=m}!@C!88D#i;bS?bYa~VWY8J~8JUmQeU zNH<=fRYuYvP{of1>fHf9wBW`!`LTLrwdr9LSlIL7@uF*z9^vr4F1O`ZpB}My5vcNX zO6}|}H!c2P<0Lbe|7zY?Bt1cqmfoqCi{T-jvq9>PS~zfN^V@;Dqgyy&# zjud7c?YY~(4lnen$)3so?E%)3OiL@LPjX>ziFOX9x?6DP1VM_40fiD1Educ;G8H$y z6xyGO=$!N7HdeRf?XB`Qt(>aSLN+L`WAJrp+-;f6v)yXO&w_73nu^>r3DEcc_Ap=2 zRw7B@XviXyTX-{o9SBHmlHD%lSgE+`+!n4PoS%u1yyXB}T)drLxt1iQ}ylpX` z+IWr0gNi*y_Ht&NTPK7~1*HkKeKdmxZ|dq1qeFsFHT4f^4Q`oKy!731IZ2Q-E8OYOhsCF4%pVxOM}j@3lq!u)>IVab;A1;@?^*3 zzkEtLubS@2ivDr{wOl~+^NV|_)WJfjUfX1iYM~Yyutk@NwC4~HPooJvxUI9KU0Un~ zvqRj4W+-?aqE@|s_Y1-&AIDOTtP{0nYJOGeR(rk9L@3)tl%g_FTh7tGiBx{6&5Vv{ zuS4@Kdbs#Z!@50w>s{Z;ni||Luh_)1-L>T)X%j?nRlQcApN zguEBt329+JW*4s$J6Ac?9SsZ>)t$Uf-ubT=0$m+l6(%y)6={FANpnjdNYrit_fwswv6z^@t)ZC~kBeMQN0do+(A{jMVJWm; zBrrDd!_Rju?t(wg*zB8_GxHf(MlfZr8DG%MQoD>XjMNd-lPla;2UV@^Ye;9{tn2G= z4F@m3WnJ-<=;l3ThLPh%+Ja`0uqUSgIpGm}Jh2a8Dzc#N+4I%zzB=*Ypm7e5Rexn6 zcbuK9D`@OxJ3Q_sH+kT)j)=FEr2NCd@+(kwdc#EN8^!8?gODt-?Na@{grn?Po1M%x zvM*rDZzcG(hiZ+yGWDUU)SHwO)cb^a8UvYP;q#Y$YEK!BA zN4RbaAe^jzM|=9@i-R)5nLJJPLVb@bkf=&_=P~U)G?2zv1G+@@CchoAsWZBh)(W_D zN>XMi&A5w7%oUmv*mnJEpYN?f z(}xE0^>Kf;F*U*^&)w0KQ*Ohyu=8DF*~9L4q^sDb!<&tLz!PbY#MbuC4%&OfDwXAV zlF#p5>SAiQ+;t1{L1)`i_Hr{a9sNM;GDJx<@gjs7N7VE~kWCKja#gCAxLI@y3}T)c zYzg4&HGz(Mm{5u9tnu27d4kNVd3XDEn~jmnJ)*MOK+Sh5uKSu+@(0zLRBK6xPuj4b zi^_N_w|6z04L6njZhj!o&-Q36S3cJ?}YO3DB@-BMyI z96Ei@I4uHTE!JWEe7UNl4`9s&eux-vOMYWeE_@qOEme9x?U~3qi5SRTSwDRqhUoJ& ze#{7{pbZL;V&FptIzb2E>i9HDE=hGLx}jXl_A}7T#A2z>Usw+~6D+0SRO!98_x}-a zmA8)VrkLw`N3%?jzljW=ae)N%t{AKL`vUuM)&8<#UAL@?UZ?XG<^y6t1-zZ*4R`W= z{%Y=uVeQJUc`nhr_HY$DN-`flWUF5qz03-ccFh=t{9M05V*yIU??%f`S|@a$P%@Do z(VS0WKvvg=+juw&KEj|`0y95yc)Jc$XoO1`bE^uzeQd*6L&LX)mz4>?cmjV4X{-3U zF}jqDz?Wl^hzLx6?gE`{){=0oGHrhT8L;b~B%i*~eiPbfrjFG*apD*9v;=%Z_T3i{ z@`#VTmI_;J666c6Ipp#hfMa>tMi}S3!W}F>M0lLlz3J_;38Qb&$qj3vOd-mHP}^%s zxP{Zyckxmu7**yIyFf=Zu=|`6G3=LiDz$GB^`i`db|<1tZ>V)k+S=}I`me%G>7A$k zTCpKFpT2M*c=IZ*ZXJHr zqjTPmfN@~@#d+tn{nn`u?g+U-Y0Z%IhxuV9r;rCzbfYTDk`i)V3Q%X+L>6OSL4F$J zm+$brP&!pzQ~6xVyZ$aEOa{a;S|zqGh_KWU~z?AddIky(;ig5Buda2;b%MNEzps>kw7U&Ug(H? z`-1hCAm&=Qj_s((eKpW8yT)oG#}S#H+Ww)`Z)H^B29ZIFB9G(LDR?7U4Ucso`vh(1 zU1y!=Sp3Xx&|7LNpK*G+)B6!8-?r{A(br6mQf9D^F@$6UxE8O8u=P}<+TG6Z}DnV(68GEzz}T( zf&OjB#}GqSjU8IK-AjRGKI>r5W3GuB5zUjd9jxLliI!K7n-qF6!5j^ zI!DeIs{K%mH0itkDD?5F$CBs>u-vc`lTYI|@o{wJ#-zTREjMkGxvybqPfOOBOS_6M zO;a5Wp^y`e%u;*3A|{0@fkCdgT zxSs62L8D#K`-mt*6i4IK*ZcVG`pmfPR+>wba+P_dn)0efNP&82fgbMiP1Q^8!`>zw zQI~k6A1uV{B9aReWti2f_}qks_Wdw>!kjhK1Y_=vKhlQEhV+@?GhK@+Es%Z0xXrKqwRhV}KF0U#Gb`i8T7R(-Is?KVF(MwM@_G#4+Y?%8;kG=; ztX2jsq*8u6we1)^`9-09uAKk&s&)lKP_;+zN-}8o4Kaa)BQcFIQk#tZsmDS-KcImB zwtY}z#^IAQ=v8EE(!l3mijy?8gYi7dXUG@0BFH77h)9?wO`*!zFZeCr$fdRwXxk2#qpfK=2`KrabyP{HK6?o^e2JZllQWL5n zkg5_VNdJPYjt8Ls%$Q{C437O2W-P%5OT!FS*F9~4?F<3YzMx+R)|9<5y9fWX|(fOV{e}6&0<*OB! z=c{rZPkOu6tcbVbz=T{bw=X`*IDQjI-bb@SiQ>E=ZjQ>t-)Y3VTJ|W?6+)(5XIwW? zLnI33O=TDvb!nW$LqoWF$~QllcC6S&{_<;V4WKM~<*p~>ltjh^IvYnP&eDC-#5)~~ zq6x|T_9bWlttvlT*WRMDI>(Hpge$rD-lY4rLvD`AC(1YcTEGGO#aut}7hi=y&{jI7 zI@0%vqy|UsQH5ywRc2amUgc<#OO|6V#KgtB7PpmAYx!Dp-Dds3wdC_&&~dZVA}?}Ka6vPi?%U#FdIXO!*My4Fp8JemMBh9)az4qa$#6yKgRjOQkx9?uamE*ktsb86)l~Dj4A7hfiDn)Y%V}6bX1$BQ}PMQ!Td582<`qngsoW z@HdTCiAc^8Jz-0=esMeOMy`r9f9ash)Ow9x)wn z4;DL^{wLM3qc}jAF6ebKmUz$N*S`%}wjUt55Bj$O;2{5OK$BzuIe8)faRV9sCICG+ zEkSNHOV0eyDNXFj^jsuqhzxa3UKFShRZT8b0Vvn=7E9Q+w1$0N=lDvG!UjG+@1>^~ zcAuDLb>EeJ%bwg~5{>5l>n>7}YiQp@K2p>OM|YFixjL({v5bxN^F#7Z5)>W*qG=eP z!+_Xqn*z|C^Mh=j+V{zKl-h)kvJY}_;n6H1 z_dv`K^BNH|;$7oO`rn$W#T+%~ee5Dj8w(PKSbC&t9?tqWL!wqKyT4p6HPB1>8Psn6LqCVtA-?baO+2z z1>~k9`iH4=K3Pc5)w6Ayl5o-x(BBp^b^~40Ds*_1_%xTIV4Po$wgm!9Q$`zU8-HtJ z?dg<8QpfA>Aq47a$w_>qj5WhHOU`I`CD0}Gok;189-<@xMy_z8{p8$BrFXl?4!iI^ zm<&ZL#=Fra%hFjKDK3E+#%z6|zrJXAguOd*DUim=_3S(0qa z_lW`O+~t8?d9rG^W`yYdcV_L>!V^2jKxMafOlFiA?#tl_Vs+(M>k^HLDYXUs*QpXS zxQhKVS}HeAuPLn=a$~4vM8#{jVJPPD$T<5{P&6pHdE&^zD-WX?RMyaEEx#7$Fz}Y! zPkZ^)1>oZ1M{ZWg82OetR8FJWEAXah9I4nlRw@G-WnYxRc}XS&tmC+&D+w4mbWSS> zDs|6kQiXN|ScK=_el2Qq7F~gACQsjgKk`%kOENDZ?~ayUR~uu3hM|MxH+q=<;^ZL= z>wGTR^x?7x$)0f@3-{$zFQxv$+3m@+uJO14Dd>S%gdoj~fC5eo{%pEeI~p}m16~sa z#y4fa=q1{s8|*HZt_wGKrT}T)PCSIATuOhF;0Rhi-6kQk9ovXz#g7w zoTi6%JoD?sQX6O5tV*JhC9&Zn?2Q~`2&f_%;zml#s3G@!gpOxxLN7FR2o4pJ5BfDO zjA_?HD66^ngbNCfgVsbY7*lgCxH-3rYPZXPO;Cghm#Gezc15%L+?~oLUF;k4fYx0# zVT<=4yNWZnS%`%LnsLK?X{!4pe{yAgP8`e!Xz@;_m6$T$;&G{a=v#ipT6p0Wq|h?Y zOmtaB^fn=jQj`PqW4(V*frqL5`yhbUoA>jYM8?K|fZd5{d%%r@zR!jP?YH={HD=E; zAWX-2Yo4=_6ChQ(uW9rsW=7u6^OdSLg6M#Acm%c`jfA`vRVG$cl>m(YAZBc`S+3kv zUGd;gMN32ZBCg@ephV1|6#;ueA{;4`)YrYIhUV6b^MGsinCk1H(n0^EqHxPy*`zWR zJvJ_3tlrIlh~ZAPALis=y=_KwO3VZ)fY$LjOjZJ%XE}BH!GcUSXy0rOdI+@A<#>>x z7BuVzHWy#x9nSJBOyNn`7WlU!*;>kd|JJQRm^>KCq}hhgLD|s!_BxH{vJESVjC6qgGXWk6%iqZ!;sQsq?pd2db+kPe9`CYGpVU5FW^Ss zC5nKdB;}PEqDKUZXMRBNWqxzir7)vmD6Y3B1*(`R7d=?XFm}jH-W*VD((OZZM&+Cy zZ+vm&Vg=4}GktO`_dABUinePc`N+r}v9UUs zLj$Dme)mGHs^v#or^t)q2f=L?S3nMghW*#+=K)_nOqY%$OynG?J7;2TF|bi@&!~qX z&n5DHa3AJ5UkKiQQ$Q75(2bw1dKzauo;9WuaJu2w5Hz2ydCD&|LieeLWvcF-?l+#W zz=Q~4HFfpxduauzW7*oy4U1;D*zFyKpt9h1GI8Fbefd;z>8NS%c9Yyz{0D#<-pEE< zsPeovFF`+_imQZmD=jTEcmrlig`@#wo)g|I(sU>>Rk0i|A~^4*>gH2v)ow`{vpRV{ z!K|lke!j>6&{_mG-P_}@biKd9Gy5X95zQW&(~i(pI?gD1>VvPmhM1IWM&a+*B;oz2 z(q~$)KHOHrL9MY{ZUnUmjY9}*w6No{*&@p3bd|`*mU3=U+_Z4N#jdUQ^(PtlK{X8Q zdT;3SAw_MX+){VaU|Hj4ihNuh`CYclgv+hzh76JI=UBoHALir6O<%HJr3PN9R98H5 zdb9YV$QZ1cC927%AggxI{-38s2I{9|kNO@DtMn{&hu#EnZ4*{ojpjSRnq`;5!u{T* zxE-D`&G33LLQb+;GxL)L$+8Gx4W_omuG-pHHd_4YuVshBSxiBoX%b%KfTwqE!+^<4 z5~CIcfv2}$2Q58)>6o&QK#p!Gy(8sKT|y}n)DZzyYQdlI>d8Ae*-+0{gJaL>rU97u z`el`0_}=t?$r^R<{Nk_)j09rLm+d#-*U}F1KcNoBe<$Rx{qil|UOpx=lY7P6WurB7 z-R^9S0`(E084xHn=I6C4j1;^u&hBrq`VdyWeOr&5QKP4pHM9cd7~mGohd3IBJ*1Y= zNB%`2c4i&@>}XDN8R7E8=>V-Bq2+2Vx@YxmebB5~7`*_=@3m1{pgx{2(Qv(!G0T9c z1A2`U-9- zs@aLGc~glq>(&bYE4cih7eCrkyiW@2z1WRS6^a zi&mYz&K5@!#rVm_6Hv|t>3_}{-fdvIR^F2%oH{2fK15mt0h_Y@@Pt(08%B{c)Q28L zGdkkS3d3-2MZn?Vu$Tp42EAp93|9m zN4`=CQ&}1%NdZ+(xXGL(qFtG<>w{yn8B0&Q7;2Al%kN(8`&LrK)plFVmzFn_mh*To zv3sT`GOi^%;z;jtZ_tdjbdQX5#rSmu4LJ53uvtyEub6)IfU_K0A~+g5OFU^u7IL4R zLS+MW;BM3*GS3dD)x;+GF~msgj~$g#?YqSBBfP0hItPOFYK$ySi!4>W&D_#4&Vm=Q ztxaB~i$d4o8`DAAYgQPs_)0rmk>+TKiNe=68kWi}R5`>Qy;XcXt25WpJ!@{dhRux> zh>}|O4vc|C254zy2q?a>Z!``8m6)O?Gpd%?6uTouLhpyiefA7TQrqw6^^PRYFWOi? zUK7us>jJgrw~1=Mw{l@>abudI?z_yz*jwvt^V2A72d`Q1{`SQ4KlHjUu)&r2U~z>f zY3RhRT{?n)ugQZ94-^!LOo{1UJH8I>ph2(K zpqFRwL^BydEUFgKu4R!P1#TS6d+PSv!>-)$uF`k3;fvn5Rtw!z{CTi6`kGAz3)ZIw z@&8w!f^-mdt;rw${ks0yV3QsU^FPh7=$~d7By#%_B$3tg{DNNTxdVB5M-I%?Fi`&U zvR)i@AsOCAQe>m`Wy7W!K6W^_h_zUNu5}Mg_}A3kqt7hKO9FzDURTQ3oEOm1nEh73 z#M7e&bZC8r#n5I!!K*C(tHqC3Gsnkopvq0u#W8yd4=G6Rj)RMovhQM$(2n>g!OijN zf`0Q?D-AEKCi?D!14UkyZXm9jcmn0eUgf5VUxrJ?Q!zmmM7LQ@S!G!qG$?)IA?9Ie zqA>5s+jq=}I1H2z8e(k4j?Mw%Y#U-b{gf#VO~>8}rMwQEC$slPz7`=249j06a#*~` zxX3Hv{Hq8@SkewZ;uS<~=RV|o)5d6^R%dxp=nTuty+OpYR?MF_T?!=K4zfv*cR7XW z6UN^GOIRVI`#FG$gG0Tl#@~#rOlSw1DEVk54yMFWW@0_|ArnN&0(9(>lEtVNnQGGm z$#L|RihIliBj?|AGVG&~+#W4d z#m^G|W$*5`*hLkn%^Bsk z=Tk6l3yfdyo95OI$}F3+Pfm2UgVB&;uoD$B7fdjD%|dVU&@X91e74omTT~s~Uod@i zaSs0t4R>avhs~J5p<`)vbj;i0bqB3|&1OjYP%1G1U9*SGIu(d5B77kwu23c=82Flc zLGLzVYI}!I+}7yAndqT@&mOTB)_j0HELZ77`b<6{^C{qfek9R_+KT8dd^c0gl!5mS z-L-YNxpnt3i4#wJM*>b*Or;YqScy847$&2jVMJOxY2Hbv%cj>o>v}1FxOQ+=eX&FG(bI5h*UE+}MQtH&dDLl8)a-onbpo#~=y8Yo#=n(kV9ge!@IkM-b z{olSQD-+K$(;s>24;j{0*|UQ6b*C2w7W}acD0p8S;y=6(fE-^PJRgJqbzD0zhuCEg zbs)#jhvvwCQ@K3Rt z>n{gNTCf8f=;bjE#UCJ%H}`fFxE*Z;uOrJ}Kpc?ju`nd2_+wI-TXwJ;HAsX59khIm z1~DIk&5T?SvjZ0@i0=dq606p?kh(iClL45O;V;H(9x#{$EcGFP_<2!5vHx;-RtBGi zL7~4KuJq37Od0mJ}8M0Samu0}6`wFJJ^H z{!|JwgZWcZ7+Fb(+rPy{SxF+0@Y(YO70yUu@TLE{oN`7C2}75gY;+OK>J6SG;4gMY z#eX>Pfede-xdhKiVPcg2aftwgaDfBis(W0sRsct8j|l}O^%s}9`oA1lKxh}wJfs(- zFf;&&84E!7#|+`n==*qy4_*>QR46F+zc?n1LAgQHpn(fA2=JfMl;B@LDa${=f2*KW z5cC@qU#2s#_Rxi$8k+0V__RC>(+BkY(UIB2yfEHt86kU;{TcNKYt%Z{tBHq8{+@+ zjsdcJ3U{P1NO=%b)Ey_pU*G1=S2wgV4KhL5GjeG4I`z!gvmV&0HYC2Uf_q_79{m1A}0bz#kNZ zvRD9@>=e8xyx^_l_-h*F(-6w$Iqd&{Yir<6K7)&C{eQCNVF3b0S%HiXVNSwP^YsG% ym;k_O#{U;H>^cODwMF!wVDBGEp~2Qi8qmoOHc0Ua34B?ivyxI0Sch2ol_qK=Mz9``&-^ zKGv|hd)GdvtE)~`*V$dA_s@2IJwsJhcm|IHgM@?xBdb}Ph${08R-+c2i6~H?5DNdF z^F}qmE4V)wjhTov2+)%rRLp14lR1oOWGJr(l^;xUjMaEeqz`}sY7`2f6?Pnv7okm* zMFswjC(l}NHKU~7epFoUQvm3fIDzTmY@MC#x-lGZ=qNUID0_G>>d5QJd0a`OO#P0j zjK2T4Uv&>qdH6Xo#s*WF?#0nvM{-!?a;*9Ox~kyA=MY0rY?cpZKhICV^Wk^)1~hb> zSaZ1efUwQCdFSl=c5DyJAOQ@uqt_7ymv5b{cj)_uVu$h~(_yWY${DGGVpQ?4h`PMdO{MCvKk;OVs@uOK75z8~52lT5dc zn!W1QC;SK{c9SOKl0DR#HJ6k5rfk!kXo4_GI4WdV=>eTOv*l5N98}BR%l=wDU={D; zw3J;hd)lFS|1%##ZFM6J7V-4B&~0m9(qpy7d`Hx4$KvIm%+mpDH)_qwc+GY+L1mf; zd?{FR)cXTS!FrtQ1qATV;f}>VcECnq2}^`C_^J3sd*Afi-`|iEw0{vO!W&g_xM5&S z{+?{$0o)M~eV1R>@Jde64{x?sHe{RbMb}RMc$fYG{myox_T-G)*V5GQM9wxW33|>P zX*%`UG8-(a3W!K<2n})7urM&(&tPEwe`Nd#2{nqB;Im^ya0L}V{F2loY2!W>8yul@ z!ttgx91P3^{QvSgW~(AdNCMq zRgSNsd;TlaK-gDGB@g|XNITBM9JCc%zm(fMtMuWSJL6AULYyPZLvcDzHsq>E zLG}bM4~rU{)f6trSqxFcTfyUnKc{(Jx_Wt_BA8)|TyUzmHpyi_3`2IN{f-E4Bh=0t zH#=s3dEuLh2nc??*i=9p=?n64SPMfI$#m6w!Q{!s;bN)Rm3D`nEqwNz)Pe$a-)tPs ziL-aJ_$C(QjvHH|KIC%|50m9!tIK)+n{FWCfw?U-iuEt6E0`1?lLs_i^0Z z*-P{}ShlDxCe-R+DFvx7g?N}WP!e%-vCdwrRZq&Wi+Cx`=WsyOe(Yb}!Hv}ES5lwnVF>=AqSjB_C`MPnMI@z&vzl*GxImB95V7{zS+Vc+z{u2yhT&ptmhM;t za`Ai_D-$+uX6Oj_SFV7(ZaRjRL%X7S(@~KE$>`>>Dlo^X#b z8V)-6b8lHfvlMciytbFWA$z9tlBgf3W{+M|qmcEd$(~^HIHn!yJzwTU_!SjYyUkHS z{U)*=6K^bNa_5^_OfAzr0vVk+a&Vt8P=da8hYvUVZNIXAR-YDjMT&)ISLLSPy(nSQ zd#M42Pef=}B!kCowX%&wi znu*HPpuEj80P20ikOMxh{vG$E@{4PCKvy?gxh@AGV71(yTGD$h zy;?I{U*tTg2|x87=kt|L>}cOx?Hc=nCw&YI%KUxWdr~vg{RaXWt8h3UYfX zT&UlxgFT8+bsDHsu0xr*!_!!Nw(u4M(>n~?7rZvv49|bbdwm+Yw_Hb~nf1_@KZ@8> z86L;QY+tebqB%A2t9O`R!N_BCkI#5uq3s;2CjSF%^Yagm@UJ46(>AOo5}ns6PjBIB z>F?2vOFGBw6BftE1p6`Yu**1$}Ya?GRub4 z9wJX)bi_e~=~#y?*198lTlIsX=h(voui+)8oQRG+nR4`M&t7Y_)HB}r`hIkBj&$@% zLGrd-`8@}7NOc^QuGe8+v+&)B9VGaY$uHf`U??Ar^_iT4220_|OI*9Hx1b=}_lU$@ z@0M*+4Ea*44<>z$mzI@|0hY(1O`>?w(Z{scDms{%3+H~XPN#Y$;xrHTyn{rhnIz(v z_I$~v@?|gsbf)ZBmqj-W4OMOf$)A5D@I@XJ7(-pF3Jc#mntrvtNpz5 zQf7_GgX&)G^{9|?u32XsgB0Sb0iA1LI>2FKD~K5HC69Z=(y^J}$6(OH@Uc6)!6_S& zE#|#jQ*5>;Z2PXny$j~Dt80cSX^SaqQ$D%vYqkXOdAuD>BEky!WSe<8>NENxHOraJ zCFSz$%?~w7JL+zj=J&&~AN)1i9NxZ2Q`wYHx|8QTozrNG^LOpVd2=-!``kqV?d*un z=LdfShbdMD&OTOqzmz`+mzB7>y;Cu-w%s{w@U+ww#8xsXlFWXGH5`!C z$fnX{K$aK_>B00ThR;3TUIF<3L8Qx7X?(Q5> zX*=lNx%aa>@%P}d+FrDG2;;ta28!DgT)p2fI2U*~0S~bQz7M2q%QVa1^fkpo)A;3o zbAY=wEa8tF;oyGvbveMbV!@`a_lnxwvE;pU6JYo*HD}!B4O$IfZnwY9?~#dqCh+jV z;-|lqu+oOLY?n2|WiEBpghHT_Pp0$-zjG5oe7D=o7^K^72~B70TK9ghm;5f2drcUI zT_$WD#nMpyN5y4o4QTSu%i%Cw3PwaaZLA;~~MX7Do zZI-Cc(D&3g{f3fdE>XT&eZvj01i|N)eAy_|}2<9*>LJcBoi)-gZ3u zr?MDZ#mPSKb@rXlg!_7}=tiLbcN9}Xl^ufDy0$()eRhJsA%siUI(l8DuH1^00|1I%l& zHYp{kU1=r0j6>W|!BM6CD_3PhX!W{N1mdjY9eFA1qR{-io$r;v9ciud$PTA@d)lc4 z#dbSceaR|z_6)P#s*bR^!zD~RP6+_RHgRJip33v7NLGAWjY=IQNsu;;@4Xwr){kFt zl$CNkT3lZmstyM>aTC`sZA^z4+_bchP@3;LSnbt^aiaS>Uf{Lzn`LYj8rNQ6bm+~` zvZR;PlUxQCzP1(IIK z_e_yjr|^7nu1q=i5#HC>g^Ad!d;H&@PmsBKn&;jE3!ALV`v!5G09={_5(H#zGA3|S zUj#q2DKqYypOuYD2Ai9DZ*h^4gnE!M;|Z!fLn?zW6a}88eGVXu|Ef5(hC^#8eo6Ny z-pSB*FA5=fo9h3`+W>wH;J5q;V6RikMmXW5rzlSo?R-l6wWWuj!o3HT0c@&-(`X_y z2hH{y`IO9_N;venz+Go3VD@uh14yy^*=HJ1DM?vA3Sl1 z*eGlZ{0nT1cJhJN0Fr((G_t#zJzZ!^Kbicz!UZ3?uR(_=EA1Z)uMx@f$5Vv>eoRjl z%0&EAf(&N8L2GpPM|uvWr-?p+b>T=LbxU(g+c%bOtmY18?(Qj?M$TB`I3m3Za3w9$ z(Jd|X)mozZ^R;|2$W$+Am}u*0KP4VE^k^;8j;bDmyUNk$`w(})=)dT9a*S-4A|lz` z&vM$`&jjwioKBdSbisPZgrmR#-Kz6l}Vr2FI0Md)Cefz8_jW(t|grpl8H^T{5X;@ zyMBRPbKAbAVeq;6#5mHdeS49*$8l=^v7S&mhSCpUFm>sR+fI3bQ`Q|9X2hx(RxS3! zHaw+aptd_3U;C~V0(0*x`LyWDhf(n>%n4oP=6!_r_|K$1Pno-2eV zn?I;6w;M&fyv}OLDnOW@*C>blPH8w^|7K;i*+O^;7}+`>u@!l{AxQ_UkB-=~eM7m} z9-L_{-~I*&Y{k|cXy$Kml@ZURytzApKc$kS@h!FS1}EKDmVMp>hMshSJldmc#$`Wt zs;Sp01RD*pDo5O6wZ$U>E8|3%Yk5q#@2QvJj#WeO?|~f&K_1TJd^5Rw|{{qhxA4SH%6z{$edC z@DV}vRnGvDq`+ir;G_8a-3!@PsT23Ps3wQ+1!&$>&6kyr#V-o|2qQkn#R7vD_U=~E z+wFepjMadUu!xI*-@UFo%5a>+g3P!NhuZ3toVCIO9P%pAi<5@=!fN}sM)`<9@ZA)#;NqI{);xY{&mzDadQ7D&W zc=_i0j`|z89ZLZU;!5mHB8rO)fKJj3n53b?andokZp(%DF#A3OEm zCQGo|cv2&;fg9Giz?!zInkE5omI3WW&<~_-OU4-<;w-B5mlsjvOvV=o*v|CE7(I8t z-IGck8$>1#Y{!59KKT9V?D5a z%q30E;?)Y&}D z23#kBEFy(|s!G9(%4nkQmkjuw^9&~pSM2c#+|=H zC&J0LI$DS+RumC4hk}q;U`;DmD=mE4auhs5sIS(@La_4ka07l3oxjn zXqxd%6O#j-zedrk7V<1wik9WGa^*WNvMLN&vgu~*?Mq2ZHmi~nicESM78%?()O2-c))XAeEPb*qiw zP3E2@syzlt6S1VF!YtRVNK+QT^kZfQmb-QRJehK0;;6|d0RU>LC=KJ_s+{2Uo^V@w zdv@DCy0KZz5YUmv}iZj!o%#4far8&m= zP0k9k>2K?5nPbUFfy#i`cMT<|1}%rkAJ$MC-Z=S;e#ICerSiq>_2rxA@K#r+LbtbF zleH_2Lj9_(sl-1W9Bv_Z>PF z6ReIHdvnC(-^*1Fz0E0$Gdq;U=}-lWv8N!tc31A_F|90b9N^0{03~v3y*_}Y-e#-J zm{0bf(*OFoTAJ^N1>dbHqJ~LTX-~G*i|eNDdWC-a8cVv7*u_MnmU0Fpor>@&+)c9Bx;(m;TF{J}vh{^UY+dE_L~FMx#X-Bisj(&am4SR@+85IPk@zfY@82qt!IgDh57+RB>>1*&YF}tiZ+1Vo z<|1TNbMf^|o_d*ly^=W}#;i7NqH{s;sRxT-p1G{pTIYy4t8d@A{GRtyFEL@3HnTlY z0B#HyejZ^SC2~;9AAN%@SNK*AK0@LA3Xu`7D8tw)b{v%KQqt`EjGj(b^CWfk{oEJI zbvvu*t5@*-0v=KLRaYwNC3D2H?13*T9u7KBwbIz!8MEh^6-q~Q=sQ{Ht}Vm|$|jq# zcQ`yaV{k_XV>ddJ>{s2`a{I_~-7M0t7=;!43zhM6LgKy!9ja`F5UZq-K4`R*-&5x@ z6bC+(j@p3?lv+v@bev7*zw$N;sVf@m6xe{Z=oi`0$gC^jjgq4Y;uaP45N{*2+^AI} zZTC74Nie@vs_LdD@4dw5-pjB5tQ@qd6X&F-uxz}wmUeUSZ7lBG&@e}Sbo8N*v>J{h zn%S;ymo`xfbdE#Jc^quE`LBvh~ZXW@i8pA z-Rmh3s)5Z6?Kr{Ut=fRe$x-RI;-&y319I_uf-pX^ftGak^ub%1O?%fc9}C3O@Ya6o zNVRBZDcRk6cZ$WNK~M4Vnu#42IHOo8d<$04JElk{E-r7}9gd+0lUUx@dU7;5vX|}> z2hD-+fu60wzG!*Q*2Xxi^ya!(aLcO%xxa)r=(i(09~OHFklM8rN1PIq4F+5cChwF9 z2S3)EDpc2U#NWkip}}=h$3G6bpp!mOSmSeVN&5JEzm>R)NA$!zL|WI5X8UQ53yIuo=*vRW7jn<84 ze66H}=*F=9v9qq&!%bN@T^Y8Wq04vqfYwyZV?)GHBy7q0x_6Z_u3yCKGi2@W9e}JP zy*E9nz4zJOSYLLYgMFIf=e+6qcs_@NJ`}&>LMe=c<@nL?C4wM88bQ2A=OV(~F5SJL zjKTYdg+?>ti=~eEmLb}(vBB=@WQW8CS_37>&wCcx8{EX`J$f8zeuH3#b+#N-_2m;@ z9$$Rzx4|k38P1Oz79U>%l|hYQ|mmF4j0m$kA{76%WoRkA{oh-IW2n6LK~|^b){r z?}iomp=A;awVB?6-IAwv&Ti zo3QrPBlGCA8DkZ=OS)<-?y1AKi0!bIq`w?tLZlP8bjWZkDK_je*`qAjbS~4rIMaCV zjR*45l(HOWdhcBy)2E>oF(oFCklQP!#x)uYnsO2Uwloc7SAxIlrkP9Qmz@L5Kgj$N zjsGpbK3}JOw+%Q&DLB8g*t!7yS#dU$s88TP6scw0|52pCHkk9%rVgB_e4K}l)0qf?WgCuRtoUAP^{!V{OGJ=;)*kCYkkg z5RjW>0L$rW4o1p=k!~f!37W+XvYVM`sJ3Bpqc?p{T?<$}WX_%dNo9^>UY|`yp*Jrq z2T=)g4Sp|?ag5v>J8(Fp)E0w8-7YwnzsPev3nL`mkuBkn2_{G#-$uaW{=&7(HZkXl z-AZ53+lxQQxe0W)w9g}VEmEL~4Fek1I%=;o<*3T_6!fu+xRvklo=%=1hnRh9cnxYdZoLgOA4z5NJNc z`w(avO{!CFbF;C%sCqa|#gm>-E?ubMtXKx0BUjaAHNWL$p&S{^-=}|r!Z|?Q3HC#%J;!wbPO%wcSwev<6CLVD*wS{n7x_zbrR#) zSaq_;Sc&u)^PD2zIM2)KFnYH;)`-pn@%q^J^g0$pB?GYV}Op z;khL)ZXy*8FJ%vNQ^Ct1HmeRHhG@&yQ)RWlaFt)c0GOi4izRYP;T461?bjaU`zK$r z-9MeJ?hj6|ZNM~bhNJUk*$lQw~cyzHk3(-`_>L2Ehsy_q^X5(tz}5Q z!bjy3xcxd1p3hZ5JjiS~K8SMUCdwDq@J*W}V=7ZSh<1(Ohig_rYm*K$-kUcHwY+ao z5CI6coH62IE<$hV!#FBTL(C?_m4N01WfnRi%sJ{FgS1=O>4KKFyd_4O`81?66}!{= z)@p7jF9=I(ENaI5qYXN@wLCJ-^1;1UlJsr8b-!wxhsd#z%}$VvCd;w=aZY_5*+&y@ zCLWz1Kv!CBvi(RQ<(5UV=E~w>W^Ilm_B_q>%)#4Emoa8!dSL`5NA2eBk_W6e7E|O7 zS0hR@YEE3$-wSs?s}d&bb1l=qIH!1peUmV~VAswBnf}A&KQ6W*d?qH7c5Wz+2zZts zSz%m5-5Yb;st?vvi4Me$HydKZ1`gW|x-=j8gCaS4zw&Hh7|Xdm-r&_XzYx}MIF4iG zRdnXs=jwlMJk5^ktGpS&_ccBjQy+J^oQ80?=8M2*a^eLweaYC~K#v(Bd&YzlN`V;T z>*kmZuyMlfXSzNy3a}h7+w7~*i>BIi!66!}@x;{;_j{?)Nn~!- zS2{yv+!>TH)XFUEQF1ipy^ZO%6xNyR7fA7P19JArDoB1f$jmzou1ZuvxVu9ecD+oa z(>IN;2<*Ec+hh=t{KVbKS|O2M2Ke8}8lqc5V_fAPx6!ar6cH-+xN0zf<9{MIPLy9j zH&OjjH~#?OiE{Kt_!K{HG zTmL!Y99ckdzaw4fasJ2x8KPypgl-iAOCB3g{JHw~Mj+mQy=`D%w5Y%wM-1RBDs=Gs zLm>Gd^1r{faQ{W708^ewLLCzL^BlxL6qgT>W@Y`0gU=3eNDVgm1^`!`;6TZ)M6~#` z5VAEyp81;$`B3#AvM47K7~>ld`Vi#bh~e0{|0%+ULOu}akr&(}L;-I3h7Wc7ZK27!0`QL`%)ClAwvTm5yb_I zUOZI?ct#BOTM7d6fQ`>cp)La<(C8}&B=ldGdORd!s}NWIkSEpu%jKpbgvbh!+y$Yw zj_1U1Qp*28KrsIW78G8Bz(g7lmdgV6{7H@b?Q6 zDD>`<814b0OF=sxWPbm<&(-b!OXj@7f%=fUB8Ei+!(MTM z)2^_gNc9ylT$am!i9fEWpfLG0G2Eog@A*vhFVn^XXhn4MNdMCf==a2M^Tkk9<(?Ay9I!r2LJg3iI0K3QSAUrs zS3w2|(LZw?EqL+%X|NbxN`&vD!@&He`rk+jsr#1!I=JHJQz$EZCx#pE{%?`kCv0%; z_osHPh7`RT`EQZS4@~f{?`+UGV*f!5mooaVB5G)L-wR@sTtJ$f53=0m{HwaYOaCPw z&tv|%#Zy1m!=D#Jo^1y*w*Q{LM%VvqAiN5#6VxCDOFhsB(y{uG_k+M+cbMAy$AAS| f!>*siaP?pR>*M!NLNrcDoffcRVBY-cY?%KCCp_V? diff --git a/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java b/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java index e30d918..a077c77 100644 --- a/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java +++ b/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java @@ -13,13 +13,14 @@ import android.app.Service; import android.content.Context; import android.content.Intent; import android.location.Location; +import android.location.LocationManager; import android.os.Handler; import android.os.IBinder; import android.util.Log; import com.TwentyCodes.android.debug.LocationLibraryConstants; import com.TwentyCodes.android.location.GeoPointLocationListener; -import com.TwentyCodes.android.location.LocationReceiver; +import com.TwentyCodes.android.location.BaseLocationReceiver; import com.google.android.maps.GeoPoint; import com.skyhookwireless.wps.RegistrationCallback; import com.skyhookwireless.wps.WPSContinuation; @@ -49,8 +50,8 @@ public class SkyHookService extends Service implements GeoPointLocationListener, public static final String INTENT_EXTRA_REQUIRED_ACCURACY = "required_accuracy"; /** - * Used to tell the service the update action to broadcast. If this is not supplied, {@link LocationReceiver.INTENT_EXTRA_ACTION_UPDATE } will be used. - * @see LocationReceiver.INTENT_EXTRA_ACTION_UPDATE + * Used to tell the service the update action to broadcast. If this is not supplied, {@link BaseLocationReceiver.INTENT_EXTRA_ACTION_UPDATE } will be used. + * @see BaseLocationReceiver.INTENT_EXTRA_ACTION_UPDATE */ public static final String INTENT_EXTRA_ACTION_UPDATE = "action_update"; @@ -75,8 +76,8 @@ public class SkyHookService extends Service implements GeoPointLocationListener, if(mIntent.getAction() != null) locationUpdate.setAction(mIntent.getAction()); else - locationUpdate.setAction(LocationReceiver.INTENT_EXTRA_ACTION_UPDATE); - locationUpdate.putExtra(LocationReceiver.INTENT_EXTRA_LOCATION_PARCEL, convertLocation()); + locationUpdate.setAction(LocationLibraryConstants.INTENT_ACTION_UPDATE); + locationUpdate.putExtra(LocationManager.KEY_LOCATION_CHANGED, convertLocation()); sendBroadcast(locationUpdate); } } diff --git a/LocationLib/src/com/TwentyCodes/android/debug/LocationLibraryConstants.java b/LocationLib/src/com/TwentyCodes/android/debug/LocationLibraryConstants.java index 3552e2c..34072af 100644 --- a/LocationLib/src/com/TwentyCodes/android/debug/LocationLibraryConstants.java +++ b/LocationLib/src/com/TwentyCodes/android/debug/LocationLibraryConstants.java @@ -1,5 +1,5 @@ /** - * Debug.java + * LocationLibraryConstants.java * @date Mar 1, 2011 * @author ricky barrette * @author Twenty Codes, LLC @@ -7,6 +7,7 @@ package com.TwentyCodes.android.debug; import android.hardware.SensorManager; +import android.location.LocationManager; /** * This class will be used to set the Location Library Constants @@ -14,6 +15,12 @@ import android.hardware.SensorManager; */ public final class LocationLibraryConstants { + static{ + SUPPORTS_FROYO = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.FROYO; + + SUPPORTS_GINGERBREAD = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD; + } + /** * Sets the default SkyHook Registration Behavior used by SkyHookRegistration.getUserName() * @author ricky barrette @@ -47,10 +54,8 @@ public final class LocationLibraryConstants { public static final boolean SUPPORTS_FROYO; public static final boolean SUPPORTS_GINGERBREAD; + + public static final String INTENT_ACTION_UPDATE = "TwentyCodes.intent.action.LocationUpdate"; - static{ - SUPPORTS_FROYO = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.FROYO; - - SUPPORTS_GINGERBREAD = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD; - } + public static final String INTENT_EXTRA_LOCATION_CHANGED = LocationManager.KEY_LOCATION_CHANGED; } \ No newline at end of file diff --git a/LocationLib/src/com/TwentyCodes/android/location/PassiveLocationChangedReceiver.java b/LocationLib/src/com/TwentyCodes/android/location/BaseLocationReceiver.java similarity index 77% rename from LocationLib/src/com/TwentyCodes/android/location/PassiveLocationChangedReceiver.java rename to LocationLib/src/com/TwentyCodes/android/location/BaseLocationReceiver.java index 19f18cb..1a618bb 100644 --- a/LocationLib/src/com/TwentyCodes/android/location/PassiveLocationChangedReceiver.java +++ b/LocationLib/src/com/TwentyCodes/android/location/BaseLocationReceiver.java @@ -1,8 +1,7 @@ /** - * PassiveLocationChangedReceiver.java - * @date May 15, 2012 - * @author ricky barrette * @author Twenty Codes, LLC + * @author ricky barrette + * @date Oct 18, 2010 */ package com.TwentyCodes.android.location; @@ -13,11 +12,12 @@ import android.location.Location; import android.location.LocationManager; /** + * this abstract class will be used as a for classes wishing to be a receiver of location updates from the location services * @author ricky barrette */ -public abstract class PassiveLocationChangedReceiver extends BroadcastReceiver { - - protected Context mContext; +public abstract class BaseLocationReceiver extends BroadcastReceiver { + + public Context mContext; /** * (non-Javadoc) diff --git a/LocationLib/src/com/TwentyCodes/android/location/LocationReceiver.java b/LocationLib/src/com/TwentyCodes/android/location/LocationReceiver.java deleted file mode 100644 index 79178c3..0000000 --- a/LocationLib/src/com/TwentyCodes/android/location/LocationReceiver.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @author Twenty Codes, LLC - * @author ricky barrette - * @date Oct 18, 2010 - */ -package com.TwentyCodes.android.location; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.location.Location; - -/** - * this abstract class will be used as a for classes wishing to be a receiver of location updates from the location services - * @author ricky barrette - */ -public abstract class LocationReceiver extends BroadcastReceiver { - - public static final String INTENT_EXTRA_ACTION_UPDATE = "TwentyCodes.intent.action.LocationUpdate"; - public static final String INTENT_EXTRA_LOCATION_PARCEL = "location_parcel"; - public Context mContext; - - /** - * (non-Javadoc) - * @see android.content.BroadcastReceiver#onReceive(android.content.Context, android.content.Intent) - * @param contextonBind - * @param intent - * @author ricky barrette - */ - @Override - public void onReceive(final Context context, final Intent intent) { - mContext = context; - if(intent.getParcelableExtra(INTENT_EXTRA_LOCATION_PARCEL) != null){ - Location location = intent.getParcelableExtra(INTENT_EXTRA_LOCATION_PARCEL); - onLocationUpdate(location); - } - } - - /** - * called when a location update is received - * @param parcelableExtra - * @author ricky barrette - */ - public abstract void onLocationUpdate(Location location); - -} \ No newline at end of file diff --git a/LocationLib/src/com/TwentyCodes/android/location/LocationService.java b/LocationLib/src/com/TwentyCodes/android/location/LocationService.java index 3ebb8a6..f903451 100644 --- a/LocationLib/src/com/TwentyCodes/android/location/LocationService.java +++ b/LocationLib/src/com/TwentyCodes/android/location/LocationService.java @@ -14,6 +14,7 @@ import android.content.Context; import android.content.Intent; import android.location.Location; import android.location.LocationListener; +import android.location.LocationManager; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -48,8 +49,8 @@ public class LocationService extends Service implements LocationListener { public static final String INTENT_EXTRA_REQUIRED_ACCURACY = "required_accuracy"; /** - * Used to tell the service the update action to broadcast. If this is not supplied, {@link LocationReceiver.INTENT_EXTRA_ACTION_UPDATE } will be used. - * @see LocationReceiver.INTENT_EXTRA_ACTION_UPDATE + * Used to tell the service the update action to broadcast. If this is not supplied, {@link BaseLocationReceiver.INTENT_EXTRA_ACTION_UPDATE } will be used. + * @see BaseLocationReceiver.INTENT_EXTRA_ACTION_UPDATE */ public static final String INTENT_EXTRA_ACTION_UPDATE = "action_update"; @@ -95,8 +96,8 @@ public class LocationService extends Service implements LocationListener { if(mIntent.getAction() != null) locationUpdate.setAction(mIntent.getAction()); else - locationUpdate.setAction(LocationReceiver.INTENT_EXTRA_ACTION_UPDATE); - locationUpdate.putExtra(LocationReceiver.INTENT_EXTRA_LOCATION_PARCEL, mLocation); + locationUpdate.setAction(LocationLibraryConstants.INTENT_ACTION_UPDATE); + locationUpdate.putExtra(LocationManager.KEY_LOCATION_CHANGED, mLocation); sendBroadcast(locationUpdate); stopSelf(mStartId); } diff --git a/LocationLib/src/com/TwentyCodes/android/location/PassiveLocationListener.java b/LocationLib/src/com/TwentyCodes/android/location/PassiveLocationListener.java index 91311f7..8f5ff10 100644 --- a/LocationLib/src/com/TwentyCodes/android/location/PassiveLocationListener.java +++ b/LocationLib/src/com/TwentyCodes/android/location/PassiveLocationListener.java @@ -22,13 +22,13 @@ public class PassiveLocationListener { /** * A convenience method for requesting passive location updates * @param context + * @param receiverIntent * @author ricky barrette */ - public static final void requestPassiveLocationUpdates(final Context context){ + public static final void requestPassiveLocationUpdates(final Context context, final Intent receiverIntent){ if (LocationLibraryConstants.SUPPORTS_FROYO) { final LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); - final Intent passiveIntent = new Intent(context, PassiveLocationChangedReceiver.class); - final PendingIntent locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0, passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT); + final PendingIntent locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0, receiverIntent, PendingIntent.FLAG_UPDATE_CURRENT); locationManager.requestLocationUpdates(LocationManager.PASSIVE_PROVIDER, 0, 0, locationListenerPassivePendingIntent); } }