From 9d45aee4524292dc19f38601bad7fb4e56b3c562 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 13 Apr 2018 17:38:00 +0200 Subject: [PATCH] Added setting for each proxy config to know whether or not to enable push notification --- AndroidManifest.xml | 1 + res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 2332 bytes res/mipmap-hdpi/ic_launcher_round_2.png | Bin 0 -> 2741 bytes res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 1491 bytes res/mipmap-mdpi/ic_launcher_round_2.png | Bin 0 -> 1819 bytes res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 3066 bytes res/mipmap-xhdpi/ic_launcher_round_2.png | Bin 0 -> 3619 bytes res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 4576 bytes res/mipmap-xxhdpi/ic_launcher_round_2.png | Bin 0 -> 5316 bytes res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 5107 bytes res/mipmap-xxxhdpi/ic_launcher_round_2.png | Bin 0 -> 5876 bytes res/values/non_localizable_strings.xml | 1 + res/values/strings.xml | 1 + res/xml/account_preferences.xml | 5 +++ .../org/linphone/LinphonePreferences.java | 33 +++++++++++++++--- .../fragments/AccountPreferencesFragment.java | 18 ++++++++++ submodules/externals/zxing-cpp | 1 + submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 19 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 res/mipmap-hdpi/ic_launcher_round.png create mode 100644 res/mipmap-hdpi/ic_launcher_round_2.png create mode 100644 res/mipmap-mdpi/ic_launcher_round.png create mode 100644 res/mipmap-mdpi/ic_launcher_round_2.png create mode 100644 res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 res/mipmap-xhdpi/ic_launcher_round_2.png create mode 100644 res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 res/mipmap-xxhdpi/ic_launcher_round_2.png create mode 100644 res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 res/mipmap-xxxhdpi/ic_launcher_round_2.png create mode 160000 submodules/externals/zxing-cpp diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c2c972625..d9841cbe7 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -66,6 +66,7 @@ 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 literal 0 HcmV?d00001 diff --git a/res/mipmap-mdpi/ic_launcher_round.png b/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..63b55649e1d5628bc24395723494d06304d09674 GIT binary patch literal 1491 zcmV;^1uXiBP)_5ZP$MGz zXIOznNwH%_MMzkR3YuXiBb%hDQ`5o}-=?O|HdFUXdRYGEi$Bxf4kP8~3t)Zqu0(KHMU#Hty z5274&2C0Vw>;vXY+c}k#0AGaLf9xjWVIwVlXa1*GoWWi)`pOZD2@bZovF>_hW!#at z0IhfV%NP*oN-%y^RgvPv1bCikH-UmKLhC)sG9MgLfV3SA{7CRn0Aj7G&Kf`HN8IaU z)&vtrrR|grwuMlZxtHLgR9WVR>k3eoIU6V^*mzV`XU@JxfU?XG@cBTi5-^0(`u%}c zU^#FXw*s`jPg&;My>p>lKZF+toVZ4a9>;SKsO(vRN}v1%gs2H9dqiZ6&>dZifPaAL zKzWaVyMar<0$JC&9JB;uD{wU+?5~1Y-`%X_xNr1o;CY}8nAx+1HUmqg?Hudtl`^J+ zC<9&w9vfB4h5@eL4Ei(RFKIi+`+3YVgm|Gxz;n`ez8$o9sftYXh0H_iNh3(T5!gyB zwnBapQ$rL~l}V@0m)@<&iJd#L1tI2)0Qrp&dPdsq(S#Q&Sqr(#_FqMauSaP1*Cs>$ zh6MNsjR1MqcO;C4fWW{Q<^KgnzzKxtNHLc-pk-79NZa{=aK22AhJM5K(vGI1Q7$>3Y-8GutwU>&%?2u@*@=gm@yLw ziOk%5-PV#TvT~bs=jDG1h2zA#I;0)#;D7X5f#xN7PmyM9E%>mx>sBGIsv`L!6rO1S zXs11_J3GHpi^Ah?3G$X%iq_k7EH>8jLPG4vjX!}AI-o3bdceuA^oy?&aQCHo0zwzi z@iRafa9CO9YY4GM)^%P84Dsr$QeX>ie2PER05ll@vaY>Ngfr{CUIYLu(E4{(o&8<_ zW;~)S^Gn?L{$At(Hc8uw^*^1C^-a_?Xtz;h%Ua#m(jZrLogEd@FJ+`7#6(~&Pzx0F zd!6Q0On1kL zBy#wkhFz1Nj9ms!ffgdW;O~MJXE(Rhlr3>vPK7Xx2yVOxMA%O`Ci^pdTY~mZgRYQv zSL>jugtE-1f$vjrjsrq~8v`RP1!31%B51ow~;SG4*!(kfq=O-29y}dsnsbo%B z=3#$t2B!imtjN!QXIE>Y^*{yiXOINAXBt-}olYyu+yp#MFglnmzzk_S=Mt{Sr0qNj z%=5g!O-DX3GwG62+RjE`4)6EAoVJC*F0NafH%t7n+B(UPgY t%!|~V1WqP%-Nv7=QoKIi5otRc{{yU~;y=5_8j}D3002ovPDHLkV1myguqFTi literal 0 HcmV?d00001 diff --git a/res/mipmap-mdpi/ic_launcher_round_2.png b/res/mipmap-mdpi/ic_launcher_round_2.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5eb34f7ef2a742428ed920238d22ca3201e750 GIT binary patch literal 1819 zcmV+$2juvPP)P53PqZVQw?KDEFcAOvVYAdGWpbp|*FB!KsU({{`mVhRvB0X_x12}E+&-vUIIz`@Ij5#Vzyb~d%P;sp1#ANLpP%3Z3uD$p>u*RO``b?uqLJcZ z3$PzJZpWNVK?HIn9sstEGp+-81uODxl8L_vGuWtIhiQNV90i)~m~*lq0$CD4544~( zuuA%^S1PxkolsM9G#&9RN(V1^nbd)JG*FX20qwn-Gh=B$>lGjm#y6GKU+TtO@D-3j@LW*tI01J$wM}+j&jrK6T>3St|9A$g zX%poepGE{{`f$@r1VGQ0+E-_MXJ4aHT|ep>sS_a@S$xsm z6lU#pn2T>Bc+k{G6U$@kL*JAp2q9zz#BY^b~B(HaEHJQfeau_6B(X~thy4T zd^Y~i+=hSAm!`a7Pnp0dhe!{hogq*P?VQCs*MkgKBLWdH41`sN@Rt=e<0vYDOA>{W z`?l{!WiBhh^|@Y>&prH*0kC=C-;NqM*=#m^0TBq7yzr{CmHx+WA-VTA+p-1CreM9! zq>jq+Ipr1KdjV-LELq_P|8NhfgTF(k2K(`uxq1NEC4BzV+Ue!=R~M0d@e#cKuF}$a zS1Y|+ug2N?DB5+v@U@_I$MAmIy}2r;lZlNO20E3(m^qKY%4S0A9=No=?m7(q_6}07 z{}ohf-^+8)5iH3$K+%>)S`|1H%^B7_boXZP4}O71myV24l_@1lQb)S^qg?qy||z7vb|4 zuIXd~FVT(ad=K?e3j@2hAygkC6kyzJ(X`$yTeao$p__l;FxIG^A1taOE4GTNb=>U(1|`!Y1F`n2secrKZWjVNA-0> zCV}?U`F6=foKK>Y_GM_n3wpt%P(a~xQbe^MgBkYM~zE7A{gMiDaZ;S@MMXUtq^JjA0`3s6G4 zn#THUvmM#^RCm4w&2r$~66!7D9ND!qZwm}t;?BswQ0|)I`NEXY16*UroR9J@DXVrQ z)*{5$$-Y^?)Tji#w4j<;2%+trLwkUgz{_Oc;7?1g1{^?Z8zG({d!}NH-cuLW?FX^h+qW12_Y;0Vi|9w-<8UCa19ZWZ&bxW5=9l{|kA)kES29>7)Pv002ov JPDHLkV1nZkVLt!> literal 0 HcmV?d00001 diff --git a/res/mipmap-xhdpi/ic_launcher_round.png b/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..5733a1203280bd305c4cb87a57ce2545e1004296 GIT binary patch literal 3066 zcmV zYiXHkaV%7<;sdTSMXOFxN9()Vu|-j+&l06mUJ*rtzzunrg`6b2_wliBRe?mge{{r%4Gobx-sBk2ABXOfGXf{!0q*)gds3ObtF2Qfns2#|GQDzs)GWANNVt_zz_DlBVuUX=->Rb zJdrMdKLcO$$sP}s0Hp)`$a{wZyBXQ2u(2Uyt4HQK-KPT)ykZMLkzvCKn& z2=G1syKC~)?ybN)-$FX2t?CC|0H2Wli0uGA0%l2DeRvSWR{%?sEUs#h+TY}J@E9;# z+NyJ~1y}`~n&$sL3M}?5BHrJ{yMJ|LncJ{MB8)eD7gLD12v`qnk+xEUA;9s#8sBfG zgHGT-zzS)rMSWe=_{)h$C7SDB!c9nEM1hjuxDlA^TSS%Ci~r}%E@U`=^A;xK8e&$2l#>Xj(x%Hrh+aXA5cLIE44 zt)}F}1$Dz5@pQm-@5}&`8?Gte>saQ*+zHUuveJ+D1N6d~j(0?X)sAJ}lp6tz&|ct^ zfa{c~25xh%F8{GJ(}-rZ56EC-8~_36*MV~fGLkm>dH>0P;B9pMmUm90k#9X18&pCc@&xRvnGH)tq{1OOyDMNaxC-uY*_$AEA9_i&7@1v z01F(;JSjT@w6(+oRx?Hfc-67YZyuBYj%8K@A9r>20Wv}*@U&x@;e)Y&`+;(X@8nvp zF$MVPfCgfYWu5@M7jT#bgu>(GgRw8twgAU6%YbJB=CT$Ut#W==RhEehnn~fV+YZIZ z=r9uTv(s`xj%A(<{5xPR%Mb#&v`wUA0e1&%jUz0iW=agR4!;vz){ZeP_F_wmbtoz(}GZB=e`#KGWGdBHuiXDq+^-K>?eSq zt2wI2g?}*0U=S-@yOCSC9fh`H4ZKXIh3 zp1{inSPtw7*zGsmY(v-k?s0%) znHzv-fnQ5oCDOeW$1)>88E`Ie9B|8UCtnnoq4zW`AY4@IyOmfb*$}?(Uw{xXxwLIw zmjGR96$ibK%9$0t12_e(4+jn%20nccT5kt71Amvcy7!3JRRJoz_5nWbwK z0Aj#cX{%UH4J;omaV+yPynR?h1#Q6hrLA&4D{SPcK`ZelqJ|2ZfK7RcT=UeRcD(&$ zLj~)lt#%J50ft%!+?ua1G6*oZgXe&PK!8Ai0D%C3069hnFqD#fJBO73(pD|NkA{!{ zHw-%$ByIHpCFLV1E_oTPzbrt~W5DA;X>!`gupA&cGmHs@iY5YQ0XGgZ@pl3Lz$?g+ z_pP~uK0LbrZhNSI}=s6Mo%`u26#6Cgl<00A=hsdt@Sz5CWlk${Q(pyAr8 ziMww&WK{P+EMB+fbltLTLqJVl!tSedy!~I=jh6w00d%}`CFmk&R>=;dr1HDfcW;i55q;j44@J@CACz(CB;^X!?LxDhx_ z+G3~F70bBs=_aIAKiC#y-j%9A8_x-__V1!Ye2gn*Uuhbr1vyVLc9Hy^#2T)nmie}f9>dHiEW~& zY(vT&Fj~(By|&>Oqt+&FKH)3Bcg(TO**eznb{gaZJkxU~_P|mF)0slVE5Mx++SLd{ z;KpZ$k2rNz)h#PGeq~6X5h@`Rnd-;&v(lY#khVJDpbF84s>^^Y()(NuMx+@x{xR@7 zX{*mGx*BPbIOaIv)2Q|StDBJeg|>8(sr2V4StA#JsN=tnh1si+uT zt@kwj2{;k&V4+O08JHq%wKpvRd=YAa$qanqz7cp4_^Y(lD?`w?ABk61;8uh&7VTCH z=!3Ki!k8~@HMiH8rms<)w3W_c>0%eS9QYL2T8I&pzgfM~cP*!rm9h;Q5v{DPxo79p zK7-1BZt6_nWzs)WravU`QorBCO9OdR+G^>b5`Rtky~H~v07n5M{hw?hMj}2{E{oR< zP=IJDf;DJ;Y>s(YhPR8R5m<*1orsXajcdGZpc!Y?wZ1Svte%})Mz~l5A^#!jIw0-} z-@Q!8ak~}+*QGjbqu*Y<;pT}Ix_N6pvj}$kE-U7b!gu;V`|dSjMvRiG2i)fRwXugf zc31rV+m9taUmHPpSIE$WLZe8;$AIV(pcJnfKyjYhu}Ipg-<+qk!YDr~TH`mQ0HFPo zYW&+zbV8_r7W9OOAws9gC9!_TQ)xvw(pK-`<<%5Q3-^%^g+;#id^i|vN#{}{O$!kI z!8NtP%uiYhj3FNXde#K!?nFXGXW^Bs3Cg9UM$`{yvm-#a5D$Lo;H3=40*?FZr1(qg z6W5tp6~MQK?Ra^bI|H6mby6Dj_M>*z1@J}K0{jFBmMT+e(Ajprb5-dfSr@<;VHNNl zf-+{QP=)K}MgU)gI^dWfI!f6cEX|n!z6e|0Ms>W1mu)b&^I_mlPe#JRf)p zugYS8eRxaS>a?6#Ko4tp5w8H?qJZ=LFy5c;&aD8x2(|ts)Dpb9J3}2YymjAi0q+m+ zGY%z@n3NX*lJIl9+L%N4Xj~y4#RwlMZDmVaeJE{pB8X|3_ruySst;Y1^FAO&-*7na z0^WRlSpkn;h5y9AhPQ~G=%p=PtA+FNjy#`?)*2yFbLl1!#bu>6_c!g$y8!-;o4`1{ zg_lA-9_2h>v$WNwG}|;ncdE%o<=E9a*0}!+ZSPnvZ8d#R1n6<&6~I!wEvS`)NO+Ua z!DGPefgDHM-KMKc7m!F?45XR`eFHcnd4+6HGus@?91l!H>oY{SXs%9lM++EVEYFiF~~p&$iFYD9@Yn2Q3F@Djw1=pLr4*|~$wYU#{e*gdg07*qo IM6N<$f(2{7Z2$lO literal 0 HcmV?d00001 diff --git a/res/mipmap-xhdpi/ic_launcher_round_2.png b/res/mipmap-xhdpi/ic_launcher_round_2.png new file mode 100644 index 0000000000000000000000000000000000000000..6e7bcaf261cbadd1a7135ee4b863f78cc0fd136c GIT binary patch literal 3619 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 literal 0 HcmV?d00001 diff --git a/res/mipmap-xxhdpi/ic_launcher_round.png b/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000000000000000000000000000000000..72823c180b251575251c58e03f05d7993f1764b0 GIT binary patch literal 4576 zcmV<65g+b}P)-Z$L-1lq2sq*WTpvRMWP<@OIe>k_8#e|62C@(c z?2?#wmH=zQ!vz@D;o(3MAj?AV3C|dB0yuydynu1AP3&N|Y|9TxC5@(Q|L7JT%QMnQ z8jZR~^_{~3TGQP#_x}3Ut?H^<7M<{1XBXg~fs=tpfE3z)t7`HMYpYMXE=>vGxz2E4 zSjHg-I1*^f_Zn8^@FeYRi*>4{H9V9MQmtf=VP!GyCZJ}=qZ+GX$U|CfTaINd7E&$p zT*nep=@^Km3OE=@0F!_g;FR!Kp}7XA4FCH@pi)Tn+F%pVN?`Xc&e;NJAyrL;MUwz# zgbqyrL&HA}DdN}I0@%PN;O}9CO9-i2OI<*V!XMieIy`qXa6Iq{&^QngDHKZr*abK* z6wc@f+k83jB=9is1&|g}rAtOYp;LM)gk``YU`8=TFb>v*0>)2s_F&@~Xgj$28z;nP);}nr{3FvL$pgvyvbl_DX zl~*7EjSVAR^&sfnOaN>l)q8Oj&~Cu$0$hJ1a5?aXkZM&=dv5E`pwh1Y$~3*T;Tu@i z<%6VWtTX&F2Y3~DUP#p*CjnK5;q=%7+#?~q}mb-0fi#E9k{x{_gf2mFIQ;x+{$v$6M!E9r*?W82QwXZ_zmzgA=O)P5YR;6 z1)!=Q?t3e+NJ#amtwO31 zp6krVvZkVS(r6=ZwgR(-RCf&ITY>Hb^h4l|A|;H5-jO1Bua_E#?!VpDAB9vuA4mZk z@}dm*lyD%`bDg5vwA-6`)5}lCvKJUXMV{s`3KjJorQNN~Vl6yqUufEOrhA@Cw1OxgqXo{Z`QhB&2#9_?5AKDfG+QY|nMxEOrEf zGUo+j{gUAb&voW|u9Ga9fW*CxraNC+oC!?L=xrCi8{er*e+I$oN<-<80?rar^{AI^ z8}S%A5)*sLm$}*?Eem9{4c4xS_NOf{JA=(OQ=kstKDK=09dq*`SF-dY^`ihFsF;Cd@Ql zgPOls&aiKfnzMdWk0VgVfYJlTj)S!^vk%bit#|Y~0u^Cpsv#cK2&p#rCI`C8*vl~c7fIQbJ0}i9NZ|e=Eh67w0>LRZQbO3OUv6~@-W7%GByITP* zHuf@fq8_*+Ujdn>%a9GXTcLQavo`1HcEXr&aFA;|hC0u6#^e-`=Q?{4yt2rG#vUSm zjQ0Qc%L9he!T++j*=xWQa)}_A&XY3&odAr;a-st3;MzM@-inntlHhf}c`sH%;<4+$ zuKo3D90}`tLaG-Db~93)K4}5T%r3p15q&Izxjt5wa5hay^$viLEn9_D3x!k`FcBCLHbRkujQ&>IM zxeGWGbgc`Q1x^C4C)n}O&|MEISw0{16+)_Afjxv&Cl*UQq3<3f*m)^hd5GsawZKhi ze}*Y;zH=iL_LQfT?e|YF)m-}9NNhkC$wYS3?Gx{AU%q&jdH1%HfQ}MUMQWx**el$w|OB!^3f3W0v{--vizdQq79X zmyf04J=durD7Usd@W&j^h>K_djwYx}uvJLa7$;wpL~h}^&IF)_VA`hwb^*%<9i=9^ zqerRbEx2Q)&#_uL5S~83_s$P`>1C;AMh2Js$yD zNcDIr*}CL=H=gSxfUyKqLx%%b0^0~y!k(S=BtIR9!cJ}%i0^}Ck!`)2RZ)#jwLXg9 z-V|Q#Y#Xb*%D09J3(JzVw|qR;Sjk{8 z7z_r3!C)}-ot9VbD{r`HSf#Oqp*tEbsU72;LlQDxrlvk!yr)j5?rD1Ee#e-|(3y@c zP`wMQer{D%zif}$XVi`#m|nhz=T_*3nKh;&h9Q@TUh-T=dlwD8rQ_I_5lB4Pwi2vs zbxPHEuG6yNs;_>{n9L9gXN>1MF9Y8O3v7GyP67(qN-*T_=v2$HhM6@t8S@Q#@k}Hr z?R!k17rl)(_2*myS`M@T=;lUrN?qr<&L6_}Nru6e@3_t^;6>n|j6XMu2U}muDj*@% zLW06hnH&rJpXWOJ8`G9Po9{d!VcB-la~%!b4Rr3A@35arw)rx5W;wPO@V@6dR~QqQ zcGO9I_SR|I_dm$>IU&_ing4HPxscP*jAcOs9|8wOwd9(iPa;}KFgr5WP|jK*)mOTV zKtd`-?mfUP;2VJQT;~|it*AC;k3S7R9DAHMquM9faHp$rz-Kxi$Tj720lLejSQ>a4 zEAg5)qv}L}^=Fy6MKO#x-}GGPUcGhwOZe&T{Fes)t)r>yQb5*_T1k0TR~HK|qWy#L z{ii(FSyVUQY!nu!T&LmkF+TQMWPkj++5mMLukSe|oPU5&qW{cnK{Ku^W98F(UhQNm7hxyw>(wo{@1FMr>GrEDPr0#i$mDCAj7y6m znglS4VC(L_?mXEpq$=}V$LgH_bkz$BnzD!5?+2QDb=&P*FHXa@SGT@7?>X=M#L1nL zIYZ&ta{n2_ybF^16YR45NhqGac5c24kWD<@MxfBq-=`3JR%i{D)k?5|%0ogblP49R zN7dn2&vj;CS+mi)j9`^+q1atWwYux>c-LRD4p>3qx1{`>VCAL@Y|N!_Lw1^8_;3%$?I}y#OJ_SGhE1~S~HB&53DNFxt_Os_ZxXUMl` zZTb$-U-PyafO;WSs?P!nBT*wkQGos|Sg?vPpHSjm1X+@^i7 z>^b?AnX&Tx@|KWFhp+gH$qm3G1Qj=$gjCIgNH8^FPii!9)oJTMsd@QhUIJ^-R8-4~HFQi)DZvq1F zF0OfjcJi#|1ZJ5Q^v z4PfDKYS~=&t)m|I*L*Nqr<9-70hToqtvk;jE{lgh?nj-8(CjHS~A>yjZ` zv*M@0F44s)mc0t?A0(t|=;^7w&SS#i?Wy$kU0I|Jn&r7FUGX&8BX<2kZ^Y9l0fi!3 zfZ5L?=F!%#_BXCNxVNYGNkHKkOikGPF~m0v9TJX1_592NbWtsPSe@f<+qe$DeW-Cp zY}r#t^;uCPP}q#=+B;Uap#95@4`R(8MQ_4(5YpV{dBDjgABtxt1iUh!0t%zi?|?H2 zMqCXsN`lau4Oj0uZ$JeUis*6RRKP5Kj+KNg{4MJz4!D3q5j{^ZZ^cBSIN`VN>0MZP z+kguw?B3rDoJJ`QG?sKEN>p#0eQ4gg==ayap6i?kJZwA@E9!()dF>9_?^7~_RP%r- z1aoW+@!;mjM4(R5=pEodib~ulu;GVh5XqRQnPXT=)QJ>|4aMNv~hNf5Xh0WNac(rza{2oJdf*b+kOR%zbZJ+Hny}VMl zx78-<{^4`KVI?GbHT3q8km_r(Xu`VSb0O6bf)$?&ft4jDnxzC&V3IAm|4E>i(et@lLp|5AV;zBVM5WsZ)|{Waa|;j)9s{-k8;V(6%X6L6 zfg^gD7Gy2D5c?iZm?!N5)T8w?R(WN;PPIh&r>z4X2=kjSfOJQxnj+iHA{Z?E1gIb= z9@Z5%2&rb5oPavh-s~keT~=R%otPhXXGa0;VXv;(Yyp}G_L;a1cwivJ(v^rZigYdl zb_a%q|8(Z3nPX2SE1)b!I*y>2!ZG2Kb{ueI_kE#^_3<4W&vajgB@J9hut{4B@CNXH z)GMoX64FtjeMSH?G9J9cgxtQ><)9Hz7Gn)%dl}qHf|t5GR?$eOwpc^OT-uuJbxL7Z zk4S5*b$Y9JA&IhKox0rZ1SRN_VRN*$glsjMps=bhq*{~hGye}$F9k54_m5ipXtwj@eiqIsH_7=lD& za5sssTyjLi!-becL|LoyNn?pKqJdn)x z9HOuyNXl9*6HS(T$Y+?=W`>wVC&sM>O4}Zj35)O-t|R{3;;ThOUt^fos#sJPhH1$h zfF%MP4fuc=Kpgn8d#t~80}yuq{X7shOzY*L2GC|;{3kx?*r53U8USgSR;h=f@d5MP z2K50&?tc{y;B7Pj8c+*-?0Pt#VOoiN2WXZ1W4n`dzgrKS0c-^72E!w{u=s!xz{M^& z!#!;CO~C&G4+A>@+b}IVZvb)|rMDow3#4J1UdsD2AD%=Ii6c@2bzH0hH2fD zPXNW;#Io0I3fuzR*WVzu=3KF;uDSWer-1|VC>pE>eh)0jC6Ckx^^5$7^YPgi|R`d+WAPwr`X6^jlfR~(^@>3qXInv^j%=_040n{eN&3e zxL#^7%73l9|1?bNj==<2DJunlf8%zf#-jRw+O)@u#V!lZLTJlWJ9%C$t`{26F-on+ z4-7wKgFA?-x)>@6EU#IgUP+9wwzG?{2bI_XDZQGLEALYNy@ zCj+n0VV;nZr0pGgRz0oSA*VyyW3i~-uQ^fH9?0#WGJu_`EplF8 zGED2)0rf!cSW7*iIu&zYPsXD9oB$s2m;~fRRiRWj*CV0C9$aPA25K7U(`OO?4DPe z3(RR#ZTEi}-=Uw0?YNJ!wyWe(?0KKN{rPM*AfNQb^NQEw?&J^tt zlvq^X-t8$IwP#^o%eE2z5M7K~RmP(F$SwhjMfFdS8M0_E=^!nOf?134jhcjvTOib^ zM*c{ElSU>j{0D!IqIpjsTN0gZa4N}6=jqY|eE}%z_#F|9Q1+8GgipSL(i>l)Lvz~US9sp5LPH@ucR6Lku*v~&eE1!tai!v{%bJD5-2gTK-LGvL( zg#->ciHZm6sdy-jR#=)fJehEI1SQu$hX@t!O;voESl4zjS#74;N>Y5qa)Oi3?DKtV z6%#1GbuCWaHj?XC;xz82dD)E_czqy3VUQ|k>fb_2fRxCjm3gy)@|hG}`Y82_XCm|x`Y_aNA+`A}WZgFE zZl8~@5`-R7-2wgNX`F^MXi#+V-Dtzc5jfx|wDPh2eyQ|FYpGv+8Zyy5$9OQYY_A9M z`6~)9xPQOE1E7_UCFK5~5hq_s;`PU{Ui~$8>_cR{9vN>0zfa{&Spj1M8d~WH(0usE zPN87-9r!9H?DtFi$4{kT&RsMwy=o#P_O_Pw#uGAh^m&8w^rYT@mDImhW34u^cW*%i zRVCL|BJ4CK37>W;zRHP2W?qA|(+Hn`!0*I*{c#aKZtmXrA?4sFC9-KZ%}?J%{N)ES zd6Mc|YMD@A?8$9C=&J#Uoc&|8^5H6sIS%^Cvk4t}jwf%= zv-5tmf-*u!o~!zcG>yQ)(;*O40QK(9d}zi5)lVb9VBSQIljhB2%LsE2nZfF9sii=6kd2wj@-IO=S24mQa!Sz0lTJ(+8>^Pa2Hwb znTRjF{>TbsBJTbcC|kG+U->vhq!i) zEvESfiFC)^V@E(h&#)6HN5-2dx%RhcrNi-!I3$OiXPyAmQPyiqkX9qk?kZ%mnU>%G zBD08FfY7x}qY8ltw9fSF@Y7}YA*cNZ+$F`SMCQ2Akd^}u1P+}}aMFy-;=j?806}Q_ z?EL9u$X9^c!(e0YuF5oQyq@@r_aQ=s$V3zI6%T!K!lMAKNMt5*Y5u)LNe5}AksTL` zNDvXwPo0Md=*UD9;Zx@$^b)j4DI!urzG`Ry)Q7Os@bE>DjAQTKj1U?GBZzPb`t;d7 z?v*r@qySRN|9&7PZ%YBBqySP<04e1^eG8I=AQR-1n{Z6pc+u8xN<(C(JzWK@T zxw~H}DRq!rq&Gi(0}cQ4O*WSVCPJG{HY4kn#w~w{v zL{a6P6Pjsg=Yfoeoy|yjqtm#H*f%2ByVQ%Cm0CmA4(jjxBFXn&0$&K3vUYWqL^mR( zBXpa(h0|zx_7-KmA+FS>S82HS%Op3v;0_GSCXy|G?+TzzKpdeV6D_o?xP|(=&Qy8P z&`Wp#XjySL^>_Uj>8iDDH$JU19!$QxC$e??YAmW(0ed$XcGCDNKSj~JW%$P)u56q4 z@yY>dQ#~)@x|mPw0K3{StrNQPKmd2PFZBJScW$KS+9|ZGxJwy0&%I7!&2nlNOwIU~ zPr^f6c)IdHI?#ECkR$PpJe0DV-{|Z$KuS5ThP%%q`Tk!s@7U;kXSnT#X^n2@UpgVo z0y;0jG=aTqBOjj?BDL|a$V9WUdOjq|8($@Mv7h97e+FrHx2@napFpCE4=(F+qPmm> zCWNWGqm9=TmM*Np7d#iRpLB1%V5dhHANMjonKZxCf~T~G7xZYH&HH8Nh;*CkF58>V$> zr$MM&78-Ug?Da<9Ld%4V$>$K*LH59EfjW+2kHUm}pnI3lPMoO&*yBhDo>?JMn)Ii-H&CK<=xxrz9T z_mEuoEKW@fQLxWTzfUtv>&32HxMzUA3Ou#%zBCQN0^b;>4@}(cE7VoEu3LyT{ zuZXYsDbh|Mo2tR*@2>}RykS~Z`vOoULi-QWDeSkOov`p#96;dU=@guQKU&c+^-hdF zz#~&h8qKdGtws`S{)kr8@9)&O$}p{ayN@whsAj=YbL@}bUxJhFzjrH28|*YrLZjeI zS0h4&M9x-TDH~a@Ey4cyJrZxNz~1>!grxS$*YI>=fo2T4p@7S~m=?v~;FC{oOPF)%&4#m+Qp_Pp#F!5ACcxr1EnT+E!>_qs3 zSgV)dG{s22|1!z9*CGl)ghO8Oq8|ch7^bypzX1eLecia1Wc|*QJn^I5dyvUE*dSAY z1Hp;M5}0&SX2w9I6yLD%AOzA*5u9{7TFHq1%{#ZggS}XrHXaiQ3XQQl1|oV|I2=4&^D zQuxCN5k_{h6`2qMQBq35ti@;rSig8FwwL<-%Uq zCmN>J>p3}nb|JB-J`VUOXOj=neR!0~M7!rx1pJvf!lIjJI4A8Oz!#_@l{nIPFj3vx zulM<}aJ#qX04=#$_H^@yKm_%@e<6ME1oJMxlcUo7ErHL>ys$6u>=QsPM9Y9wj+=03 z%T7g7|5*OnKJ&LP*LFJ?OMxoY5;-g(rp2OqpO)F|a~Tzj>Ow0Wr8|wgc4DWCRBPm{ z4m3>b!vXa`ZWxopZvP;TbgouykkdL~z(ZI&kRE7x1UOseLpfVg{AEx9a=pyTVe1pWXVgj(n9Mb!Z_4AWZY84uJUxqcTo z7C2GC<4KhQr+F%bbplZgSPe`hmuEK)j-Cdl1D9ng-2L(l&W>HKmv}OSbrRC10$%`T z0cu0)PFqWW=6@SI^*h6~e%yN4+4Uc-X5qB^Wup08{e8*ADr@ZMf68q_2E}0>T>f~W=RHs-#wZ5113o|> z!qDsn9%^0e7rQJdj0cml3!AkrK|hqtmONwJT&C}`Q)s251HwUwt4)a_U)=OaPcf4~D!`55uk_J404w&)#EIP1=grm2Lwnfs6JAfSlT` z<8hz~*ln2BO#^7RS-^3xT(YJHC zdjPDK7kzRHvZ5tnD)5p!kN{7Y@@pA=W(=tE$scc=2l zwd3!eP7?CcM33^nuS@AfRs}tgXsdo0rKUqYV*<O1Mgc#^Gl}t6td!{{k zVAhNQu7EaDP;uHJ%xyev7lvA|2c%7EPdc(vB!c+1?`mz@rz;v+Kyd@yk-r_V6;=RC zG@G>u{Ud(8e}zV26NKOtojCC3l@Xu4j*Vvrp*{x1VyuTen`f|=gra5>1Pmh~g3zZis|^ds2sx34u97wFk-+bLUJ%dX&q}8daTZZ;cUhw+ z5a^?5U2<>_rwr5;i^A>Y$jhf@IF%xjekn|KZoCLRc`ij;md$^O2M0UQ4`l{VkSf@mX z?*6@taaJIP?`0Diy7c20Y5}P&z8Y64x%G^`ZSXu5BC%5UszTudQn)Pqt zB0tbXzNuY&`IE_ZR=1nME2;$S1DYG}mq$^O^lpj^49cL#O6roh_N;Yrk}(Zm~ENPSt>+)*$c3N87Z zFTMvnOCp-|lu+pF4YrU2U%1EWC;MA`rO_^fi#$(z3vV`Ii`Z)K7q0nm2(!+}2Jtgs zxnR7%#`=|6MpsTC!s$QO)|#-WDTqJs=G}e|XF~rus~Xaix&XP=t1Jmz+a-($9|t;Z zI%GX2q9wL-m$@N|w8)nDgXj-BM9=cxjQ076N&%b6bpje+WM8Uit5U`_}ZS}YNO=tIPy5`aGE z|DQ6&7r5D%+^4B2kiDqSaplJD%>fPm;XMHJ`3%X=LbT|H#zu z=TEQqT*?JwcHlTJxmKg| z^ialVeujGY?X>g44~pc+wC>yckwuSgrERzN1=W@a82j-w-Vr+DnEEXb=8V7h^X|1ohv4%lsc(O-xWgZ`iHx^Q%|gugT}C#fWEtMEWMUw7n6hwCp*tHQONkj8x9 zb==Rs>M~W!_V5{V*U0xW?k{=~_Af0Hv5Q4NaCkQcer;)7I2>ESI&OTFJa2^?NZ--w)*ZHaf9Mit6#l7qU;mYOqz4@s50j) z9XqNA>{pI7)%rd?!ci}Qer2~CBBUJyw$9C8k32q^v`XT+7P2PS&Axk6%}|)YklI%G zcvDGQUoN1&i)BA007-;d3$<(Ia(-sKw&JfpA0RRxPyjbGma^?WI8Ddj40zO@+o&03 zPs0-q^dGX__nV?PRm}y&p%t&!ih^{$=3g3O)GZnqxHGK42o(5 zK{2mfv(5Z_uPYZT(>;h(njg%_HSu;|W8v4cN{{|C%*^J&pc^K<`9XbG@?w2Drc*5n z<#;73!MS*%I=1o8QhhUaKtKVlRSYlJl8L6drhk1iy<+fb_K9s3OX}dy`0El0DN=Uh zc@0ChjFjon6R9rhFt$<3y3Q*>6qZG17zv!C?|mF8`q?Yc-2%Vz)%OE^PM%X~OCGm& zFsHW}u!yd+xecG3-onk6SSPWV5&0E5rp*0zXCi-Bs7g%4E{^OXR|;&j;F~$f`KoQX z{l)I#Og_z=SVNI+jcB80>{{RL1<_?s_kU^v8=(%{i+eI<++Fe?Cw(D7=e&O#Tm%#O zLMl`L>mn}ivMUq8Hz-*|r1 zPAy2zYLyHNxaN3ldn1k%B(GvGbQIs_*!1g;|F5)vX8bKc{S91MSts30mZj{AE?_xL zH`jLikhyhF3+3Z<|J8YA2kcxYUr5UPcqXZ%v+~GShMk?o%x{`3?{Or4IbI)+mO)Xz zE~HghdOj^$$hja~2+dP${$^;W})BGnL&Dh2v4-B63Q-d+3T&4?2o5dbV)(?W&;Fv;N`l4@@lAsm)lP zcYnj14Ob4bp8Uf+cw+1qHZG_!d!N)m0UKYjXr%AT*e}vNrWV5gF&&+yU|@4Ob$jcE?Rkv;FG#25zjH+{x#ni?Yg%~A%v2Mxh!dezPkF&MO!ZT zc*^0*tl#xeQOZ-(yOFO&VKoe;Ezuu*U#YjW6I0@r8+vq=5{$Jpue)osmb`RA)r1ig zk0)gDYkQ7PU0=jo4+_j)S9}kCotw$N2Ck0QaeBawdc&-6ne7IE(vLY0t)To9pdl*O zwU{JMyD5Y7m1ZnzmZcHz1YT1U6>5Y9xhX?NmmZ2D%$xR5di1Aw`PLB0ahOyb4d zJi+-w3N#0l$A*;Hm6yQLMsdF0<23-L`HYDMG{Pk{#l8V!Wgm{FH$t zDDO#mYM;Yv3uxTqQmVTGS`Pwev;A;q_&l#(56_Y7a;0(UL32UmU z#3FT;dwWUN?jrbZ;tvba zRV~?dx0?8^DA~>(Owugn*6UwiMaGS4x;lq{IxEax!JMB2YcGY-s?tKTPG ziGWSy_X}V2$m&FW=@p9#YeUl6d|W@${T@Ur&^$ocN#|_y;uM9MkFn_(uczAUszVKO z@{=Cmn&el`^n=@Qa3$DCvVA;m@H~m=9OqfT7|m#wmpfC5(W&q@C{|3~dwRMt*^g)a z-QsZEB4-Z{X6#sv5O+SB>AvtevRsIVef?&9pt$VkNL7+isDLr%?;{l@-{{V_cU z$Ksp`Mml2GP=YZ(5kUCt3&ouCyhLB8EAI-s)cp*7pKOn!yo3GSIY@){j7)-O%SG$% zp+pBkrk-f>9-E%(qLO(}mraB6;>zgLuvYJYT`=UKT9HMP?`VHo$WsFdXQ#dlD2(+W z-u6+7cfqEVle+q0g#C{rsat_v8%HKlvjfgz)*9I%znid@#w-b6PU#js=|ncRcvxxW OIl$zqg<&1SCFXxvimBxQ literal 0 HcmV?d00001 diff --git a/res/mipmap-xxxhdpi/ic_launcher_round_2.png b/res/mipmap-xxxhdpi/ic_launcher_round_2.png new file mode 100644 index 0000000000000000000000000000000000000000..67fc5b1fc01bd5af6d6cc2d7f7c5a2d5ff4c4612 GIT binary patch literal 5876 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 zimSt5pref_escape_plus_key pref_friendlist_subscribe_key pref_link_account_key + pref_proxy_push_notif_key pref_echo_cancellation_key pref_autostart_key Outbound proxy diff --git a/res/values/strings.xml b/res/values/strings.xml index 776ec20af..8c4aae712 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -331,6 +331,7 @@ Change password Use as default Password changed + Allow push notification SIP Accounts diff --git a/res/xml/account_preferences.xml b/res/xml/account_preferences.xml index 48322744c..6467d2efc 100644 --- a/res/xml/account_preferences.xml +++ b/res/xml/account_preferences.xml @@ -103,6 +103,11 @@ android:key="@string/pref_link_account_key" android:persistent="false"/> + + 0) { for (ProxyConfig lpc : lc.getProxyConfigList()) { - String contactInfos = "app-id=" + appId + ";pn-type=" + getString(R.string.push_type) + ";pn-tok=" + regId + ";pn-silent=1"; - String prevContactParams = lpc.getContactParameters(); - if (prevContactParams == null || prevContactParams.compareTo(contactInfos)!=0) { + if (!lpc.isPushNotificationAllowed()) { lpc.edit(); - lpc.setContactUriParameters(contactInfos); + lpc.setContactUriParameters(null); lpc.done(); if (lpc.getIdentityAddress() != null) - Log.d("Push notif infos added to proxy config " + lpc.getIdentityAddress().asStringUriOnly()); + Log.d("Push notif infos removed from proxy config " + lpc.getIdentityAddress().asStringUriOnly()); + } else { + String contactInfos = "app-id=" + appId + ";pn-type=" + getString(R.string.push_type) + ";pn-tok=" + regId + ";pn-silent=1"; + String prevContactParams = lpc.getContactParameters(); + if (prevContactParams == null || prevContactParams.compareTo(contactInfos) != 0) { + lpc.edit(); + lpc.setContactUriParameters(contactInfos); + lpc.done(); + if (lpc.getIdentityAddress() != null) + Log.d("Push notif infos added to proxy config " + lpc.getIdentityAddress().asStringUriOnly()); + } } } lc.refreshRegisters(); diff --git a/src/android/org/linphone/fragments/AccountPreferencesFragment.java b/src/android/org/linphone/fragments/AccountPreferencesFragment.java index 29cec9696..fd13a8039 100644 --- a/src/android/org/linphone/fragments/AccountPreferencesFragment.java +++ b/src/android/org/linphone/fragments/AccountPreferencesFragment.java @@ -260,6 +260,18 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen return true; } }; + OnPreferenceChangeListener pushNotificationListener = new OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + boolean value = (Boolean) newValue; + if (isNewAccount) { + //TODO + } else { + mPrefs.enablePushNotifForProxy(n, value); + } + return true; + } + }; OnPreferenceChangeListener disableChangedListener = new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { @@ -443,6 +455,12 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen Preference linkAccount = advanced.getPreference(10); linkAccount.setOnPreferenceClickListener(linkAccountListener); + CheckBoxPreference pushNotif = (CheckBoxPreference) advanced.getPreference(11); + pushNotif.setOnPreferenceChangeListener(pushNotificationListener); + if(!isNewAccount){ + pushNotif.setChecked(mPrefs.isPushNotifEnabledForProxy(n)); + } + PreferenceCategory manage = (PreferenceCategory) getPreferenceScreen().findPreference(getString(R.string.pref_manage_key)); final CheckBoxPreference disable = (CheckBoxPreference) manage.getPreference(0); disable.setEnabled(true); diff --git a/submodules/externals/zxing-cpp b/submodules/externals/zxing-cpp new file mode 160000 index 000000000..9d5bfe077 --- /dev/null +++ b/submodules/externals/zxing-cpp @@ -0,0 +1 @@ +Subproject commit 9d5bfe077dc53968ea1a4b386be7a2af14121aa0 diff --git a/submodules/linphone b/submodules/linphone index 701685a9f..7705ada69 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 701685a9fca6b420861d1917cbadffae6daee71e +Subproject commit 7705ada69553c274040ce7b3164ea8c1584f7edb diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 65946f227..0be2e0ed8 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 65946f227bd94548264e99ea13c662b0b899c18d +Subproject commit 0be2e0ed887ea9db50666d98f0059c92a3f38ad8