From aab2b9c412420ee04749000540f56d43b6bf56c5 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Sat, 15 Sep 2018 16:58:17 +1200 Subject: [PATCH 1/3] Icon for Android push notifications. --- app-template/config-template.xml | 7 +++++++ .../drawable-hdpi/fcm_push_icon.png | Bin 0 -> 859 bytes .../drawable-ldpi/fcm_push_icon.png | Bin 0 -> 1270 bytes .../drawable-mdpi/fcm_push_icon.png | Bin 0 -> 593 bytes .../drawable-xhdpi/fcm_push_icon.png | Bin 0 -> 1189 bytes .../drawable-xxhdpi/fcm_push_icon.png | Bin 0 -> 1581 bytes .../drawable-xxxhdpi/fcm_push_icon.png | Bin 0 -> 2395 bytes resources/bitcoin.com/android/icon-1024-fcm.xcf | Bin 0 -> 84035 bytes src/js/services/wallet-history.service.js | 2 +- 9 files changed, 8 insertions(+), 1 deletion(-) create mode 100755 resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png create mode 100755 resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png create mode 100755 resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png create mode 100755 resources/bitcoin.com/android/fcm_push_icon/drawable-xhdpi/fcm_push_icon.png create mode 100755 resources/bitcoin.com/android/fcm_push_icon/drawable-xxhdpi/fcm_push_icon.png create mode 100755 resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png create mode 100644 resources/bitcoin.com/android/icon-1024-fcm.xcf diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 8686b7b36..1949a4c85 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -135,6 +135,13 @@ + + + + + + + diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png new file mode 100755 index 0000000000000000000000000000000000000000..6044abbea86a5cbbbf56fb93697b142f75f78deb GIT binary patch literal 859 zcmV-h1El9~LL-Sx$}PDx!h~E)lQC{79z60OQSv}MQOGsnm7>VF6iSg$ z3^hC;8h4h~w7=TJ%sJ=#=JHwfbx!B(z1DB9z1BK=ed0e8{bxL60y48xz@h+OBWZ%) zo7oEBNO=AeD3SE4C5y}obQLHIh8{~A7JzmF+arK+lJ2$%kePJ>`UmA_fd;PtPb0Xk zz{Ut*7VrT01$+bQCH=?;uvrh8*#clMG;Hetpj%Mv2I|6nZ=hFX@D1=C@a_8oyaP@E zM$0C3#Ne7Dwv;;UF0W6ag12$r7k1g{$v^ZGx7#b?ci))k8 zra)#k2Dk%s4Aw78n%3G`_8b_Vl4YHNRX`;$B8>e2%#d`uwSlr^e50xXILvxUaV)jk zmK6eYP12Ms6AOtU56rI_w#>IJmbXBKBrmefN+CeC!1NTLPJjcg1U7`R{^{_oo0$|x zg#hJSsaN|q4CoQSuKR){`SIi*X%8Sz`SZY>VEq$ND(Oj4fZV8=Z3A{iTURdWLNS5j zX23Z%OWIdVpe?|j2%u6@lc&-4h#^1Vd6Q5cfV=@HlXRmf9x}6`fVW0H1Hfxwyd=N2 zUzV9!zu=YKfZylD&qCFbyufA$GPCg^UA@Tl35CuTc#HEsr7-%r+S{YQL*jl&dEd4s zCFzh~0h~-RoX_ivp%qGOwUdD6g(lC(_=zlayOP;Xv`s=Gq`LTMHbB z#!i)VCDm%efUI@M+m_iu&qGP0{NBtK0;ePWZTIiTUmh9=j1JFgB|Qp29#@lquD~Zr lH(TNzpPR`;Ej5zQ{6EPMK{UBL+lv4I002ovPDHLkV1gYvfzAK` literal 0 HcmV?d00001 diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png new file mode 100755 index 0000000000000000000000000000000000000000..6c50d78c8c156e8cc27757c942f3dc30033d07f7 GIT binary patch literal 1270 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0dDSry^7odplSvNn+hu+GdHy)QK2F?C$HG5 z!d3~a!V1U+3F|8Y3;nDA{o-C@9zzrKDK}xwt{K19`Se z86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x!EwNQn0$BtH5O0c3d|4@L;p!@;Rg)$-uyD=IP=X;=wz0 z+WCB6N0H;dS9Sf06rFVIN9dNiEu9KthuV$=wJb4H654&NseVEBv?R|hovll_oes^r zvEh=!#))o!SIAFYwdmIOnth+2#S}mHeOK-GX=nPona0KEW>&x3y?&*p;#9AtBC|J| zs^^&2ZS=2*f4s)mdufp5-Nwh6FItY@c$fG(t%m7Vg2Zj_9Nix6fM;>L3KKVaGwhX2 zb0~_oUT}W*?pIHJ_Gmww^~za3Rn%L$yUO5QV`c=?+Z*2&mmk*I;-tUra0crSHvJWE z#LYtHaupUuF5I2Sqw+a4wBqmKH{ueFds)`%TSRTpJGOX%L$Siew%`wUv!(riTTYo= zxQ<+zW>YT zY&QSWk2Q>?%buuzImJJBwO;vS^G!Ko#resnLqg5nS18&&wia4*|J`xRsa$D%scgM_ z%%@HGqq=K;(c%}Avi_bpdiUIGFV^Cfo?5ZJe|OB6cDMKbd6hdY^7Y-zzqiR8$`Y+n zj%k{!u+u9@_-f+0>$91TF8fwfX7GXM|;duA8XaMutFLhoIw#%ol(wH&l?ZaJe3$<1& z-EL?!4HSQDXTR`!&YAw){zKQU2S%i>{r4t3;qs##=3`kJwP9?IpC`4eER#>UvOjOj z*_h`UOp)E61>Q8LZV>o#^dHMd!K77nCog`Qe5bYU+okxf7z6Xw+`@UvTlR&@J1pW~ z@$Zj`()$9bme9KWYXrE1k`GjBPG)zU8q4tagdOAFEA9_;UVL60R?pz|iG9y9p6kEf zJp8vXQCmzVmg&XXg#Fd;qL2R7G?45lPjWi1SbF80>D6AYWo$EAvN!O)Ykp#RhhgiF z;0qsDJH{Lim}zC4Bezqe+sK6fw8@s6cmBWHAGL7XFIyHiT~J}<>FVdQ&MBb@02}-q AK>z>% literal 0 HcmV?d00001 diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png new file mode 100755 index 0000000000000000000000000000000000000000..d7f09f064b00a40d0a39d4bc47713e4b6b2c798b GIT binary patch literal 593 zcmV-X0#T%YTY|2_3BzB=c9-r;$kH?;7Hs`x3Tc9?*%I2{oUDWx%(hI2R*5g%*G z?H7QQQhRj6S}evvEW-}W!BK3$Q#3}zr{;jF0A^q`hF}2h<1$8|A0FT;UgJ4#%PJO<(j7DPm2JpnQyHe(g8V^l=EZz+I_m=qBo>IsnNa14X75nCeS z^WOqo!Jdj4WHHXdFkHiuh`9Yn7Uc^mr5}f!h4fR|B}glD#3QW6@rd~HF92`xtfGRP zL|b&gi^8~*^`>c;(!PnsI)+C?7G8aHP}-R-WH0(+O+;+3H$V=&D{G)il>epVQo*3o zrlHxBB4R<^Do82i1ZQG*VbsEi*xxKbN~tq?6zXNeJB8&HEXu*hV;#EVPBy-#wq50> zTg!sUj+wvA?Vr?Hz*-lYW{up!dR&T#^rs5uBQKpiyk12}H_Lyv@+Y{9Y-(8}_t20l zs7Yu=#XYeSbMsEdiqf(rI9q(@abB5t)zp7#8FIGa>6lWM{=t;eI4mswe<&i})w1;} fXeP4zm6fz`BDN8<#2r)&OEYlQ)FP4djDJl6dV)lr<67W4g$7{=f46UO8RjWhcyg=rNC9d76IrZV2PyFL0|#!SO)el z;7Z^QNx%0^q7#9XlGm>QF3W&?0bDETt{`v;u(ANU99S;N+UQmO`vk(~&jmJx8K1F< z9FrZRZTo59)%e>y;Pm2{*8u+6gnj|O0c?8jOZs+WRMM(}l+tOy;~TTdfOqZq4**Lg zeK5=(<0jBxwpJV%?(G__Y6zSPJUPtibbQCAXy;!c>8sjzYY6NITmftzK5#T}NVdUm zz?;B36`MLY>;dcx>=~gr$M89@47j^CB;Y0BB1!L6e6L$3o+S@h-OD81TC-uZCZ*&|epZ-`Nj2g~bq=svk_ioz zDh*_tZYYrrMIig;I^ehh#+G6 zaDk+^|4jl;ZeRX zO;_hfKe=m*TIjRNZ}nnAwR;U(=R>#{curC^_`ZCg4+8EBT);W0b&@_z$d1?iYBu+t z_JdOV4Og}93)V^cyY^!>>t@!>Qp~xWeha9o9)azEIZ@rt1$N5_nZ&!m<-pn+5`Ac3 zsA4V)qXv6ac8VtPEO53YN2P%>HUbT*l+uyF{lEbkQv1Ytl3dhHHi0nBMZkjv(ibHi zJ1qp<@!5~|&H&qq=d_j7V>hADz&5}m!2IIG=SgysoK+@;z}CQhQ5)r87f5n%F!2Po z1)c&*o1ZV~nQ0)fJK*YbmjdiuN$aP9z!KobqP+jaBNs{T4<^%uBC|UiyOP}@L+NC; zQc^y~-yn&xIC0$KxP)+7?V;Gg1v*!xC)G4Htprj^j?o@KxsLbxg+&YKI^GVrwk_$z za~EVI2?E(2pEHj_}7Tl{UrrPtQgz-vKvAU*I8cl}ri&Ukdu3t*VjFnbi<*Y+e<1>-7f~HH(L_ zj@7<0vN)z6Rvh2VbyAp`*Z&NB8MXhKVQ*)=M=OCGNX>LQrF16na6#ZU;A%;B_+I7z zMZiawQgVp%#dQ;j>~Pmex+k8W=;=an%+;g9uIlNefdJ^5{RqG%utTV?Oka`YC}M)X zxHuW`e@U?Ta{G1QwWI~x$fV&?&VtUBZg8*Ktn#&1crb{ zv5;B;Ma25RI!*8V8(1PKnsteYHGz!^bX+FsmzBY~YXcM!I{>!;n>P*2U~UC2XoeIK z*8>L@fcOeHNYZyJ8d9Brjs)%niu(Kjm@H{YK@sh71#N5rGvWxAzg!LIlY@EGs}@H((qlGn4^B^QuC`CV(*ru`0m z#`+w19yn9dm+f~k1}Eu=SXlryj_xnubl`?Mr(myJQ1i#{wdpC~2uZ)zVNJP!766m# zP+$!D@U*)YI75>E?nrV0Jq#Su(VNG<@oAE->GU3vbgJO6Ex1*qtS5mDu8d;;tv$-g_6h}ZzIqw9B;xhj6o z`I0W}2^e1iz+n>~Dzl`g0VPQ1 z0GC&c{z6F?Wzi{#-DLIE%{8b|!H94~(kEy~CyV5ENylUjsviI)D|#E)sRY6!z+sYn z(r#ONeu^bP^MUYxL995|o^(EZ8v_+QeX6?5tr3wjIKxn#iCNjkL^7)8(Y zJfMhJ3-}&bqXfb!lI9IEptFH1N&whd9Vf{V%`E9@3yKK)XRj6H;+C)7z(bM_%OaB+ z^*SJ@g&gZHay1+eI#|*(0|zJ~?A819Y&d1&kj#uuQ`kLYK@nkH*99&HPELQ9>F<;E zcuBu?Vm)r#EkIr@ZSq-Xku-(MQq;{1mZrS^%bmjMCZIZW9jy<;cRFZdQ6RbH?3I)o z%lRPP#=Dctf4y5dK<1LW(e(c@MHF-DvzO~R+6xK?vx2WfwF=l5f@ey4vegDf&*cKD zDtYTfpE}w)7VQ}HG)Z<)JCc3`^kTZm;wjy+^a~(Y(tDk`O48LGQ)%cR7tjO1p>-;f z*_R6yd{^IF{Q^n8dQhw60-E5=WmDmjx8B($+Ib+peB$4Y;(Hbwm$Y&D?#S822}fIr zzplbR2I0f!!rXLDs}!>U6?L9dX&({3sx+=d+4Ce_*6KjU>bW7HQOFJfbrH}}X|XJV zUg)ewgujttyAmDGl~i?$XRKz`fBLP{f_4M$0sO5DjpBow50na?6XcX^2i;A4Zh;Vg=7wKj_mP*R@pXwx98=yLsTABJ90_xTx fy)u33b?WjDw5qaanJm7#00000NkvXXu0mjf{WSR; literal 0 HcmV?d00001 diff --git a/resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png b/resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png new file mode 100755 index 0000000000000000000000000000000000000000..da2e90cdf08e9043155d23491aff3e7348ee1b7c GIT binary patch literal 2395 zcmV-h38eOkP)ES4%}g8FIPQl zUjX(5ZZ|U@Z0GJL14q_eui0}OaG;qzGa)QT8g?86tPea_9^G@XlpDt-Q5V7*8mPXh~pU(9GHjY?|ne}T7v*JJiZ z!hL3Kl4S{Ucj@`kVyXyO3HU<7UH=|<3aB#3z6h)s>El)4H^B2l2oMRc0sjo+{1JF& znC+2pzge2(BH$$8s4REXZYP=%ZvYE{mjKxxcLCR%*^})KUEO;w0?w5RIEe>nIA(8& z((-gIaEzHf+py1BUEXy92Eh{eQU-1|v;WKr$q^eD0u~2OOVcI58TwvSxkg6By7IC@ zKsB1L1D69QnAzWR0zTMRE&|SxBdpCEoj~6r;R@j3Ha)Dl2>2#&<^(`$dq|ORq?t*{ zXhm`nunh1S;6oL6DFf~7guA~PxO#{omT>uEO=N$p8k~5a0AvuZmEe^f>_}?sW@h&1 zQEno3O%?*`266XPZ|JGOd^3~5)QY(K7D3DTYCr-X+-A$Ux)#U6Ej283lu zAL2t32#|yBXfu;mltl^wi!>s+prw+=q!188Xq4aG{RkjsZ7)mEC;-Qa76RON z1}+6wuOUF2_X_&mJ@*b-rwMR(#Ts1z>=toFXk$k0v;@^Ak|eA;eNDPfz*iNK4Xhmj z?k~X+cmHewjw29p{;uKEm0h z69l-sHegl=`_>?6awCdSs&b8fWHCH&Z+3=x>scuJ7Qyb;}QmWF60Vm zm+V0^lNH>Wlo>D_TIHOH1i7F!J6e%KKs~I|hNK?vWoB|mWS40oKzUm)$~~X?DP;#J zXjuP`B0W#&p1FgvbTiXLK&!#I!5UT^=%&DVfGpzW6T%XOlkAgQf`(LC(Pb27J4L`u zfI|Hu#fB=iRw=ZrB)p88p~nN~nwgUNvPfrUKowfFbR-I@mdKB2t%pS>t zegf-_$C-s1+UgQC>_Nh&%t6WrOTa_^A%(S{WoAkYZ!Ddj0X_8GU7k`Un;)EjsDgBN z$d%Y#2ndL~yR;;^A~uMSpe@OR%uG?$jinGU144H{OdimLrAVdKwrh-j!a$A3nD%eL zfOfP=*prBD*2pqmD@TlInF0MX;G-coc$E!D^P>j|hTfm;dc zjieCJPk`ct<|mfkIm68K&1fWrfPMm`34J?QyfI*}Ftfd4jbgtS0{RJ%J@DNy3u4$^ zX=Z!G8pVDu1oRW2K;7>Fs(lfYi_9$LTT$CjA)udtHRWsrz7j(p_`aFxd(lV=0sRE1 z%(8L?WDmqdwIfthsF4%``U%)J5Rg(oVskT7P3uNd2Ya@18d}{8xb3* z5xcs0uDBxHT{~sUlvy_6p>H%Zg|IZ1LcpSzMEL>N0E(K9i9#r~DbslU*Fc>oAe_!| zY;ZrM;PDu+YuOKoy{8GkySpN#zXj|AsKi-Jv?Hea)Y;-jQy7okRPFE6_ziG(X*oLp zhlC6nS->e+s4%!r>Cnba7D*Yj(LmEgfV(RbQmIC=U=@~2Z86^E~Mpxl93$`4Tdk35}f*Vd#gUIh%dCWU~0Xx{{`)1E+ErHTic%te6qMwRkEm!x-kM(;S22SRby zhjQ10r~@Sz0b9yC3>8NP`;;0OtHq#uRM@vpt*BB%6{jO(sZR94{I^a@n$bvo>F>RN zvSjs^E3Q**rPcfjxZlkFF^RV)7Xj*L9-xCe2lZ@$ucCM{`DvK`RmWJ#VpYNIIuUtt zko__=68Jp=1ibp~ous6;$^~1P!=)U1u-0cl-2gc(VRx6OQYB^TM1U$*=lUjqjQiRw zGoTPKI&Fo3(Xq>NWg#F7jH7ol4gwT!uUb2?v2>QCa&i|tLBrjD1gN@I>>HrCeYp@rC%@C-X~Xhx!%3|=Dskf>GfBGt?Z8cKX0^A$YU>2(rbC%9fj`U_FXQOVx{VHZ zmrs9Kvb9LmQMK6**=YmxnSG9hfVLlEF85yum@s>VfI`585t#7s?*e$b-i}Hw*qs0X N002ovPDHLkV1lb+X5Rn+ literal 0 HcmV?d00001 diff --git a/resources/bitcoin.com/android/icon-1024-fcm.xcf b/resources/bitcoin.com/android/icon-1024-fcm.xcf new file mode 100644 index 0000000000000000000000000000000000000000..a7c4374d3783834fc83bf0da36308df800b91ec4 GIT binary patch literal 84035 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 D)GBGr literal 0 HcmV?d00001 diff --git a/src/js/services/wallet-history.service.js b/src/js/services/wallet-history.service.js index 7a6f18a13..d8995989a 100644 --- a/src/js/services/wallet-history.service.js +++ b/src/js/services/wallet-history.service.js @@ -45,7 +45,7 @@ }); var overlappingTxFraction = overlappingTxsCount / Math.min(cachedTxs.length, PAGE_OVERLAP); - console.log('overlappingTxFraction:', overlappingTxFraction); + console.log('overlappingTxFraction: ' + overlappingTxFraction); if (overlappingTxFraction >= MIN_KNOWN_TX_OVERLAP_FRACTION) { // We are good if (someTransactionsWereNew) { From 3665ad67645ec328636418b3ce01c9b22e2a677f Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 4 Oct 2018 12:52:20 +1300 Subject: [PATCH 2/3] Adding missing parts to Android build scripts. --- Gruntfile.js | 2 +- app-template/package-template.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1092b3de2..0dd880f37 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -372,7 +372,7 @@ module.exports = function(grunt) { // Build android grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android']); - grunt.registerTask('build-android-debug', ['exec:build_android_debug']); + grunt.registerTask('build-android-debug', ['default', 'exec:build_android_debug']); grunt.registerTask('start-android-emulator', ['build-android-debug', 'exec:run_android_emulator']); grunt.registerTask('build-android-release', ['prod', 'exec:build_android_release', 'sign-android']); grunt.registerTask('sign-android', ['exec:sign_android']); diff --git a/app-template/package-template.json b/app-template/package-template.json index 11b15bfcd..d3fd9670d 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -126,7 +126,7 @@ "start": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0", "start:chrome": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"", "start:android": "grunt start-android", - "start:android-emulator": "grunt start-android", + "start:android-emulator": "grunt start-android-emulator", "start:android-log": "grunt start-android && npm run log:android", "start:ios": "grunt start-ios", "start:windows": "npm run build:www && npm run build:windows", From 8e9104f6f2b1bc712f2d074991b1a364e101c705 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Thu, 4 Oct 2018 12:54:28 +1300 Subject: [PATCH 3/3] Resource file for Android FCM icon. --- app-template/config-template.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 1949a4c85..3d9cb38f6 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -135,13 +135,6 @@ - - - - - - - @@ -149,6 +142,13 @@ + + + + + + +