From 1cd5949a79838f74843914a30fb40429bb2e7e8b Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 9 Sep 2014 22:16:30 +0200 Subject: [PATCH 01/13] added a list of XEPs --- docs/XEPs.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 docs/XEPs.md diff --git a/docs/XEPs.md b/docs/XEPs.md new file mode 100644 index 0000000000000000000000000000000000000000..38eece439351d59cce7965151c1f9975d5638c38 --- /dev/null +++ b/docs/XEPs.md @@ -0,0 +1,16 @@ +* XEP-0030: Service Discovery +* XEP-0045: Multi-User Chat +* XEP-0115: Entity Capabilities +* XEP-0138: Stream Compression +* XEP-0163: Personal Eventing Protocol (avatars and nicks) +* XEP-0166: Jingle (only used for file transfer) +* XEP-0184: Message Delivery Receipts (reply only) +* XEP-0198: Stream Management +* XEP-0234: Jingle File Transfer +* XEP-0237: Roster Versioning +* XEP-0249: Direct MUC Invitations (receiving only) +* XEP-0260: Jingle SOCKS5 Bytestreams Transport Method +* XEP-0261: Jingle In-Band Bytestreams Transport Method +* XEP-0280: Message Carbons +* XEP-0333: Chat Markers +* XEP-0352: Client State Indication From a1d6f91036d2164eb59442248890d26c99a59ab7 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 9 Sep 2014 22:51:25 +0200 Subject: [PATCH 02/13] added bookmarks to XEP list --- docs/XEPs.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/XEPs.md b/docs/XEPs.md index 38eece439351d59cce7965151c1f9975d5638c38..8d1d0d5c5fd08f4e4c6cc99af295c82fd271cfee 100644 --- a/docs/XEPs.md +++ b/docs/XEPs.md @@ -1,5 +1,6 @@ * XEP-0030: Service Discovery * XEP-0045: Multi-User Chat +* XEP-0048: Bookmarks * XEP-0115: Entity Capabilities * XEP-0138: Stream Compression * XEP-0163: Personal Eventing Protocol (avatars and nicks) From a6d4a9cda1684d9a316146de4c6797834f7b0121 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Wed, 10 Sep 2014 17:58:37 +0200 Subject: [PATCH 03/13] started development on 0.8-alpha --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3999b4876ba4bcc4a4598a05924204c5270c4a1d..d9a5f44da876e1986bdb16b8db662b6da2ff6cff 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="27" + android:versionName="0.8-alpha" > Date: Wed, 10 Sep 2014 17:59:57 +0200 Subject: [PATCH 04/13] IT'S CHRISTMAS ALREADY! --- art/ic_action_send_now.svg | 69 ++++++++++++ res/drawable-hdpi/ic_action_send_now.png | Bin 578 -> 0 bytes res/drawable-hdpi/ic_action_send_now_away.png | Bin 0 -> 932 bytes res/drawable-hdpi/ic_action_send_now_dnd.png | Bin 0 -> 1135 bytes .../ic_action_send_now_offline.png | Bin 0 -> 767 bytes .../ic_action_send_now_online.png | Bin 0 -> 1095 bytes res/drawable-mdpi/ic_action_send_now_away.png | Bin 0 -> 650 bytes res/drawable-mdpi/ic_action_send_now_dnd.png | Bin 0 -> 784 bytes .../ic_action_send_now_offline.png | Bin 0 -> 535 bytes .../ic_action_send_now_online.png | Bin 0 -> 779 bytes res/drawable-xhdpi/ic_action_send_now.png | Bin 759 -> 0 bytes .../ic_action_send_now_away.png | Bin 0 -> 1180 bytes res/drawable-xhdpi/ic_action_send_now_dnd.png | Bin 0 -> 1438 bytes .../ic_action_send_now_offline.png | Bin 0 -> 968 bytes .../ic_action_send_now_online.png | Bin 0 -> 1395 bytes .../ic_action_send_now_away.png | Bin 0 -> 1426 bytes .../ic_action_send_now_dnd.png | Bin 0 -> 1456 bytes .../ic_action_send_now_offline.png | Bin 0 -> 1433 bytes .../ic_action_send_now_online.png | Bin 0 -> 1458 bytes res/layout/fragment_conversation.xml | 2 +- res/values/strings.xml | 2 + res/xml/preferences.xml | 5 + .../services/XmppConnectionService.java | 11 +- .../ui/ConversationActivity.java | 104 ++++++++++++------ .../ui/ConversationFragment.java | 53 ++++++++- 25 files changed, 205 insertions(+), 41 deletions(-) create mode 100644 art/ic_action_send_now.svg delete mode 100644 res/drawable-hdpi/ic_action_send_now.png create mode 100644 res/drawable-hdpi/ic_action_send_now_away.png create mode 100644 res/drawable-hdpi/ic_action_send_now_dnd.png create mode 100644 res/drawable-hdpi/ic_action_send_now_offline.png create mode 100644 res/drawable-hdpi/ic_action_send_now_online.png create mode 100644 res/drawable-mdpi/ic_action_send_now_away.png create mode 100644 res/drawable-mdpi/ic_action_send_now_dnd.png create mode 100644 res/drawable-mdpi/ic_action_send_now_offline.png create mode 100644 res/drawable-mdpi/ic_action_send_now_online.png delete mode 100644 res/drawable-xhdpi/ic_action_send_now.png create mode 100644 res/drawable-xhdpi/ic_action_send_now_away.png create mode 100644 res/drawable-xhdpi/ic_action_send_now_dnd.png create mode 100644 res/drawable-xhdpi/ic_action_send_now_offline.png create mode 100644 res/drawable-xhdpi/ic_action_send_now_online.png create mode 100644 res/drawable-xxhdpi/ic_action_send_now_away.png create mode 100644 res/drawable-xxhdpi/ic_action_send_now_dnd.png create mode 100644 res/drawable-xxhdpi/ic_action_send_now_offline.png create mode 100644 res/drawable-xxhdpi/ic_action_send_now_online.png diff --git a/art/ic_action_send_now.svg b/art/ic_action_send_now.svg new file mode 100644 index 0000000000000000000000000000000000000000..6bde9158fad2bea9936de7738701af2ca5d6b696 --- /dev/null +++ b/art/ic_action_send_now.svg @@ -0,0 +1,69 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/res/drawable-hdpi/ic_action_send_now.png b/res/drawable-hdpi/ic_action_send_now.png deleted file mode 100644 index ff0e369ee4e77c759668f484b413bd8bbadabd7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 578 zcmV-I0=@l-P)g;nk>&nCnxMIS@;sApV{x`WMjR6BahjI`6e{ynK+S~O1 zdN{o;)M^w(Q4~c{6h%?gdg}FhT|{#qywuAKN|L0HbdP+B_?S+oUxx<3r5i+!7+3~T z7Qg~&=vPlHgNOuu;1MZavT2TZL%fd1Awt7=7Tm#IT@xL|rl%SF?-M+Hlx!MGP^%jhLV!7FGeABV7m%;hN~}E*lpZVoh=pdqsuAFO@?xY)qk2;0r_)i~6H*BmU zKeL={dR|9?KBQIlx=rIY7#ALjidU|&;&C~s+vKs*_wlac3Q?OMXaO*1ToXWU(YPjn z)S__}0RGn2v}jzb0#d8SwE$#RjcWnOts38D1qAg{v@`%Tz}&KNjS9#t8?OR@iQfn% z0CLO5MF9N2Lt@Lur4^7`H!cOxv2I)nz`c5Uuxy;7D2k#eilQj$p!Flb0N@VYT%`vC QQvd(}07*qoM6N<$g4U+^0RR91 diff --git a/res/drawable-hdpi/ic_action_send_now_away.png b/res/drawable-hdpi/ic_action_send_now_away.png new file mode 100644 index 0000000000000000000000000000000000000000..505cbe63abc1a4af6e3dd2eef57a82e53edd0e60 GIT binary patch literal 932 zcmV;V16%xwP)d&*wOysBxtt@uN~fTO`B)GeW2XVn7Ut zfq@AITG~=1#J~(HJOBd{X#xW~Z;&i~0CrG+)4l=%D%$vCurE%UM75La{G6p~V_%<> zYdbft=qe8pzOkTN3?UBSpe$09B}#Is-$F?dEpi>@LEYcB5h}wnBccV)AiQev+E9du zszOQLpp3TJW}riYfTBDGt{$`PK!yYX1)0U+Uc5cn;gAZ;x|yH`3ZvJ6b6aUfC(X$<%zck#Jp^8hWVVlkvKpd?pN zp4b>T230JCGzNT;5&p7*BHg(qF<=*^+-XQ-06qpNOM3@?gKY1swG3% zMX2yp*JEwoVg|0EJW9hY5ivuW13pTg46oC4OT;lD%>e*KxdDs=9)gD-{uD-gdV$x| zCZu&hJ66Qu6nV0EIAK%`4`nP2^Z*aV>u6;g2W5{8WfPJtAPHY3#~(a?*ToXX`gOlU zp5W<7GQtqovUbET9Dd^9;-EMj;vhIkxZ3i&9ADW-*-thDYvS@9j|?6M;XCVu?__kH zcqn;{0q^A`qnsn9 zkA{|XC~jyBIKfoUmI_^p8yW*LJve=o4WPo3R&5N|7$8iicKTQrH$(v?$>K9<{RB!$ z+)zIQ7py)L5;pNErzLKP0&14-|3-WyAya zxC8;`nV^>N8&sdg4M9MSnb>;_h`1pLh_irGwoocO)9v)N;^QJB6q#!K0XCrG2A2Y- zTmFxDz{L$N&XMJVutja~#SJbRUcf^pZg2q~pVeU#H~a&vt7n?s>SX8u0000XhP-9q8B6-gXl=5C)Wu>X)4`e!O3<#n&w~E_4*u-gc0W{0pkOBh1N7 zxgvD5951;7z8iT%b;mF#OEVrqs)}wY{sEv@E;wMOLr7I|6jnbK!p0>B&SVIwDh|t) zhpPN2%?V1nt4c|@-)Q75mj+T*bi!Ilq~DBl;;e))0Q}NvbX9RO&WWTHG4MsF9Dj9C zs#f#SOXHym05~kwK3C}L6RgxKDAgCId_@KUoiKinh~Cd&#i@o20-oG|qtX-iIK!2v z5;6z?Z3f+N?C7M4=7(@hrOa|{VFG>qV?<<|Lb~uB1P`0axYMJstkbok0BEwpyN}; z@t7mD89XiT*yp{#o(61G$Gs$`jUUKNFjEzcLt8p5W|(jaO?6ckb{bK%pQ||DL1QbMFCxw%}Y6c6Zw6y+0B# zH|L@(W^_`#_{s(1o{<1yj!aHBrZl7#_lyLvXf&9cDI&nOaZ*n!?imU=D3#`zZr#gP z?d5p!i)Q>Xh60?MTW2Fv`S>Rl_Y4IXJYF^flF3*cUxJkHx$6c5pw!!;l=M| zB<>jm{Py5MVMQg(`U>PF?imCuJ$YKr@^3;4G)&;?d5L=l0mexLp8V6FmbhmSAWYFD zzkjDK?s*YF#IzRQzsmR%&|niJ%dOvcGj>Zw005n}>MD_r^#pa@;+_Bigk8m?d?=a~ zaZdmMEF4`nKB{OsW0G?FkDY0Vr6nLD>V%c`i|+rkD((r6mg7YSjQo#y*2O&m3LF74 zc!3m6V@$F%oy2rQnCs~SY-{b#_&yB7f0bT;X zi=sH9hh)G2cqbyqz^}fE2=D-SQQFrl5dp3PpFPKVAtFUlAR=FZ%_Zk_T0{k21NZ)O zZYM=lU>|rEIOYT=GHEeaFe;dl$Yv&{oDGOx458#sVHFDe>85`FHN&)~P@&VXw<3h9~QWba# z99Uk!Lynbi5?K%c5Rp&7wn4C18j1J>o&%2z zgT*q%wbm%)WS_u&;8hF3VhIxQ2@HWREe4BarASQxKtvt_SAi>)ZIiSUyo^`GE3l0D zs&z#0D7aF+1G}VKDx530QWZ$iK4V;u=N83M z3YZ30&ICkc4cM_PKBtx7O8E}l#P*%g1lQxaVa*z40ju^&5?rwqNE%$p;Os%=R>K+- zT#uiarHVlBz&7zuP!}3pQGvaPF`Wpms6a^nAK`)@x0olIOhkm$Z=^dJT*-iI`2QpB xbZ{l3-afquu4Me1z`Y8tWWXQbXWxP=e*qHBN|VMN5;y<=002ovPDHLkV1mksFmwO_ literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_action_send_now_online.png b/res/drawable-hdpi/ic_action_send_now_online.png new file mode 100644 index 0000000000000000000000000000000000000000..48676f7bdfd6584d541b65a8d9768703f483e953 GIT binary patch literal 1095 zcmV-N1i1T&P)Bzu(8_v{Ca$>HtFh0dee$K?++Xgir^I z0Wnkz3{0RxLmL=S2WC*<4`5&@NBO4`3!uY^QOBx-mo$5hcFoVMtyR$4PS+ z-#N}_jL*+~KDzhyogL0Bl|NDC?~S{S7S17J5TV$;nWdTea4{^OwNP3ZJ`CSMtRHv( zVzO>#(RsNdEI%l}DgnOjd*z&j(994nhu;%+>Bu8SJcMS3>T=~X17=@(A@&snw zP}Qh)uhqzMuBRIS0O3;jHEC0MoG7o5o`C97rnELPt%iNDBV@JX0) zLyH=(#TEP&v^h6ypSt%2508`2X10O4|YpRg;L*rnjKAx8y#MA&rwgbxWi9#u}cBLb|*ndU%>3+*@>Oa?eB86OTkGYeE|Rv zJ`CR#)yn`KNT+}U;HY+Km>c{c1lwX7tsDwDGT_)D3zSNwG9iD9gTR3uN79*MQb`9N zO1jfL*(P#OJQrHsholNf!|dbPvH0KELE(TMw`+9l&_OT>z)|S{brepRnWUZXLxLRK z0RUTDTM}3xvMmA$q`;1V5LFVXb^Fl*w>zoo#6A6+m~kmLs{|w!_w)rQSmGHh z8yXq~(fS_=#XUU%*MGV`K0a~bwQSX1PFH*`ow%nbVBC#Q0XmdNg+awVJpn{qvYa1v zC}_w|F7yu>}-fK6<^&J2GOBG8neSYNrF zkGQ8BAk5|lHY{<^fjuzT4Q$xro&bRVdHoGQQx71}B!cMa+|y^7+a(|XfXda%m9*cW z&RX2FcLm64B>Y}5D&n5K0BGq%eM*Zvj8?x|UC&=DIRQylmMT-n-oQpw+!K@^lwUdW zf5am$?g`|Aln@{I^r5sUj8;D%ZE;V47}EgGowz3;R8c7Wa^A!}{{e3=9&B8Du*LuY N002ovPDHLkV1kGt>@5HQ literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_action_send_now_away.png b/res/drawable-mdpi/ic_action_send_now_away.png new file mode 100644 index 0000000000000000000000000000000000000000..0fdca901a5d8443e450e352629fc618bab00be46 GIT binary patch literal 650 zcmV;50(Jd~P)fmYp0YQc427$HC8vpC8)npkh5;e>STMV=E-st>=T|28e&?4j$z;N6 zu<#1bear1{tm8kF0YF%@oP^PGGC996XaJL7;jxI9^&<`&aA};YmP-Qx{Fsh%r%vyi z&I|}bNvMX=M-pRKEpQHHtbH1T`(fD-oMfs%hJ9$g4f~4Y?V6U{=1h}>q7l#ji zo%q%p@y|@^yVTth%{kT?pOi1cr#ME+Yt_nu+md3F#a=l)w8x_(_P0_)IYVm+fB;x) z)NVry9SzevYM8*m-DoB~)vPgQtTuW_;~OU*#2AR-Ea0n(z^Z{4-`QQ=27rb!=@ie6 z;XEM7oG&*}`L7~ literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_action_send_now_offline.png b/res/drawable-mdpi/ic_action_send_now_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..7723f4aa94b7a5eec5fc5baf0ce02de7afebd030 GIT binary patch literal 535 zcmV+y0_gpTP)K}SIY zqM@NiLTrMyBwJtwc_*t#Hxy$>jx%v=XKb!CjqUOIJa=phcm#fpF=PIrYJh+jNfV%7 zHblS`@DMpxDnvjN_;8#n1tMb%l0JdPmTRT~WK<;J3Ao&GZ6S~la1Gq2oHGM@z91o> z4ZLTZ>je@51bhL9IqosTwq}?c03hiZxX5#peIQZ54RE^$AgnpIHK`y`Ko@xP0LTQ1 z0;<3__Vets=GfK@5&;3?6*%_{NQA@zEuak?Zy9;sl0?WFU{^`1C*b0vy5n{WpjXML zuLh$M8FGv?wFH)H8%|OOIKlpy;!o57>KVbV8erd!1#Is4JBr(c18nc-(Ss|1q#AHq zR`3P@=-~GoFvKpkGuQ?2we+ciU4SzW!F^-QEX$-CfTRl0Ei-rx0JMOEjB`iWrOp)` z2W08Lm*6-cP5(#OrJni-&H^YTcmjIcKX{|HEw4UYZob&(n^h{aV zD!&ln_vTtNz<(G91Zi}=vQ^peYF>HN0D51%M=~fOTgFiV--G2vOtxGYP6mg=c$4njB}9U&$NEu;bW8%pj=DD_}1I0k^&ji>S{L}r0YlqvuN z0E$FkYrr76e~!>^ue6W;oR0uYn@hG9^&XR7i5rD`04MiPioD40KY)s+Wu*S&FX0}5 zUYzIh{zu`}!Qmc22$qQK=TC#C=@$IPM&mHeIvW7EN#hmEGg71?ZxZPVe0lW0~ z-tM)B5sm<6+>{W?$ioqUA|<^J8~S^%MiY(zP$(^{I_mKC_zhonX2v_siiQ9H002ov JPDHLkV1nI8ONsyh literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_action_send_now.png b/res/drawable-xhdpi/ic_action_send_now.png deleted file mode 100644 index 373dde239e0ebd7e9935ae186473c955cfce9081..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 759 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m}YvqIEGZ*dNaq?U)oW?;e25S3#;B6rZv0U9<5uzaMG)h zTWXex$jVRYL7(M+$gXteoT{3U+4-bPtjpw#S9i+Xj<+|=H*c?g@40%a{g!KIZ|{tJ zKX+~_&~{{yZ8X#8+>*C~onK#=+dinU`KNfd{N;X+-^TOL{})P&W>kLJw{+^IbApNb z2TFtg7qAO{V~Sh)JFHqt@c)A4Asy?NNb6Oe?%pDuxj%jLO>W5xHDWt%)@^vAo6@qW zp;7KA)BbQ!I=TP=S33$|aH=W;~bG-0<@!QQ6=<(KL_dn?qK%}zH3zhsN%3G~=q za9=y<9EUICIu3bLgOE!~CaiC~%WplH;MsLSuT;rA`5j7#LoDcRpS%bc|q*KHc>q$+1tB2yl!po$Vlydky(F0 z%6f5_&99`tH)isDh}@8seuc}Nb6M_b4sOQwwpI%(K{2Kn^Ru_ywOt}Oe!LJ;Ra(=v zLH~&T-&HDXKHa7FA36UKHEN$7`%daZLyy6k2GN^_YjlHGM;VC4pI-WQ=@h}eIzfNl z_E-8|%XnD0)8)xBr8}`Q-+kqdFV~UPF-kT+8XOR4ZQ$p~<+v}#LiLT?CMBat-dZ!O z8N$;RHnRLkI@!ZNgVC~)UweVlhZKj`O!=A%6h1Vv)NDBG@SxXN;mMo*pQG9RbK@A7 zXeg|b-nxZ#3X5GWW8nQ+E7T6;ZxZ~`AUQ$!#|9=YCiyT2&j*jsHTeDU@ONzxdElGA ze|Peuh1`wT&ov}9A1ME{o_h<+6qbE=B@fIm&EWhnU7?-DE{5$1i`|-rt^@6&0YX4y n^6o~>JHU*bS{NLzR|+RE7;d!x!1aHrF-XeO)z4*}Q$iB}O!YxH diff --git a/res/drawable-xhdpi/ic_action_send_now_away.png b/res/drawable-xhdpi/ic_action_send_now_away.png new file mode 100644 index 0000000000000000000000000000000000000000..bb999d85d4e128d988763034bd6735356693c388 GIT binary patch literal 1180 zcmV;N1Y`S&P)?qyPW_8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11Q|(0K~#90<(oTm8&w#FpKrAZHui>)Vaz35tb~CSDFRJs(u9IE zX-EMyX&mA>nSmw^X@dC!6q$)6hcKR@`82)QZYD&CszO=rBP?XRW~xOr1ytlZaQ=wbPNj&ZfRbDy;A)@8OqGbHfCus} z$N4Vju~Q);0N@|~1`cu_dj@5d4O!!%d}zHhPc%mWKuK;8@X_FB;wgvJxUD;udhG9ymRM zUh0fMM4EuBz$KqebWz8nh+Y9@IgfDNNAV-5<3U8PfZt?+=iGN$G$(Z&is%&pP?5X9 zl8b@^BkZA6ZHq`3@JOx^bJ1oYYgiVME?`4GMfuuB0cThekuIPluM_aYFemngu!m6N zTiqJy@KgZ+8*&fjF3y5yCMyO{CBz!kvITY|0!;#C~gJNlR8D$lMmJjjEOipP&2F z5fNSx&>%qDZi1i);%FKv`zZVFM!*Akh1Xc*dD~x=wza}6ssW2A1vgEk5VJ*rDmV2R zqqIciyONVz!8>aYy&kp3dIW zW6q&maMqY>ge_iX2RCF3XiyxZUA%w#3~tC4AQY`N<%68T4e0_N%PHW5jlP^SU~oga zfJ4p<)szpEZH`f8Ww79ebOAzK z0S6SlelwVbvJKR@rFEBOdIba{-u^rVH}nb^)dJ`_xS>l0v1gBub7fAKzn#Y
OwbU-4&*8V>s!3~LkVHdy&3vOr%SeJk|SsrNqPiSyMQ^0B7p~3N7M=HB0 zHP-Zri^hD>6!0>~2cRhlZZK=W(N}<`EV!X5pulqG0yw3?4IyP&O8uWfVVB1A1~-HR uUEAM`1UH0eYyQtza6<^h#FS?(xZyvATHvM7m0EuQ0000?qyPW_8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11sh33K~#90<(oTm8&w#F-}mfFwuz4?WD>`YF7fIDDLg}<2~COw zW=NBU6hM=P3?V6?NdrybUr_K5_yUoIYZLrKH!Z25|Tz2zPd zkrk^{^`xu_Zl5nsn-m`Gf8wNwpopN6D?S8xD&z$#o>JB65fwoZ!FINE+Y<8!yl^B% zP(-kiFI@FR-8|%gkrF`>K|Nc}lJZTD14lxH0)U_EOAQKM^fFM$LQ~{!Jzu=HnJbmz zX)k^#A^?ERT=|ZIywmSQLRl4IHM_C26j^r(&=OG37C$2S$x$a9HW4iWkLE4~#x(Cm zHSw^BQ0~s}YqJ}qG^3iB!axCEHS)##e-H3EqO}45pph@$hj1>YO0|@*a&Ev@M4N!E zT^htT=820Gs$dKIG;ajAlPLa15)#oVVCKD3 zCiV1ToJD(rtfjkZ6CCWmP5wVEw z0y5d(v6;(Fr1r)%)6`9aDdQQfEHxE11sbFlu^Ql802oDvh*(dH zRQ8MLS-@fWh4ely6egd&P+IxaG)-+Sr|c_HFNN7x!jOukiSD$Ch)qB*)Pi7qe8<-+ zt@NJR)5@bZ7E_AUR$huCp%Ba#Ew!;mzkXa>v6`f2vd8s-><{h;74SGWf95Hk-+)ky zf`(87GLcBP5n{mw&zS0LV`Z(|^PzkC6T5Q>ikCqE0(Ubs5L|#U)oe&`N2mZQ31pzQ z@x$SQhrQ$b2^C<;fJ5}A_Zr;MRlwui{22mM(X9T4q5{COfz5v+uyJRceDg3sz8o#)o0j( zJA456kyLjw#kqbKz_12)_yBMxQ@TJ(x|e|>ST>$l&9D8r5>IQ%-~)hCCXhq^ZRDr~ zclZEcttuR}{6{Ug!v_FT=EC;>Q4Q|!AI+4ek?Q=PK?;^V&#O+4XmE#*lnMabdf=o4 scld^;0O5%X?(hLxUwJ>BwBU~a0PdOErcF6>-~a#s07*qoM6N<$g8wFw7ytkO literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_action_send_now_offline.png b/res/drawable-xhdpi/ic_action_send_now_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..6da9ff7bd40abf3ffa2437cc91fa4ae1724dc695 GIT binary patch literal 968 zcmV;(12_DMP)?qyPW_8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H114T(hK~#90<(s>1)Ib!5zmph3$VCC6NL;m{0E!eq15FwzNRx&X zK$8X}1O+r{pb794JWF^5o*-8zPmu~!%${V|J9g~dnaQmENtU9lJ#+pqGvoDSSAaLb z-z>}aX(0(9z()}|0RFU1gaFTg^`76gN`wH5z^3K3R)~-+%Mg(*V5Z=lMvG7Z8^H28 z=QdJ=3RnTwDqhnl5h~yg@TKOpjS!&%CV-#7)DUePVnpn@EiDX^WtsUw~ zM6ZCCz$*uBj+KaB0ZYIqhi#9Ah+Y8+@C)$}y z3(tL~L?j|F;34onP~RyLh{y}L0{j3b0@jdX7R%j$eV)=M06;{(0=F-qmXr$+VH2^9%~o<0|GqPqA=} zxoh-^s4bu>A~Ffg(l4b**d;GT*y$7DO+X#GkKuVKHd!;c8&$`^cF5;`D;Enuts>I0bCSEHLS-4huV&DR2xmSM=`Aag|V^=XDkOf-8jrMC3ZKN`I(n zpA~vy2Xh-dvb|U~0v-X6y_6J&(%?#&fF-x}1fx=LrAY#61y`&By7PbDMO6V9D!5WK z0`3oAPcU{dtNKvEl_CK#4}T}Ym2nc_G`KP#Kt$$%8!kH;5ih|N+X#r|ufK~~+)|&N z#3&$0a3v-IL4zxO0=m!TH$xV{1qD~~BcMaLZLB@a;+6*L&q`iEh~Xbaa3!RGsDdk} z0=kcEXwpCv@);-+V$0(h%6tQ>;R8_P#J2nrhI9-S6Qk(%p|DrBtdnEO zd#4xwDvhMw=lTD%yEk${I%V(Iv#@ zdhH%jYa&uQE-Qi)k0*wej|UBp91{@~5kzy*Lqbj^KBLb?P(&~}7v2zH>cD6AsfZl` zla~eYwL^{QGZA(RTp;ATmPYo82#N^!h$^};@d$#!Rwoc}T_~m1nbp-a8cZ9C2ml}| zMz<)EZ+D_z6;Tr~`OCy-;_>sNPS|TAY61##g}|VC&(*}eB0||4=l(kPr;t@w6B80B z!R=@^x*rz9(AB)IsjUD2h-Rbvq>QCeNQ4`rWU<>;M4f=J7+zI^D`^(&HW76K3iE|Y zW2!S*6z&!gbpnEg;KV@e|0E*nfH6)H;f67$RK8PQ$*SgF>I48lem4I-XwGNdNT);6@h34$4@a3eD+Js$VoK$2%ggPIPZR(ElXKCJ0y%S}?lOenX0;6wO$FrV@?Qhy zV<+8ZNUI{63W(;SPYLgs12Yg;-}GYS`ge+VoFO* zL^Ku9jFD#}CkOu?)Kt{)aGIb-3{4sh4;nGGAv7uPKtLxc96*DYin6$0M9TsWUGN#b z@qfmLlv0|YCaGa?8i+NxyP^PSLUO4zk<`~d5vd7igol!ib9)g4*XhTAI) z9yE=d0^O`CDDuzC?FOUuuJ!UE%>dY1-B#$=*9!kb#P0AfWmx1 zL(KawiyVctf?FC_fT;v~em2lCsIa0cxzf_zrHwS}Gzf^{b#(t{72J|^26W{8KkML@ zIsw5#a3Uw(xh%iO=~Qq_oq&PLz?i5wllTNym7iN&y4jiFmijHgIQ8Y zZrO7Ns3Tqf_gZj^4`BP}^5>(mb_DclaElKB;rZ|bzznoBlB&!KOE2!dSWBg|jPLNa3lI8xMlkcU_AcT)!%2qEj|Dk;aJlPpgs+5@xv$Ku=3IPpFyfJ6-zI^>CfO6 zUk$1NvDv-nm;|@@h%pY}*af%vgfZ~EC&w+g<$s?D*#5u^1oQv^002ovPDHLkV1j+> BaLE7w literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_action_send_now_away.png b/res/drawable-xxhdpi/ic_action_send_now_away.png new file mode 100644 index 0000000000000000000000000000000000000000..12ec4d33f19d18ef0bde48e635cdc671609bcee5 GIT binary patch literal 1426 zcmV;D1#S9?P)ELnGt z|G(SkR?_Nh##?*={LSY0F$r}BfB`ni%oE^25}}J3Z}ATB`NVxmgd%3V#TsxY=dmP0 z0W%(tAv5=Zm4e?%B0ORR+yt&w{B9EA0W07-aKrIAPZ1FZ9_#82R=^eDcFpG|5e;Ak zECIg(=jPZ(60rax03b8p0&gs^ts(Gd5>byy0UrP#H?YkiNrW?#0Lv5II@*Qp9Ni0Gas-c%_9}dMP4LzzyJfE7b^xNNd__u?98r1Y84d zwo=V$dLbfDzzT4`m1^?ow1`;&0GYW1tf^O1PA5ea3HS_nSG^iHj*ydeCqxtpcnkPS zy_$M-LPU{(7lFI#)y&5c(wZK%UC2D-3joN>FThKx)htGoBFY4O3B0XZO*2F#qD;W_ zg00v%0{&uiyxVpmWt0iH1pKU8jUSGY5fP+_VgUe|xd*JORpXZ+MN|p+8hBH!8XbZX zQ6=C#;8V3~bO}O4m4JB`Y{f>aBB}%|0lxz0mFj7eV`SE}qq);^0no&Pt=Lc%;UeID z;1i8v0^fDq;VR%PvT#>(!B%XHkk(X7gqr|>%zT3^++D6+TED0z z!d-wxWVhfJ)$lEXIrXr zQAWtg`r+iAVF;*$ObA>=trF&>;gpE@1h|qJgS57)_IHtX-t8R$4?;Xbn!+F>z}`&3 ztu6im{*7yvB1iQy`R!)@btk$+Y48?z0h##`SSQTB8WK*yTigU>=6O>1Rn!XJ z;yMC0NZ}W;jhtLh=6SNK0AH6ch?#|gwh; zaHh$fMuwN*EiMB3+J3wSZ%G1XQ3>8sEO8lw-gJI4?i~4D)CQH!CT5kz#83HgcW4)mNEgcx1U{P zR&&&LA!U>ai1h^g2sz?|4&Krw0Z|2S$rq5Bmw^{_OPQM}gSQlofEbScJ>-H-Q3h{` zQ9vhxx5Ol%Q^8wi1!QIwxTIf7A$v%VKWw`YALNaIP>%ji2X6^cKre!~gd|`e>G8b? z-f~)iERwyfTthE|w@i7tW#&XdNl_~j~_O;&CW3ycvI~s1z&?E1*G8TKm;td0P6th@lTs7s!!MvaGCnw z=}N&jfE7@u{iNUg~cNbpZQ*3&y&1f<|SG9WW+$VDxtNx>^HVD{)w!7DN;AO+t7 g17HknrQqA)KP^!_fB_5oO#lD@07*qoM6N<$f`W2mhX4Qo literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_action_send_now_dnd.png b/res/drawable-xxhdpi/ic_action_send_now_dnd.png new file mode 100644 index 0000000000000000000000000000000000000000..7719f81a9a42aeae09dcd7d226ec6c241b6d6162 GIT binary patch literal 1456 zcmV;h1yA~kP)KKRF@^wvqrdaiMsPgLj|_1vF5Q0w{nY z6i@&Kp@11kn1LoKpdegcf@i@z0&Q%^RuaXswuUDV#o6Q0WiMx?J-6NS&8Vy-30Ds zJQhS4pfj0FNTT=wu#xjSL4-!6fZM>0lHUy?G#~}s1a2ul=P5$OKx194K?=AA{8;h1 zK|~Em0c*f-z=b8Y5k#y&XEK=pkVNsC=>7{@VdEjjNp`rG6C-ZADb)3C{Bnd6R^yJE#I&zqD;UV@GEf9R6!OQA!bbn zCU;sW0BTvVMX)>w2Dv>a1Qu``WI~Zh87W} z0sxXI{tkGh&K-M9ts+zfm{_po8>fhq_5LawQ59fv!Ip2VBtliddBnn9lMA+dV~l7` zl|(2B07#Y4-A5oWp^Onk7l`-OE{c!qDCj?X>oe-#q>fz?3VMc^^0#r$&xPxeI zW$o`WcHZqB1A8tWA$8F~i~xD-lr^l-ngt1uJ1M4Nylil3uA&^EkY*hfr5$5{_n`oq%~VOarY1-#64Cz?cI@DgPK zNfdt%Y~yBMbqS^5B}xL4D1M$0ei@a5m#B__9YXkd>?2ODr^`H9Re-L`7x>Id!ApXG z>Kq_i%}T*bN(H3TNgH3>c8ywtm#B<@ZQxv;JM|1L!An#Gw6*hNuhxB zgOZm`6yg8}h*{0Z*z%~5+1WJ`d#1U^acuARnCbu7}!Ar^nG;uki6TwSz1*9K- z?3gP>J5B{JDH;KrG-DB#lfg@h1o+;54iU4O6WfIpQ6#|E6YwL%5$|;Hk|qi8DtJkz zfFz1v0J$)yUxF^IyZ~!}=kSp0000< KMNUMnLSTYAEOQ(H literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_action_send_now_offline.png b/res/drawable-xxhdpi/ic_action_send_now_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..1889581322980550b9d312e62980aed751d33286 GIT binary patch literal 1433 zcmV;K1!nq*P)lIJ-h zau3+3xK9${5G~*~aHHYANrVHmfSbTA!^b>Ei8yjt*I>{Bt^q%^d~6b70WDw+_zk$Q z#5R(M6_7m7)ej7y-Yd zUY@W?hB`+aTHbCiI1>OMB6oo6j`o$2L@Y2b;6317$NS7kBF>l>@G|g~r+sH65eot? zpq>w`d92|H>SR4g5i<)C=~!8B0mAo`7LK9q7+dl;8WmrzvWmVDiL)8<`-#f32HTx$Wt^2 zI)vv7yQpdCr0m94e|YgEtSrE?fS38+i9S&qyvA67hyMblLWM957lZ`3SQGFpqNf}@xkrTuo}F^ zWCUyh=WOmYGMogjF%dA-_Tw~oO%kw(m*6$E0*W_EUi48&0PLY=H77oI+B5>L5$`)t zrtG7Rc(1{0ngsN@{d5|xdyrxn>@#e?2zfznNRPdU*5wJ-=7GVV$yrxb- z?CobCHLE%9x{x~R1jKp*eteU+x)2wXjet;&{$2;K2~ofxg4cv3 z;1Jd02NAqxMnJJh_NwO^1{u6&egtgeZvobzgV)Rp@X>w_Q9VBMu&?0pDIf)3!kK{L z-&na=fR%!;VR{5?(PFu}0Y|7FpIO{y@0bqUR{Kf8x4@==6#Np5VC4l^N2nhE*jiNs zLXUu}wEs+33f=-*K%4fHg11N;0S{5ZKXO>l;4l%8f_KPBL^e@hYB5g=-UA~RkNy}D)@eo+c_?;laAWFa;;6}mk1`!5O0&W4fHJ|ewDdNyzU9CY0xCZ=O z^0`4o1t}?;#=U&CAKvL{t6<>F)82!;NuFmIV6bCW>Ua) z;BJN69uhBR@jTSK{03eFRJz(8_Ik_}aM3#WhfSdNq z(c%bsvTlTkECFu=U)e9G6pav(CE!)yf&Fq8;t1KAp445)BBTlch+=UcxMa7SrSMWj zo`5fbckGr^30{fF6EM4A%QudIzx&&RgSrdJBTv8;;1|2)7~vQ>BAgVFDF7gf#jilm zUO7f_Qbdt}uYtGhm16~`L=*{l5BStxIaYB(M3I0+7Hs)Ots;s9tN_0O=WP{KBge>D z)4t7}<_dsH7Hs*3RS`M@-UmLhQH*1pAX}4B5jp}kfgem3;W$P`=mGxXZ&bNskEv9It^gYgwtV9Rd9vPHW+S=+Y%bXHjip5B3OI{gxNCF4mT!!Z zt*Mj^tEfJ*!lp%`6dFG|0-PVwo zOlTsxB8&>qC3(-ONAZZd0GzF<%w-uNPu7no?{q>y8IlQsj;J1PP8y~}cqc%YC>9-L zYb$Dh7pdpn-Vw0t;t^669png5w@${bF8&4n^J_jMhnf>#(55XIspiUV!K>xDh!G<1~qV5vVmc@dTtU|PV7Tz8^Lat`>IQ51+UN&5XItULik0L3SOZ*0yYWZXR(Joxt=WYWL*KKE??j?O9ih8 z0?MdBclvu8=!6CB84=dbe*6@E&u=k literal 0 HcmV?d00001 diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index b16e41132d323f87c06aa3cce4b5bed9bbd323c9..91921fb56043d29d185e340dcbbf282b4984c101 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -58,7 +58,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="?android:selectableItemBackground" - android:src="@drawable/ic_action_send_now" /> + android:src="@drawable/ic_action_send_now_offline" /> Please be very careful with those Increase font size Use larger font sizes across the entire app + Send button indicates status + Colorize send button to indicate a contacs status \ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index f0d64e39cc373b0dcc08c528ead73115ba071334..47508c9e235cbc226d729dc5f10a757db253587b 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -69,6 +69,11 @@ android:key="use_larger_font" android:title="@string/pref_use_larger_font" android:summary="@string/pref_use_larger_font_summary"/> + listAdapter; - private OnConversationUpdate onConvChanged = new OnConversationUpdate() { - - @Override - public void onConversationUpdate() { - runOnUiThread(new Runnable() { - - @Override - public void run() { - updateConversationList(); - if (paneShouldBeOpen) { - if (conversationList.size() >= 1) { - swapConversationFragment(); - } else { - startActivity(new Intent(getApplicationContext(), - StartConversationActivity.class)); - finish(); - } - } - ConversationFragment selectedFragment = (ConversationFragment) getFragmentManager() - .findFragmentByTag("conversation"); - if (selectedFragment != null) { - selectedFragment.updateMessages(); - } - } - }); - } - }; - protected ConversationActivity activity = this; private Toast prepareImageToast; @@ -602,7 +577,7 @@ public class ConversationActivity extends XmppActivity { this.onBackendConnected(); } if (conversationList.size() >= 1) { - onConvChanged.onConversationUpdate(); + this.onConversationUpdate(); } } @@ -610,6 +585,8 @@ public class ConversationActivity extends XmppActivity { protected void onStop() { if (xmppConnectionServiceBound) { xmppConnectionService.removeOnConversationListChangedListener(); + xmppConnectionService.removeOnAccountListChangedListener(); + xmppConnectionService.removeOnRosterUpdateListener(); } super.onStop(); } @@ -672,8 +649,9 @@ public class ConversationActivity extends XmppActivity { public void registerListener() { if (xmppConnectionServiceBound) { - xmppConnectionService - .setOnConversationListChangedListener(this.onConvChanged); + xmppConnectionService.setOnConversationListChangedListener(this); + xmppConnectionService.setOnAccountListChangedListener(this); + xmppConnectionService.setOnRosterUpdateListener(this); } } @@ -806,7 +784,65 @@ public class ConversationActivity extends XmppActivity { } public boolean forceEncryption() { - return PreferenceManager.getDefaultSharedPreferences( - getApplicationContext()).getBoolean("force_encryption", false); + return getPreferences().getBoolean("force_encryption", false); + } + + public boolean useSendButtonToIndicateStatus() { + return getPreferences().getBoolean("send_button_status", false); + } + + @Override + public void onAccountUpdate() { + final ConversationFragment fragment = (ConversationFragment) getFragmentManager() + .findFragmentByTag("conversation"); + if (fragment != null) { + runOnUiThread(new Runnable() { + + @Override + public void run() { + fragment.updateMessages(); + } + }); + } + } + + @Override + public void onConversationUpdate() { + runOnUiThread(new Runnable() { + + @Override + public void run() { + updateConversationList(); + if (paneShouldBeOpen) { + if (conversationList.size() >= 1) { + swapConversationFragment(); + } else { + startActivity(new Intent(getApplicationContext(), + StartConversationActivity.class)); + finish(); + } + } + ConversationFragment selectedFragment = (ConversationFragment) getFragmentManager() + .findFragmentByTag("conversation"); + if (selectedFragment != null) { + selectedFragment.updateMessages(); + } + } + }); + } + + @Override + public void onRosterUpdate() { + final ConversationFragment fragment = (ConversationFragment) getFragmentManager() + .findFragmentByTag("conversation"); + if (fragment != null) { + runOnUiThread(new Runnable() { + + @Override + public void run() { + fragment.updateMessages(); + } + }); + } } } diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index b73bcadbe317c7aad72d5759fe023029fcf69d32..c6b129ad7787894e1f8fb6b30237bb8ecbcab6eb 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -12,6 +12,7 @@ import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Message; import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.Presences; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.ui.EditMessage.OnEnterPressed; import eu.siacs.conversations.ui.XmppActivity.OnPresenceSelected; @@ -61,6 +62,7 @@ public class ConversationFragment extends Fragment { protected String queuedPqpMessage = null; private EditMessage mEditMessage; + private ImageButton mSendButton; private String pastedText = null; private RelativeLayout snackbar; private TextView snackbarMessage; @@ -255,9 +257,8 @@ public class ConversationFragment extends Fragment { } }); - ImageButton sendButton = (ImageButton) view - .findViewById(R.id.textSendButton); - sendButton.setOnClickListener(this.mSendButtonListener); + mSendButton = (ImageButton) view.findViewById(R.id.textSendButton); + mSendButton.setOnClickListener(this.mSendButtonListener); snackbar = (RelativeLayout) view.findViewById(R.id.snackbar); snackbarMessage = (TextView) view.findViewById(R.id.snackbar_message); @@ -485,6 +486,7 @@ public class ConversationFragment extends Fragment { activity.getConversationList(), null, false); activity.updateConversationList(); } + this.updateSendButton(); } } @@ -497,6 +499,51 @@ public class ConversationFragment extends Fragment { updateChatMsgHint(); } + public void updateSendButton() { + Conversation c = this.conversation; + if (activity.useSendButtonToIndicateStatus() && c != null + && c.getAccount().getStatus() == Account.STATUS_ONLINE) { + if (c.getMode() == Conversation.MODE_SINGLE) { + switch (c.getContact().getMostAvailableStatus()) { + case Presences.ONLINE: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_online); + break; + case Presences.AWAY: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_away); + break; + case Presences.XA: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_away); + break; + case Presences.DND: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_dnd); + break; + default: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_offline); + break; + } + } else if (c.getMode() == Conversation.MODE_MULTI) { + if (c.getMucOptions().online()) { + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_online); + } else { + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_offline); + } + } else { + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_offline); + } + } else { + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_offline); + } + } + protected void updateStatusMessages() { if (conversation.getMode() == Conversation.MODE_SINGLE) { for (int i = this.messageList.size() - 1; i >= 0; --i) { From 7fd4f13ff8ff5822a4d24c79fdff92bd5e8cdb47 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 13:15:15 +0200 Subject: [PATCH 05/13] added something about delivery failed to readme --- README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README.md b/README.md index 53bcecb63533e1515196b6433505e9b0b8eaeaad..f4c0a37a880a57532a30e17dfe702fc0ca48ecc1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,9 @@ Conversations - the very last word in instant messaging ##Features * End-to-end encryption with either OTR or openPGP * Sending and receiving images +* Indication when your contact has read your message * Intuitive UI that follows Android Design guidelines +* Pictures / Avatars for your Contacts * Syncs with desktop client * Conferences (with support for bookmarks) * Address book integration @@ -119,6 +121,29 @@ details within Conversations. This will start an add to address book intent with as payload. This doesn’t require Conversations to have write permissions on your address book but also doesn’t require you to copy past Jabber ID from one app to another. + +####I get 'delivery failed' on my messages +If you get delivery failed on images it’s probably because the recipient lost +network connectivity during recepiton. In that case you can try it again at a +later time. + +For text messages the answer to your question is a little bit more complex. +'delivery failed' on text messages is always something that is being reported by +the server. The most common reason for this is that the recipient failed to +resume a connection. When a client loses connectivity for a short time the client +usually has a five minute window to pick up that connection again. When the +client fails to do so because the network connectivity is out for longer than +that all messages sent to that client will be returned to the sender resulting +in a delivery failed. + +Other less common reasons are that the message you sent didn’t meet some +criterias enforced by the server. (Too large, too many) Another reason could be +that the recipient is offline and the server doesn’t provide offline storage. + +Usually you are able to distinguish between these two groups in the fact that +the first one happens always after some time and the second one happens almost +instantly. + ####Where can I see the status of my contacts? How can I set a status or priority Status are a horrible metric. Setting them manually to a proper value rarely works because users are either lazy or just forget about them. Setting them From fef41ba2a219f15bedc6d1ed45570e2764869684 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 13:18:29 +0200 Subject: [PATCH 06/13] pare body in type=normal messages as well --- .../conversations/parser/MessageParser.java | 16 +++++----------- .../xmpp/stanzas/MessagePacket.java | 5 +---- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java index bd136a3343d4770b8fa8804e4cc8971dfd594e63..534c9deafc1657e5c49ee3d76e52731a47ad223a 100644 --- a/src/eu/siacs/conversations/parser/MessageParser.java +++ b/src/eu/siacs/conversations/parser/MessageParser.java @@ -202,7 +202,7 @@ public class MessageParser extends AbstractParser implements if ((message == null) || (!message.hasChild("body"))) { if (status == Message.STATUS_RECEIVED && message.getAttribute("from") != null) { - parseNormal(message, account); + parseNonMessage(message, account); } return null; } @@ -256,13 +256,12 @@ public class MessageParser extends AbstractParser implements packet.getId(), Message.STATUS_SEND_FAILED); } - private void parseNormal(Element packet, Account account) { + private void parseNonMessage(Element packet, Account account) { if (packet.hasChild("event", "http://jabber.org/protocol/pubsub#event")) { Element event = packet.findChild("event", "http://jabber.org/protocol/pubsub#event"); parseEvent(event, packet.getAttribute("from"), account); - } - if (packet.hasChild("displayed", "urn:xmpp:chat-markers:0")) { + } else if (packet.hasChild("displayed", "urn:xmpp:chat-markers:0")) { String id = packet .findChild("displayed", "urn:xmpp:chat-markers:0") .getAttribute("id"); @@ -294,7 +293,6 @@ public class MessageParser extends AbstractParser implements mXmppConnectionService.updateConversationUi(); } } - } else if (packet.hasChild("x", "jabber:x:conference")) { Element x = packet.findChild("x", "jabber:x:conference"); String jid = x.getAttribute("jid"); @@ -382,7 +380,7 @@ public class MessageParser extends AbstractParser implements this.parseNick(packet, account); - if ((packet.getType() == MessagePacket.TYPE_CHAT)) { + if ((packet.getType() == MessagePacket.TYPE_CHAT || packet.getType() == MessagePacket.TYPE_NORMAL)) { if ((packet.getBody() != null) && (packet.getBody().startsWith("?OTR"))) { message = this.parseOtrChat(packet, account); @@ -407,9 +405,8 @@ public class MessageParser extends AbstractParser implements } } } else { - parseNormal(packet, account); + parseNonMessage(packet, account); } - } else if (packet.getType() == MessagePacket.TYPE_GROUPCHAT) { message = this.parseGroupchat(packet, account); if (message != null) { @@ -424,9 +421,6 @@ public class MessageParser extends AbstractParser implements } else if (packet.getType() == MessagePacket.TYPE_ERROR) { this.parseError(packet, account); return; - } else if (packet.getType() == MessagePacket.TYPE_NORMAL) { - this.parseNormal(packet, account); - return; } else if (packet.getType() == MessagePacket.TYPE_HEADLINE) { this.parseHeadline(packet, account); return; diff --git a/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java index 386d9dc8ba6072b19376a0388d1114251a458789..4e7b532bf147f4fcd60daadbdba97c45f8b1f1a1 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java +++ b/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java @@ -4,7 +4,6 @@ import eu.siacs.conversations.xml.Element; public class MessagePacket extends AbstractStanza { public static final int TYPE_CHAT = 0; - public static final int TYPE_UNKNOWN = 1; public static final int TYPE_NORMAL = 2; public static final int TYPE_GROUPCHAT = 3; public static final int TYPE_ERROR = 4; @@ -38,8 +37,6 @@ public class MessagePacket extends AbstractStanza { case TYPE_GROUPCHAT: this.setAttribute("type", "groupchat"); break; - case TYPE_UNKNOWN: - break; case TYPE_NORMAL: break; default: @@ -63,7 +60,7 @@ public class MessagePacket extends AbstractStanza { } else if (type.equals("headline")) { return TYPE_HEADLINE; } else { - return TYPE_UNKNOWN; + return TYPE_NORMAL; } } } From ff41918cb757fdb68cfff936dca74a4c9d351b05 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 13:19:46 +0200 Subject: [PATCH 07/13] missed show=chat for send button colorization --- src/eu/siacs/conversations/ui/ConversationFragment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index c6b129ad7787894e1f8fb6b30237bb8ecbcab6eb..e09958cb549af51a5a124f74e6e3eb8825c594b3 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -505,6 +505,10 @@ public class ConversationFragment extends Fragment { && c.getAccount().getStatus() == Account.STATUS_ONLINE) { if (c.getMode() == Conversation.MODE_SINGLE) { switch (c.getContact().getMostAvailableStatus()) { + case Presences.CHAT: + this.mSendButton + .setImageResource(R.drawable.ic_action_send_now_online); + break; case Presences.ONLINE: this.mSendButton .setImageResource(R.drawable.ic_action_send_now_online); From dee46f34536577f6b395f7fe62d3503ecf5cf7fc Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 14:24:10 +0200 Subject: [PATCH 08/13] match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources --- res/values/colors.xml | 4 +++- .../conversations/ui/ContactDetailsActivity.java | 14 +++++++------- src/eu/siacs/conversations/ui/XmppActivity.java | 10 +++++++--- .../conversations/ui/adapter/MessageAdapter.java | 6 +++--- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index ed0a0ffbff6bdfb6f7c0f23e80c0fe8d7f54e008..fdaff5da957b4b9c0495b41ac52ce152d5aff3f4 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -9,5 +9,7 @@ #ffeeeeee #ff323232 #1f000000 - #ffe51c23 + #ffe51c23 + #ffff9800 + #ff259b24 \ No newline at end of file diff --git a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java index 8de2ce804dcf8492f70fc4dd63ff81917322f471..9d384c60100c82a05bcbb81e01019498ee32ca9d 100644 --- a/src/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -278,31 +278,31 @@ public class ContactDetailsActivity extends XmppActivity { switch (contact.getMostAvailableStatus()) { case Presences.CHAT: status.setText(R.string.contact_status_free_to_chat); - status.setTextColor(0xFF83b600); + status.setTextColor(mColorGreen); break; case Presences.ONLINE: status.setText(R.string.contact_status_online); - status.setTextColor(0xFF83b600); + status.setTextColor(mColorGreen); break; case Presences.AWAY: status.setText(R.string.contact_status_away); - status.setTextColor(0xFFffa713); + status.setTextColor(mColorOrange); break; case Presences.XA: status.setText(R.string.contact_status_extended_away); - status.setTextColor(0xFFffa713); + status.setTextColor(mColorOrange); break; case Presences.DND: status.setText(R.string.contact_status_do_not_disturb); - status.setTextColor(0xFFe92727); + status.setTextColor(mColorRed); break; case Presences.OFFLINE: status.setText(R.string.contact_status_offline); - status.setTextColor(0xFFe92727); + status.setTextColor(mSecondaryTextColor); break; default: status.setText(R.string.contact_status_offline); - status.setTextColor(0xFFe92727); + status.setTextColor(mSecondaryTextColor); break; } if (contact.getPresences().size() > 1) { diff --git a/src/eu/siacs/conversations/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java index f13c112a9316204eef797ec9fd32e366590c6049..a3503048eb331970888ab96209c106345361ef8a 100644 --- a/src/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/eu/siacs/conversations/ui/XmppActivity.java @@ -55,7 +55,9 @@ public abstract class XmppActivity extends Activity { protected int mPrimaryTextColor; protected int mSecondaryTextColor; - protected int mWarningTextColor; + protected int mColorRed; + protected int mColorOrange; + protected int mColorGreen; protected int mPrimaryColor; private DisplayMetrics metrics; @@ -183,7 +185,9 @@ public abstract class XmppActivity extends Activity { ExceptionHelper.init(getApplicationContext()); mPrimaryTextColor = getResources().getColor(R.color.primarytext); mSecondaryTextColor = getResources().getColor(R.color.secondarytext); - mWarningTextColor = getResources().getColor(R.color.warningtext); + mColorRed = getResources().getColor(R.color.red); + mColorOrange = getResources().getColor(R.color.orange); + mColorGreen = getResources().getColor(R.color.green); mPrimaryColor = getResources().getColor(R.color.primary); if (getPreferences().getBoolean("use_larger_font", false)) { setTheme(R.style.ConversationsTheme_LargerText); @@ -475,7 +479,7 @@ public abstract class XmppActivity extends Activity { } public int getWarningTextColor() { - return this.mWarningTextColor; + return this.mColorRed; } public int getPrimaryColor() { diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 967042d802aaeb50b6cda85dfeed04574673d6ac..db01eabee4d8190978cf7a10ec1ba904471319c5 100644 --- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -145,7 +145,7 @@ public class MessageAdapter extends ArrayAdapter { break; } if (error) { - viewHolder.time.setTextColor(0xFFe92727); + viewHolder.time.setTextColor(activity.getWarningTextColor()); } else { viewHolder.time.setTextColor(activity.getSecondaryTextColor()); } @@ -191,7 +191,7 @@ public class MessageAdapter extends ArrayAdapter { viewHolder.image.setVisibility(View.GONE); viewHolder.messageBody.setVisibility(View.VISIBLE); viewHolder.messageBody.setText(getContext().getString(r)); - viewHolder.messageBody.setTextColor(0xff33B5E5); + viewHolder.messageBody.setTextColor(activity.getSecondaryTextColor()); viewHolder.messageBody.setTypeface(null, Typeface.ITALIC); viewHolder.messageBody.setTextIsSelectable(false); } @@ -204,7 +204,7 @@ public class MessageAdapter extends ArrayAdapter { viewHolder.messageBody.setVisibility(View.VISIBLE); viewHolder.messageBody.setText(getContext().getString( R.string.decryption_failed)); - viewHolder.messageBody.setTextColor(0xFFe92727); + viewHolder.messageBody.setTextColor(activity.getWarningTextColor()); viewHolder.messageBody.setTypeface(null, Typeface.NORMAL); viewHolder.messageBody.setTextIsSelectable(false); } From 12b62adeca59e0f6dc2c04331fd65244dfc809f8 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 16:22:33 +0200 Subject: [PATCH 09/13] added missing strings back. + formating --- res/drawable/actionbar_tab_indicator.xml | 24 +- res/drawable/es_slidingpane_shadow.xml | 13 +- res/drawable/grey.xml | 6 +- res/drawable/greybackground.xml | 10 +- res/drawable/message_border.xml | 17 +- res/drawable/section_header.xml | 1 + res/drawable/snackbar.xml | 16 +- .../fragment_conversations_overview.xml | 52 ++--- .../fragment_conversations_overview.xml | 52 ++--- .../fragment_conversations_overview.xml | 52 ++--- .../fragment_conversations_overview.xml | 52 ++--- res/layout/account_row.xml | 6 +- res/layout/actionview_search.xml | 2 +- res/layout/activity_contact_details.xml | 215 +++++++++--------- res/layout/activity_muc_details.xml | 7 +- .../activity_publish_profile_picture.xml | 16 +- res/layout/activity_start_conversation.xml | 2 +- res/layout/contact.xml | 4 +- res/layout/contact_key.xml | 4 +- res/layout/conversation_list_row.xml | 120 +++++----- res/layout/create_contact_dialog.xml | 27 +-- res/layout/dialog_clear_history.xml | 13 +- res/layout/dialog_verify_otr.xml | 37 +-- .../fragment_conversations_overview.xml | 52 ++--- res/layout/join_conference_dialog.xml | 32 +-- res/layout/manage_accounts.xml | 4 +- res/layout/message_null.xml | 3 +- res/layout/message_status.xml | 8 +- res/layout/quickedit.xml | 9 +- res/menu/attachment_choices.xml | 9 +- res/menu/choose_contact.xml | 1 + res/menu/contact_details.xml | 16 +- res/menu/encryption_choices.xml | 29 ++- res/menu/manageaccounts.xml | 13 +- res/menu/muc_details.xml | 12 +- res/menu/start_conversation.xml | 2 - res/values-ca/arrays.xml | 4 +- res/values-ca/strings.xml | 15 +- res/values-de/arrays.xml | 4 +- res/values-de/strings.xml | 5 +- res/values-es/arrays.xml | 5 +- res/values-es/strings.xml | 3 +- res/values-eu/arrays.xml | 4 +- res/values-eu/strings.xml | 3 +- res/values-fr/arrays.xml | 4 +- res/values-fr/strings.xml | 3 +- res/values-gl/arrays.xml | 4 +- res/values-gl/strings.xml | 8 +- res/values-he/arrays.xml | 4 +- res/values-he/strings.xml | 4 +- res/values-nl/arrays.xml | 4 +- res/values-nl/strings.xml | 7 +- res/values-ru/arrays.xml | 4 +- res/values-ru/strings.xml | 3 +- res/values-sv/arrays.xml | 4 +- res/values-sv/strings.xml | 3 +- res/values/arrays.xml | 5 +- res/values/attrs.xml | 10 +- res/values/themes.xml | 6 +- 59 files changed, 565 insertions(+), 489 deletions(-) diff --git a/res/drawable/actionbar_tab_indicator.xml b/res/drawable/actionbar_tab_indicator.xml index 102b75d8128cd3ad8cac17a57cb8a6b28e5797dd..5598ee424aa739e7cd9be8cd1a5f243bc6167c45 100644 --- a/res/drawable/actionbar_tab_indicator.xml +++ b/res/drawable/actionbar_tab_indicator.xml @@ -1,19 +1,21 @@ + - - + + - - + + - - - + + + + + + + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/drawable/es_slidingpane_shadow.xml b/res/drawable/es_slidingpane_shadow.xml index 5b6037f712969ac0eb4249f0062e97a891f29351..44ffd4ea620f082508504bdf03e15dfe182cd0fe 100644 --- a/res/drawable/es_slidingpane_shadow.xml +++ b/res/drawable/es_slidingpane_shadow.xml @@ -1,7 +1,12 @@ - - + + + + + \ No newline at end of file diff --git a/res/drawable/grey.xml b/res/drawable/grey.xml index bdb9383fc1f1fd3c2f95783c63fd70504c5a5c94..2e90d96d0dd7542e14738d57f6a553abc74c6cb6 100644 --- a/res/drawable/grey.xml +++ b/res/drawable/grey.xml @@ -1,5 +1,7 @@ - + + + \ No newline at end of file diff --git a/res/drawable/greybackground.xml b/res/drawable/greybackground.xml index 529af5e8a2a7e38e0c67f3efe449f2a6b69d04f1..bedc4b17a6f8af3ae5084642c9b02aeecd7e5481 100644 --- a/res/drawable/greybackground.xml +++ b/res/drawable/greybackground.xml @@ -1,6 +1,6 @@ - - - + + + + + \ No newline at end of file diff --git a/res/drawable/message_border.xml b/res/drawable/message_border.xml index 4a581e7df37e786f1425841de401840afdd0e05e..b463d788efe7f259cd9571d66efa02a49e6a76e6 100644 --- a/res/drawable/message_border.xml +++ b/res/drawable/message_border.xml @@ -1,6 +1,15 @@ - - - - + + + + + + + + \ No newline at end of file diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml index e4cb9742708f2a65844bb83bf2a8a4997f3c4bc4..9db04f9063c44c5f4411a273b269410e1ec669e1 100644 --- a/res/drawable/section_header.xml +++ b/res/drawable/section_header.xml @@ -7,4 +7,5 @@ android:width="2000dp" /> + \ No newline at end of file diff --git a/res/drawable/snackbar.xml b/res/drawable/snackbar.xml index 5f5dc430f7b53bbf24ad40b60671c925c76dceb2..951d7aee8d8d99f5f428f337bde8e769f349b9f3 100644 --- a/res/drawable/snackbar.xml +++ b/res/drawable/snackbar.xml @@ -1,6 +1,14 @@ - - - - + + + + + + + + \ No newline at end of file diff --git a/res/layout-sw360dp/fragment_conversations_overview.xml b/res/layout-sw360dp/fragment_conversations_overview.xml index ceb3b5fa85ca4450fcebee8fe8fe0806dbab0e97..ef8a1b6e298a215d6f45768b3eb0fba7a6cc315e 100644 --- a/res/layout-sw360dp/fragment_conversations_overview.xml +++ b/res/layout-sw360dp/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout-sw384dp/fragment_conversations_overview.xml b/res/layout-sw384dp/fragment_conversations_overview.xml index 26d79d233d4ed87ede554f1388b5048ab958b82e..2a42205235290645f93c27c748fc94252683855b 100644 --- a/res/layout-sw384dp/fragment_conversations_overview.xml +++ b/res/layout-sw384dp/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout-sw600dp/fragment_conversations_overview.xml b/res/layout-sw600dp/fragment_conversations_overview.xml index f26c840b4df2fb1d16771c49d3cab6959c147f8e..5dfdceff55d328a957c0770d75d195c29e638e23 100644 --- a/res/layout-sw600dp/fragment_conversations_overview.xml +++ b/res/layout-sw600dp/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout-sw720dp/fragment_conversations_overview.xml b/res/layout-sw720dp/fragment_conversations_overview.xml index b85f111671c3fce7ac8492500f5fb925fba2aba8..bc52ec461376dd59f54f107f1630747614646a7a 100644 --- a/res/layout-sw720dp/fragment_conversations_overview.xml +++ b/res/layout-sw720dp/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml index 230a5a982a1b6f14a8dc774da37774e434746f20..2d1190a3a1e63e9f1e3a83303b422601a5ec3dd3 100644 --- a/res/layout/account_row.xml +++ b/res/layout/account_row.xml @@ -16,8 +16,8 @@ @@ -35,9 +35,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/account_status_unknown" - android:textSize="?attr/TextSizeBody" android:textColor="@color/secondarytext" - android:textStyle="bold"/> + android:textSize="?attr/TextSizeBody" + android:textStyle="bold" /> \ No newline at end of file diff --git a/res/layout/actionview_search.xml b/res/layout/actionview_search.xml index 7030091325060ede1ba700811d2f98eaada380ce..64b75f0ede3c60516469586f56348bad758244cf 100644 --- a/res/layout/actionview_search.xml +++ b/res/layout/actionview_search.xml @@ -14,6 +14,6 @@ android:layout_height="wrap_content" android:focusable="true" android:inputType="textEmailAddress|textNoSuggestions" - android:textColor="@color/ondarktext"/> + android:textColor="@color/ondarktext" /> \ No newline at end of file diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index b3672e599024360ac38bb28c03a78b1735814b87..f4fd9c1e14f01833b871a5ec17d14b7362a576e5 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -2,124 +2,127 @@ + android:background="@color/primarybackground" > - - - - + android:orientation="vertical" > - + - + android:minHeight="88dp" + android:padding="8dp" > - + - - - - - + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/details_contact_badge" + android:orientation="vertical" + android:paddingLeft="8dp" > - - - - + - + + + + + + + + + + + - - - - - - + android:id="@+id/details_send_presence" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/send_presence_updates" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + + + + + + + + + \ No newline at end of file diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index c3eb263dc8f65d9c752b21a68a6ef0a2f2eadb7b..1a676548bb8730213f763f2c7f0903873dfaab60 100644 --- a/res/layout/activity_muc_details.xml +++ b/res/layout/activity_muc_details.xml @@ -24,7 +24,7 @@ android:singleLine="true" android:text="@string/account_settings_example_jabber_id" android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> - + android:padding="8dp" + android:src="@drawable/ic_action_edit_dark" /> - + - - + android:textSize="?attr/TextSizeHeadline" /> + + android:textSize="?attr/TextSizeBody" /> \ No newline at end of file diff --git a/res/layout/activity_start_conversation.xml b/res/layout/activity_start_conversation.xml index 9c757540e41c9fe4c0a5d92a4eb2b1f4b68bc684..f9c98529232d8b36b4130c97c88bf751bf35904d 100644 --- a/res/layout/activity_start_conversation.xml +++ b/res/layout/activity_start_conversation.xml @@ -3,6 +3,6 @@ android:id="@+id/start_conversation_view_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/primarybackground"> + android:background="@color/primarybackground" > \ No newline at end of file diff --git a/res/layout/contact.xml b/res/layout/contact.xml index ff55ccac16ada45c7697cc898653779240176a7f..12ab3da1ba8b62838bf1abc154e42ae0a067285c 100644 --- a/res/layout/contact.xml +++ b/res/layout/contact.xml @@ -27,8 +27,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textSize="?attr/TextSizeHeadline" - android:textColor="@color/primarytext" /> + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" /> + android:visibility="invisible" /> \ No newline at end of file diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml index 8fdd64b7cefaa6295b020f602d5f3a03366a2ecc..21147b4a09e87214417e2002baf22047959b1635 100644 --- a/res/layout/conversation_list_row.xml +++ b/res/layout/conversation_list_row.xml @@ -2,71 +2,67 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="8dp"> - + android:padding="8dp" > - + - + - - - - - - + - - + + + + + + + + + - - - \ No newline at end of file diff --git a/res/layout/create_contact_dialog.xml b/res/layout/create_contact_dialog.xml index a1e6f6ad2079836ce219c033d3285880c31b612f..1ab4b6862ea6def6b7a40ce76dd467c5124b2151 100644 --- a/res/layout/create_contact_dialog.xml +++ b/res/layout/create_contact_dialog.xml @@ -3,36 +3,37 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="8dp"> + android:padding="8dp" > - + android:textSize="?attr/TextSizeBody" /> + - - + android:textSize="?attr/TextSizeBody" /> + - + android:textColorHint="@color/secondarytext" /> + + \ No newline at end of file diff --git a/res/layout/dialog_clear_history.xml b/res/layout/dialog_clear_history.xml index 7edb4b87a284c7de72afe5e1c9233e8eac18792b..252808c847e64311a326620b40929e7021d7f984 100644 --- a/res/layout/dialog_clear_history.xml +++ b/res/layout/dialog_clear_history.xml @@ -3,16 +3,19 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="8dp"> + android:padding="8dp" > + + android:textSize="?attr/TextSizeBody" /> + - + android:text="@string/also_end_conversation" /> + + \ No newline at end of file diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml index 301f465a071d778cb82ee0632095d96e2fc9cd6a..831f06edc42016b2975fed2bb526c916d22a1456 100644 --- a/res/layout/dialog_verify_otr.xml +++ b/res/layout/dialog_verify_otr.xml @@ -3,55 +3,58 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingLeft="8dp" android:paddingBottom="16dp" - android:paddingRight="8dp"> - - + + + android:textSize="?attr/TextSizeHeadline" /> - + + + android:textSize="?attr/TextSizeHeadline" /> - + + + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" /> - + android:typeface="monospace" /> + + \ No newline at end of file diff --git a/res/layout/fragment_conversations_overview.xml b/res/layout/fragment_conversations_overview.xml index b85f111671c3fce7ac8492500f5fb925fba2aba8..bc52ec461376dd59f54f107f1630747614646a7a 100644 --- a/res/layout/fragment_conversations_overview.xml +++ b/res/layout/fragment_conversations_overview.xml @@ -1,30 +1,30 @@ - + + - - - - - - - + android:orientation="vertical" > + + + + + + + \ No newline at end of file diff --git a/res/layout/join_conference_dialog.xml b/res/layout/join_conference_dialog.xml index a36a5ef7851b2fed1915aa3035e695d936a8af87..95c9d24cb6d4112fbeecb95400859ca2077bd683 100644 --- a/res/layout/join_conference_dialog.xml +++ b/res/layout/join_conference_dialog.xml @@ -3,45 +3,45 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="8dp"> + android:padding="8dp" > - + android:textSize="?attr/TextSizeBody" /> + - - + android:textSize="?attr/TextSizeBody" /> + + android:textColorHint="@color/secondarytext" /> + android:layout_marginTop="8dp" + android:checked="true" + android:text="@string/save_as_bookmark" /> - + \ No newline at end of file diff --git a/res/layout/manage_accounts.xml b/res/layout/manage_accounts.xml index 71eb75728a1d93bcdd675ad2784465c5ae282a76..11ce35b2fb56ff223499c879708c00373c894ca1 100644 --- a/res/layout/manage_accounts.xml +++ b/res/layout/manage_accounts.xml @@ -3,14 +3,14 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/primarybackground"> + android:background="@color/primarybackground" > + android:dividerHeight="1dp" > \ No newline at end of file diff --git a/res/layout/message_null.xml b/res/layout/message_null.xml index 4c7dd9389139e7a220e97bad7d0da34dfadecd9a..1e1485857b1a92e0d2e7880b746ce7da1e73a057 100644 --- a/res/layout/message_null.xml +++ b/res/layout/message_null.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" > + \ No newline at end of file diff --git a/res/layout/message_status.xml b/res/layout/message_status.xml index 33487984b08e1d0ecca434dac6086311a031d29d..d5f8bb33f2b8186c43bcb7444cbb8487da68aee7 100644 --- a/res/layout/message_status.xml +++ b/res/layout/message_status.xml @@ -3,11 +3,11 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingTop="6dp" android:paddingBottom="6dp" + android:paddingLeft="8dp" android:paddingRight="6dp" - android:paddingLeft="8dp"> - + android:paddingTop="6dp" > + + android:src="@drawable/ic_profile" /> \ No newline at end of file diff --git a/res/layout/quickedit.xml b/res/layout/quickedit.xml index 07a7ac3b35d607c6b0378b2cf8ef5065379e4bba..20a2868acbb89b1dec9f355ca37849a0cdc503ea 100644 --- a/res/layout/quickedit.xml +++ b/res/layout/quickedit.xml @@ -3,16 +3,17 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp"> + android:padding="16dp" > + + android:textColor="@color/primarytext" > - - + + \ No newline at end of file diff --git a/res/menu/attachment_choices.xml b/res/menu/attachment_choices.xml index 6a4f295a22d35f261b23dac42a61163427f60b97..20932489da0d1f864ee5551c3d6a6ccd35e28ca9 100644 --- a/res/menu/attachment_choices.xml +++ b/res/menu/attachment_choices.xml @@ -7,8 +7,9 @@ - + + \ No newline at end of file diff --git a/res/menu/choose_contact.xml b/res/menu/choose_contact.xml index 3f402664aad18fd407d0c172116db5d459c23c73..e39091b3841b4a0e9601d20a767adecba6f643e3 100644 --- a/res/menu/choose_contact.xml +++ b/res/menu/choose_contact.xml @@ -7,4 +7,5 @@ android:icon="@drawable/ic_action_search" android:showAsAction="collapseActionView|always" android:title="@string/search"/> + \ No newline at end of file diff --git a/res/menu/contact_details.xml b/res/menu/contact_details.xml index 43e8ea6a2f87a09e7307e3a6bd14ec5ebb612f9e..02f2e8131235d31a622f4f2d64170dafc1eb670f 100644 --- a/res/menu/contact_details.xml +++ b/res/menu/contact_details.xml @@ -1,27 +1,27 @@ + + android:title="@string/action_edit_contact"/> + android:title="@string/action_delete_contact"/> - + android:title="@string/action_accounts"/> - + + \ No newline at end of file diff --git a/res/menu/encryption_choices.xml b/res/menu/encryption_choices.xml index 0596bfbc1300b33d8353ba4d677c0f6497431be3..adf0ad8dc1ccb83cd267dd886988bae3edd000f1 100644 --- a/res/menu/encryption_choices.xml +++ b/res/menu/encryption_choices.xml @@ -1,17 +1,16 @@ - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/res/menu/manageaccounts.xml b/res/menu/manageaccounts.xml index 1d81ba3c6f00bc597b30effa40a787146c8f376c..b5cd9b50b90380b5050bf089926fa50e2117e970 100644 --- a/res/menu/manageaccounts.xml +++ b/res/menu/manageaccounts.xml @@ -1,12 +1,15 @@ - - + - + + \ No newline at end of file diff --git a/res/menu/muc_details.xml b/res/menu/muc_details.xml index 685109cd100cd5321f7ceaf6dfc0a4c6ec669a4d..97369098447a8ec1214de9ca0bc37da4dd313f13 100644 --- a/res/menu/muc_details.xml +++ b/res/menu/muc_details.xml @@ -1,21 +1,21 @@ + + android:title="@string/action_edit_subject"/> - + android:title="@string/action_accounts"/> - + + \ No newline at end of file diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml index 271bac187e06f58021a0c22beba637c53137595e..f72301693bf576189d5ae0c873e672c5118b6d51 100644 --- a/res/menu/start_conversation.xml +++ b/res/menu/start_conversation.xml @@ -7,7 +7,6 @@ android:icon="@drawable/ic_action_search" android:showAsAction="collapseActionView|always" android:title="@string/search"/> - - + Mòbil Telèfon @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index b9b2c5328c8cf33054eead50bb6f9a56a8013752..cfbe428bf1e7e8b1d56f8ae7bf8d9656b4dc8e91 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -60,11 +60,11 @@ Missatge xifrat rebut. Prem per desxifrar i veure-ho. Imatge xifrada rebuda. Prem per desxifrar i veure-la. Imatge rebuda. Prem per veure - Recursos XMPP + Recursos XMPP El nom que identifica aquest client amb - Acceptar fitxers - Accepta fitxers automàticament amb una mida menor a… - Ajustos de notificacions + Acceptar fitxers + Accepta fitxers automàticament amb una mida menor a… + Ajustos de notificacions Notificacions Notifica quan arriba un nou missatge Vibra @@ -77,6 +77,7 @@ Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon Opcions avançades Mai enviïs informes d\'errors - Enviant traces d\'execució ajudes al futur desenvolupament del Conversations. - - + Enviant traces d\'execució ajudes al futur desenvolupament del Conversations. + Opcions de UI + + \ No newline at end of file diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml index e095ed1439b26a78498cb4b3213f98d7acd74501..e468f478b0ba2d073c7d57bf390820ca394220e4 100644 --- a/res/values-de/arrays.xml +++ b/res/values-de/arrays.xml @@ -1,5 +1,6 @@ + Mobile Phone @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 4267f483756f2c3385ecb8379e2d024bfb6aa324..e653147d53e977f51bbb48b3afa9ed5abfa1241b 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1,5 +1,6 @@ + Conversations Einstellungen Neue Unterhaltung @@ -230,4 +231,6 @@ Aktuelle Sitzung wiederhergestellt Zusätzliche Informationen Überspringen - + Benutzeroberfläche + + \ No newline at end of file diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml index 48996a69d250628579aaec6ef2cf8c2c72ca056d..15231955947877277e7f930198ff56ada74f40ef 100644 --- a/res/values-es/arrays.xml +++ b/res/values-es/arrays.xml @@ -1,5 +1,6 @@ + Móvil Teléfono @@ -26,6 +27,7 @@ 8 horas Hasta nuevo aviso + 1800 3600 @@ -33,4 +35,5 @@ 28800 -1 - + + \ No newline at end of file diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 53e45ed1115a75786cabe769dd049374aea4f10b..d6fbc7cb7e8939b801a86a043985345d297bc0f8 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -254,4 +254,5 @@ Por favor, cuidado con estas opciones Incrementar tamaño de fuente Usar fuentes grandes en toda la aplicación - + + \ No newline at end of file diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml index 21b20afbe10124aaa54791e35e33b8957ba3da2f..eed87d35b8e7078bfeb2a45701ad6adde62e5dd5 100644 --- a/res/values-eu/arrays.xml +++ b/res/values-eu/arrays.xml @@ -1,5 +1,6 @@ + Mugikorra Telefonoa @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 8b5d92544d4fb221f679a4bc622129c7753d4786..2ca26c3d73fcc6b424183c135f9c5cf43159fc13 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -230,5 +230,6 @@ Uneko saioa ezarri da Informazio gehiago Orain ez + Erabiltzaile-interfazearen aukerak - + \ No newline at end of file diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml index 978429068995308383865613a1773e944777a45d..ae140796a10c016b88f4f8805d9cfff8b6f622b5 100644 --- a/res/values-fr/arrays.xml +++ b/res/values-fr/arrays.xml @@ -1,5 +1,6 @@ + Mobile Téléphone @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index df9ab3f5bf16d75e6ebe72273ace7c387059a28d..e15ef416fac7894f75a85382a9961e83b6503b34 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -207,5 +207,6 @@ Votre correspondant vous a ajouté dans sa liste de contacts Ajouter également %s a lu les messages précédents. + Options d\'affichage - + \ No newline at end of file diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml index 95c990773d049874fce52f19a1fb7bfccb9c8bac..19424a783e0d36c8345444feda19fefe87bf706d 100644 --- a/res/values-gl/arrays.xml +++ b/res/values-gl/arrays.xml @@ -1,5 +1,6 @@ + Móvil Teléfono @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index ae488614b3b1e45c1bca4fae0eff90e321e7369c..581164630a1e37a4db570459a471cc38219e41c8 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -66,9 +66,9 @@ Imaxe recibida. Pulsa para ver Recurso O nome que identifica o cliente que estás a empregar - Aceptar arquivos + Aceptar arquivos De forma automática aceptar arquivos menores de… - Axustes de notificación + Axustes de notificación Notificacións Notifica cuando chega unha nova mensaxe Tremer @@ -125,4 +125,6 @@ Gardar As contrasinais non coinciden O identificador non é un identificador de Jabber válido - + Opcións de interfaz + + \ No newline at end of file diff --git a/res/values-he/arrays.xml b/res/values-he/arrays.xml index 1895dee53a8292e3b6d81a9dfdc1054b5300dd7b..28768d6c4556cc0c11052819ec6ffabce464b6a9 100644 --- a/res/values-he/arrays.xml +++ b/res/values-he/arrays.xml @@ -1,5 +1,6 @@ + נייד טלפון @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index 65684cd75dc44c8ee052884eaa3beda9e2cbe91e..fd8eaa0ba3a60f8868f7a248734654371463f9c5 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -219,4 +219,6 @@ בפרטי בפרטי אל %s שלח הודעה פרטית אל %s - + אפשרויות ממשק משתמש + + \ No newline at end of file diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml index 1a464a5a1fdd07126292bb9bc3503c7421c6188f..9ced79f49c25e24c9238bb510573606dd7dd9563 100644 --- a/res/values-nl/arrays.xml +++ b/res/values-nl/arrays.xml @@ -1,5 +1,6 @@ + Mobiel Telefoon @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 97b67224e270bdbc42e251824be816990b8f0fc0..7b3faca9908a815718ac13c790d8905463684053 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -153,7 +153,7 @@ Bevestig wachtwoord Wachtwoorden komen niet overeen Dit is geen geldig Jabber ID - Geen geheugen beschikbaar. Afbeelding is te groot + Geen geheugen beschikbaar. Afbeelding is te groot Wilt U %s toevoegen aan de contactenlijst op uw telefoon? online beschikbaar @@ -178,7 +178,6 @@ Onbekende OTR vingerafdruk OpenPGP encrypted messages found Ontvangen mislukt - Aan groepsconversatie deelnemen Contact uitnodigen Uw vingerafdruk @@ -229,4 +228,6 @@ Huidige sessie opgezet (Of houdt lang ingedrukt om de oorspronkelijke terug te zetten) beschikbaar - + UI Opties + + \ No newline at end of file diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml index d73bdef5ae05f1d094b9795258c1e9fe36a20afd..d01d4eb9bc01875fa108a8f12172e6380b39d589 100644 --- a/res/values-ru/arrays.xml +++ b/res/values-ru/arrays.xml @@ -1,5 +1,6 @@ + Мобильный Телефон @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 5009097aa08e5e3a4490d40e124e248109d3722d..9f3992f28641b1e89a11e939e723f6ffd49196cd 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -229,5 +229,6 @@ Сохранить закладку Удалить закладку Такая закладка уже существует + Параметры интерфейса - + \ No newline at end of file diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml index c7cc9f2dd0c9ce9f7cea4063804f850aaf799152..890e2915f857885457bed1268c4a8612e6d1c326 100644 --- a/res/values-sv/arrays.xml +++ b/res/values-sv/arrays.xml @@ -1,5 +1,6 @@ + Mobile Phone @@ -19,4 +20,5 @@ 524288 1048576 - + + \ No newline at end of file diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index abd99dbcf0ab2bb08557baf6845c771adb263952..16ab59ee40af6f949bd255404509a40205a1c885 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -231,5 +231,6 @@ Generellt Publicera privat meddelande + UI inställningar - + \ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 1d2a5ac9b34f56d8c264a44206b91f49fb7d87ac..1a4fd25d1763cf0e8f88854ade338e4d5e0fed2b 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,5 +1,6 @@ + Mobile Phone @@ -26,6 +27,7 @@ 8 hours until further notice + 1800 3600 @@ -33,4 +35,5 @@ 28800 -1 - + + \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 793b5604bd0a209477b4f817ec44bf317d05191b..2354a5e8c9cc455e9167a0e30a64d470684ab5de 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -1,6 +1,8 @@ - - - - + + + + + + \ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index e2d4dcbe4efad4bd66349602bcad1c65bb9c8385..fa7973d207129ee08b13228194dbb162c029ad1f 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -9,7 +9,7 @@ 14sp 20sp - + - + \ No newline at end of file From c9a342fc6e9d42fbe7b07a9fd16297ff7b5e1613 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 11 Sep 2014 16:32:49 +0200 Subject: [PATCH 10/13] more formating --- res/layout/fragment_conversation.xml | 93 ++++++++++++++-------------- res/values/colors.xml | 2 + res/values/strings.xml | 13 ++-- res/xml/preferences.xml | 19 +++--- 4 files changed, 64 insertions(+), 63 deletions(-) diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index 91921fb56043d29d185e340dcbbf282b4984c101..0f5f692e4d82d6bdba0892f98a65dc528cd6e366 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -5,8 +5,6 @@ android:layout_height="match_parent" android:background="@color/secondarybackground" > - - - + + android:textColor="@color/primarytext" > + @@ -61,43 +60,43 @@ android:src="@drawable/ic_action_send_now_offline" /> - + - + - - + + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index fdaff5da957b4b9c0495b41ac52ce152d5aff3f4..908b8b89a3ee03d30887608b9f68d53cb5696918 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,5 +1,6 @@ + #ff259b24 #ff0a7e07 #de000000 @@ -12,4 +13,5 @@ #ffe51c23 #ffff9800 #ff259b24 + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 0ede20395b4becb9b0d5890f9752fd5b7e73121b..75eb3b4d53c6eb434621f21da385151406e6dbfe 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -250,10 +250,11 @@ Always send messages encrypted (execpt for conferences) Don’t save encrypted messages Warning: This could lead to message loss - Expert options - Please be very careful with those - Increase font size - Use larger font sizes across the entire app - Send button indicates status - Colorize send button to indicate a contacs status + Expert options + Please be very careful with those + Increase font size + Use larger font sizes across the entire app + Send button indicates status + Colorize send button to indicate a contacs status + \ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 47508c9e235cbc226d729dc5f10a757db253587b..7d0886bcfd17274fb1508f1783fac68c09e08269 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -62,18 +62,17 @@ android:summary="@string/pref_notification_grace_period_summary" android:title="@string/pref_notification_grace_period" /> - - + - + android:summary="@string/pref_use_larger_font_summary" + android:title="@string/pref_use_larger_font" /> + Date: Thu, 11 Sep 2014 18:02:09 +0200 Subject: [PATCH 11/13] check if market is available before starting to install openkey chain --- .../siacs/conversations/ui/XmppActivity.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/eu/siacs/conversations/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java index a3503048eb331970888ab96209c106345361ef8a..4ee51580499592acf4b65620a3700c50e271f66c 100644 --- a/src/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/eu/siacs/conversations/ui/XmppActivity.java @@ -2,6 +2,7 @@ package eu.siacs.conversations.ui; import java.io.FileNotFoundException; import java.lang.ref.WeakReference; +import java.util.List; import java.util.concurrent.RejectedExecutionException; import eu.siacs.conversations.Config; @@ -24,6 +25,8 @@ import android.content.DialogInterface; import android.content.SharedPreferences; import android.content.DialogInterface.OnClickListener; import android.content.IntentSender.SendIntentException; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.content.Intent; import android.content.ServiceConnection; @@ -153,8 +156,20 @@ public abstract class XmppActivity extends Activity { public void onClick(DialogInterface dialog, int which) { Uri uri = Uri .parse("market://details?id=org.sufficientlysecure.keychain"); - Intent intent = new Intent(Intent.ACTION_VIEW, uri); - startActivity(intent); + Intent marketIntent = new Intent(Intent.ACTION_VIEW, + uri); + PackageManager manager = getApplicationContext() + .getPackageManager(); + List infos = manager + .queryIntentActivities(marketIntent, 0); + if (infos.size() > 0) { + startActivity(marketIntent); + } else { + uri = Uri.parse("http://www.openkeychain.org/"); + Intent browserIntent = new Intent( + Intent.ACTION_VIEW, uri); + startActivity(browserIntent); + } finish(); } }); From ca560ae4decff80454d7b9f394dbcd132da05724 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 12 Sep 2014 14:28:34 +0200 Subject: [PATCH 12/13] updated swedish translations. thank you Anders Sandblad --- res/values-sv/strings.xml | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 16ab59ee40af6f949bd255404509a40205a1c885..a3ed9112e6007852a401a05fc2fa1892664b8074 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -17,7 +17,6 @@ Inställningar Konferensdetaljer Kontaktdetaljer - Konversationer Dela med konversation Starta konversation Välj kontakt @@ -65,7 +64,6 @@ Vill du ta bort alla meddelanden i denna konversation?\n\nVarning: Detta kommer inte påverka meddelanden lagrade på andra enheter eller servrar. Ta bort meddelanden Avsluta denna konversation efter - Välj närvaro till kontakt Skicka meddelande i klartext Skicka OTR-krypterat meddelande Skicka OpenPGP-krypterat meddelande @@ -101,7 +99,6 @@ Konferensnotifieringar Notifiera alltid när nytt konferensmeddelande tagits emot istället för endast vid highlight Notifieringsfrist - Deaktivera notifieringar en kort stund efter att en carbon copy tagits emot Avancerade inställningar Skicka aldrig krasch-rapporter Genom att skicka in stack traces hjälper du utvecklarna av Conversations @@ -128,7 +125,6 @@ Generellt I/O-fel. Du kanske fick slut på plats? Applikationen du använde för att välja bilden gav inte tillräckliga rättigheter för att läsa filen.\n\nAnvänd en annan filhanterare för att välja bild Okänd - Tillfälligt deaktiverad Online Ansluter\u2026 Offline @@ -144,7 +140,6 @@ OpenPGP Ändra konto Ta bort - Deaktivera tillfälligt Aktivera Är du säker? Om du tar bort kontot kommer all konversationshistorik att försvinna @@ -208,7 +203,6 @@ Addera tillbaks %s har läst fram hit Nästa - Notera: Alla som kan se dina närvarouppdateringar kommer se denna bild. otillgänglig Publisera OpenPGP publik nyckel Ytterligare information @@ -232,5 +226,35 @@ Publicera privat meddelande UI inställningar + Aktivera + Varning: Skicka detta utan gemensamma tillgänglighetsuppdateringar kan ge oväntade problem.\n\nGå till kontaktdetaljer för att verifiera dina tillgänglighetsuppdateringar. + Inaktivera notifieringar + Begär tillgänglighetsuppdateringar från din kontakt först.\n\nDetta används för att se vilken klient/klienter din kontakt använder. + Konferensen kräver lösenord + Spara in krypterade meddelanden + Krypteringsinställningar + Färglägg skickaknappen för att indikera kontaktens status + Saknar tillgänglighetsuppdateringar från kontakt + Expertinställningar + Sänd alltid krypterade meddelanden (utom för konferenser) + Var försiktig med dem + Inaktivera notifieringar för denna konversation + Skickaknappen indikerar status + Fyll i lösenord + Notifieringar är inaktiverade + Tvinga kryptering + Är du säker på att du vill ta bort detta fingeravtryck? + Ignorera + Använd större teckenstorlek för hela applikationen + Öka teckenstorlek + Varning: Detta kan leda till att meddelanden förloras + Ta bort fingeravtryck + Begär nu + Conversations + Notera: Alla som kan se dina tillgänglighetsuppdateringar kommer se denna bild. + Välj tillgänglighet till kontakt + Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot + Tillfälligt inaktiverad + Inaktivera tillfälligt \ No newline at end of file From 73cba91c9b08ff512104897b32837f9824f1cd3e Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 12 Sep 2014 17:52:46 +0200 Subject: [PATCH 13/13] version bump to 0.7.1 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d9a5f44da876e1986bdb16b8db662b6da2ff6cff..7cec02641ed54b207ee00faef0bd146c6132aa7e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="0.7.1" >