From caf8563cc06ab68f1c251d173654deb6b4b1a77c Mon Sep 17 00:00:00 2001 From: Derek DeMoro Date: Tue, 19 Sep 2006 20:12:53 +0000 Subject: [PATCH] 1) Updated Asterisks. 2) Update contact list to fix presence issue. git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@5432 b35dd754-fafc-0310-a699-88a17e54d16e --- .../{merge => dist}/asterisk-im-client.jar | Bin 26938 -> 26933 bytes build/lib/{merge => dist}/systeminfo.jar | Bin build/projects/Spark.iml | 36 +-- build/projects/Spark.iws | 236 ++++++++++-------- .../jivesoftware/AccountCreationWizard.java | 4 + .../jivesoftware/spark/ui/ContactList.java | 9 +- .../sparkimpl/plugin/phone/PhonePlugin.java | 2 +- .../preference/sounds/SoundPlugin.java | 13 +- 8 files changed, 172 insertions(+), 128 deletions(-) rename build/lib/{merge => dist}/asterisk-im-client.jar (73%) rename build/lib/{merge => dist}/systeminfo.jar (100%) diff --git a/build/lib/merge/asterisk-im-client.jar b/build/lib/dist/asterisk-im-client.jar similarity index 73% rename from build/lib/merge/asterisk-im-client.jar rename to build/lib/dist/asterisk-im-client.jar index f678fa1bc4ab827913010b197d41b763895e504a..387ba7ac9ae3d9a0be5c346345c18639462c6c1c 100644 GIT binary patch delta 3730 zcmZ8kc|25oADtOw$vUflnN_yhX4qGm8pmZYfv#Be3puRV4Xv(;()|LsN@0t za~d&Ybf=L9=1dx~W(CuTE&CHXs`&`i7Q%i|u2x`2mxDbRN(#8m_9R^zt=-e*`pL92YIGW6veDqZAUO6Z9wYkKaM51{=pLzS?~ejk>W^XVUgr z+@7n|E#MfXjAZ|0;bbs6R$D>mm6%TDm@ium`pxNJi~9;5b*Cd0z9Lx1m+M5Z$uk68 zy?7)n>g!X@=4j#8AWJ6fxUWhxS1X#Wb}1t)!Sz?M++50MYqr|1?*!pXbp~~>mP znnB6$hGHB9*HgbZ2=3@pl9B@TPBY%@SgGId7RCa1(;4%q+HK&!O%zZF)U&3%E{&#^%9xuvEHOcd8zm7xn9NP zu_O3%1992)e(y@prPx@Eqv7a_h}SDMMCdhOtyo&K>qzpH|0?u30*JTI*GnhI2%TR2(m+9W#QuMg%O#y6)d66}XuYtz;-9`IiF zp))11eOVG-ELG;VK6yE$8AFy!Rqaa~t2gMMC<#<8?XaA|RbOcsvs)5%<54wDjycnbLb!3Q1r5Pbw3yj=vJL_Lo zM3_z^Kat@Bt%>NmrhSPsGu<=K#pby$QREW4Ze_PD%%J05TFfsw|Ii@WqSFn?;+Wat zLPcDJu;t(+-~si&=?qS66S}6lumP~p9do+V&RcxXFuZm5nRw%9tvAU2IML0sf3K@% zq2#unvV`>~!oWpobr+>dco|99vC6(Dd?;90?nEGbV8A^1?3?KglsQ8B>J265?dRvP zKyP6IRHbQqQ~ZLJ)ZQ_hgbvoS*T!r*%49^YlTD)GO>G!YYeW&;`^>z-Fk6;DEl@}p z4Je;b9U6M#)4DfiLsyP4CF15Ol;7w37sO5@yC&7{M+$T<2j`mp;CUA$$dj}jFk=SYnQ~Zhw~UZoeqD&P~3-fN?J4)Mq$fU zB-`yK;c?SNX=#cj8{4<6+eBG+xdvdjbbpk!F0-f~JcpzES?= zT}osr+gUJ!Izx5GwL~}d>i`&Y8X~~W~S{y-| z#f@vX=ZY_yWJns`XwSHEV#|LDgM8r`xLfv(t$_D?NN;pL@k&^;MO~k8CtA75U8W3H zWWiyzzhMH&_jc7=zfE>ET6GGS6dE@nWu6H18O!)G@H@lL&~E+e)Aw)t)$n7hdR0FQ zCkEpmlM2nVh$7!&Z3-uNirwb;TzA*R17){!ePz$(`XN_TbF9%ZLcY*hmpUM{3BVLU zM58ue<}94|xZ0cH>sHAu*&)k?OrGvz^{O>G0!x}#48?$5i|ltlppCUTuz*4_1N|<+O5AIDfkeD zA%&1P`wTt39%PR>>Tfm=zi`@1455q(%O=aR$YmK;e`@;4{Bl=J~{JZ-=-0hlE3M-2~UIHx^Ph@;`k{^tC za9L}45mgD5lSiMOSat7Yg&sxdI)3x}rL7V4LxJT;RN+mz4oM5e;#?uwSiUx8*x;la@pHsc>z_Z&M!rsBkm0~<<8IZ8_#_$A+AOeUf) z{APM_DRoP{uCY|q)=pIKrS#MFm|5!^jNLnm&qRsm?A{i}cZDFt5;jX$91tXa-e8O_ zGb3IJk2mFGtR0(;)90zlkI&NQ-TFY`>N(K_SJEso(c4jqNE*lg=(RVId96-JJ;a0ZWljFNbnj- zPLe~rwYfXy=_q1wCISK`3Teu58h9RYsvB#TKp1`??Oa&ZG-cub1j?^L(j zQHl@~ZG0Xb+F!;MQs6MSo2Z;<+q`kf)ZiBGu6c?i+_ zwZ^EmzQKZlH{^50xo|(a)Fw_DZ&&X{->i;TKbn2dZ0s}EqL%0IZ`S-i5*U0NQyd)) z_bcEcQ%f_|Z$4-S`Dt0yhdIuipC)itXT?tS8T$Bd!PL`-L#F%T)$QuFR$pG0@qcHY zz3?j{%5U&q^l6RNw)`<$i5q_99Ba3Uo{Wzi6|h7uI2tF#AN304Q=Eb zQb?o|GX5Ge={uPo*p+eY8EFc4Bjr4NduAh>aZ6b=6->G=-ce7FCO|7BM}5SJxH$ug zwbBN|7D$akO1~JxaogwEs@A^n>T$00Ece}qEqh4e+hL?v=O?fds|wtymzS2F-hDUD z^!L}uMYixwIF5J}mZqn!BRXJNG|@Xi>Y?z~m#Y@x`8%3xjQoHSt9u2t0{cOG(7z6US``>=XyxOmicr6wQ>ruhP9%Bgn?K=239t zSHF4pCvdeITK1ho z)X|fd>&h!%Qt3dTR7Ma;|6mAlV9-sn zih$0g`S>qF7^y!jgz13LtN89J17Ga+s3R@eBmRy2fV6`qRm3|eP%+&BNyRY-Ju1Q+ zFHq6V(VU76j%HM3#p0bXzvUuVq{I$yyPM+0nRie+eNbxj$8Ez6{xx4SkN_&K(8hRq1qP8b z`kx~%0O|&%_DU?c5I%U&>k9)2r2R*)PsV@}S`kn~aRM4wSgGbecIgi@C;Gr_DEog; zSgqKA#Fu>p1bWK>0-^pWU;xD2X&VsY4uh~@4$4mhgYJT~61ly2`%^}$n3>a-ft_Mk^bRP!=}c)#iXT9-iUFF?<3J7< z3oaupT+rfFKTdh>)6L@7X4;`lr8o1Rcq$E!@o2l>^~8^*DWx@Dj{;|JnBdQ3&8@%i za@Xa0e&rej1gpO*oTn!ZGEj;=dM@ftp0Kc#C=r^Mr@<8-^$)x*OTTVLYzO>%8&D74 z%=X_<{Wom1CHUunUGTrhohruyv+v%6RWsnAuWOD#Cw+X6+66NCB*vM3c=_w$<8hy- z>_QJQ%^ERhwRh9l86R^K&Ia1YjwZZxTV7dNTA5I*eBPKil{9Mf^$6Q!+-E(Zc(R(% z@Xa#4$M_xe`5j=rJ{ z?!>zH75|bX$EAR69heGcLiG%` zAtfkRRLAPnmik5BYPcm2^xS;6d;XacIb>_)GVI0q)qqD8ghcLaZqMMj`T)CWka>jK z^!=O!zbQHRnMA3S)q0Gw{E%qKu0V$-VW?NnW8%TEKqkqgv4qQ`zg*w9Y?YLSwzLgt z<%gUeZ1$8$|EAzQVr}@a5QJkHg|zHO5xe-)jy;;kb2G*QL_wG-#bTRYfPKHt4(@rVXvCC0qBZjc7D&D#L#z5c|IxVK;Qn2 zH8WUuP zgnz=se$@xC3*dr%ea7=-7e-vy<5R^1(75@;=evQ*N8)bO~H9>o1Eg9HTe?uE2gJ8Opq$h{NnQMK*m_x&Wzo#0Lt= z#;C+0J_|wcU>w}moUHxCMbh=!MTl3hnFG=_RzF(?_GGBpXq*YAFztKM6O~olhz>(XUbyy|`R|kTw`5G+fSMn-VOb|x4aVho67k`7v;W`!z;jyY{%?~y; z%x;>bdui?8eAoFFM`EVUuDd0zCiQ%s4SL90VVkS@F|6CYHyj$QlZmrT^)K9&3l=uT zll6>{zol4qF6}@^jW0k}DSdM}CUs|PmZhhI1gT}C(SjD+Uq z|7uB!;(t7B{WKyZ)?DvynT|2GYUT@ZtImD#!S6Q}ZI<#k*sRYRjo_2t@N9F2IeYGi zPhJ@=y4j>&I~%*tGkobjwmhJ~EoaW4Rdjf5l8BuhD%BNMA^@u+Cutme|XF}%Y~o+(w_b)DzW@! zbVFz@Zcc{PNzHQMIvsu5V8o*i`IhEert>}RlACwJ<3b85yZL@~-V^B^mxcT5pm5U8K3K6>4h-)$YKRCT#0?KO>$z6_GIoF0Ak~TVB!>OzBQr z8;}v4x_58 zGm#5PO^*vAG2rDAT)gt{oZJaa{jG7C82^lUTf5Kz_I|GHY!S1juoJ|rb$$fl&%Zd) z#L&`C2E=o1!K9P2CnXo16&ARpCE~?pYq*Xnk1<_Y7f?uzGSweS}0(_ul8*2#z2X0VrL2ZnfLA7SFnOp1%63F{|&8&HS2F{nskS zoX~wF@z@sW&FvRrOK7VJ*%2E>P9Ge5-Lg$zvwz0xQf89MF@1yz0;eIl!4;mNFc)zi$ znEf?7kJIT9@=ZmtN5VD7>f4wN-?F{j5-qAp46Ez()clhj;jjMXPyEc2`VGHQ{;ELur+ZuDCI3_Dah!U*T!xC;g_wW>o>1p!~L;E z94;NrrXiB2n7IcpUF3i3Tn)Zwhr=4KE!jfX+dNoa%ABb0X-RXBDCnwcBx)qLRF;Jw zoz3gavN|QmuB^i3RZXWH0_DHbxdXI4j9ixG3qG+irvmye92J(C(w6x?>}A4UW-EB% zLP*BUw`*M?taBj@D`Z27AFu7x-I|$37nyH^H+#N9J}qme(N8s*y|a%3a&b2&(| z3JY*p(&8l;pV;g{#*jP-!?>S5LkrW3Q0ZqL?a?kPmu3m|#{!uoo}La35sJ0(Xk7`O zYEoMWcF0{=F(l(F|M=xqb|mKXtz8Co;EKH)h!=BeoD(=BE(#9@i;r;S|qqG z54PWySJaZ;K{}V$61%5h6_%$G(XZ-(!eB|iCh+GGT7SQI_dXaC( zsdH<^Iab;L+b%0kf4~4sa!b^eVR>_!Rz$IpCV8vUNSkr5Ro>|@W}u_fWd=@giUD_A zSpXB4lXbJ|)ig)4W)dwB*5aU9;kt~pKvlni7JRvKh875!Y%!iVn4F7stGTn8>F9dF zbaY05FP8`)Y{UT|+=c4A%!-+*J@MG|Gcak_YQup=yM1c6@9b6noBDy%4r)}=$>BT| z@eUePeC41`MQ%q!Dxw^(QnA6&l!`1jT&U=M!-9(aH_WLhOPy!6)B7Z4%pbEta zJ@CJhoMddG_~$8pwL|_VzygZay);^Yp=SFK|bn z85sEcfDZ}{qh3-nuTZLM9x|+6p%`QVS;_&#xzRQ$$xVRalnI5t2&}nrQupl-g#wvT zC}RNQPTMnvlX#@ZL9>*U+J{ntZ74z|z}|)(aJs=Nd~k~C1qP&tD547#1Mea6v>ou- Pjvs(xIGCsH4_5vM1Zk7h diff --git a/build/lib/merge/systeminfo.jar b/build/lib/dist/systeminfo.jar similarity index 100% rename from build/lib/merge/systeminfo.jar rename to build/lib/dist/systeminfo.jar diff --git a/build/projects/Spark.iml b/build/projects/Spark.iml index 3ed41ada..3bd370d5 100644 --- a/build/projects/Spark.iml +++ b/build/projects/Spark.iml @@ -82,15 +82,6 @@ - - - - - - - - - @@ -100,15 +91,6 @@ - - - - - - - - - @@ -203,6 +185,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/build/projects/Spark.iws b/build/projects/Spark.iws index b087c1cb..a7df2e6b 100644 --- a/build/projects/Spark.iws +++ b/build/projects/Spark.iws @@ -153,37 +153,73 @@ + + + + + + + + + - + - - + + - + - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -463,7 +499,7 @@ - + @@ -541,7 +571,7 @@ - + - + - - + + - + - - + + - + @@ -651,7 +681,6 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -785,23 +745,93 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + diff --git a/src/java/org/jivesoftware/AccountCreationWizard.java b/src/java/org/jivesoftware/AccountCreationWizard.java index 67c807a8..db630362 100644 --- a/src/java/org/jivesoftware/AccountCreationWizard.java +++ b/src/java/org/jivesoftware/AccountCreationWizard.java @@ -279,6 +279,10 @@ public class AccountCreationWizard extends JPanel { con = new XMPPConnection(localPref.getXmppHost(), port, serverName); } } + + if(con != null){ + con.connect(); + } return con; } diff --git a/src/java/org/jivesoftware/spark/ui/ContactList.java b/src/java/org/jivesoftware/spark/ui/ContactList.java index bad7a5b1..0b9970e6 100644 --- a/src/java/org/jivesoftware/spark/ui/ContactList.java +++ b/src/java/org/jivesoftware/spark/ui/ContactList.java @@ -34,8 +34,8 @@ import org.jivesoftware.smackx.SharedGroupManager; import org.jivesoftware.smackx.packet.LastActivity; import org.jivesoftware.spark.ChatManager; import org.jivesoftware.spark.SparkManager; -import org.jivesoftware.spark.Workspace; import org.jivesoftware.spark.UserManager; +import org.jivesoftware.spark.Workspace; import org.jivesoftware.spark.component.InputDialog; import org.jivesoftware.spark.component.RolloverButton; import org.jivesoftware.spark.component.VerticalFlowLayout; @@ -216,7 +216,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("control N"), "searchContacts"); getActionMap().put("searchContacts", new AbstractAction("searchContacts") { public void actionPerformed(ActionEvent evt) { - // searchContacts(""); + // searchContacts(""); } }); @@ -297,7 +297,10 @@ public final class ContactList extends JPanel implements ActionListener, Contact // If not available, move to offline group. else if (presence.getType() == Presence.Type.unavailable && !isPending) { - moveToOfflineGroup(bareJID); + presence = roster.getPresence(bareJID); + if (presence == null) { + moveToOfflineGroup(bareJID); + } } } diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/phone/PhonePlugin.java b/src/java/org/jivesoftware/sparkimpl/plugin/phone/PhonePlugin.java index e28f107d..761fa685 100644 --- a/src/java/org/jivesoftware/sparkimpl/plugin/phone/PhonePlugin.java +++ b/src/java/org/jivesoftware/sparkimpl/plugin/phone/PhonePlugin.java @@ -72,7 +72,7 @@ public class PhonePlugin implements Plugin { } catch (Exception e) { // Ignore because the user does not have support. - //Log.error(e); + Log.error(e); } return phoneClient; } diff --git a/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java b/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java index eaebd35e..095e2a3b 100644 --- a/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java +++ b/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java @@ -11,10 +11,12 @@ package org.jivesoftware.sparkimpl.preference.sounds; import org.jivesoftware.smack.PacketListener; +import org.jivesoftware.smack.Roster; import org.jivesoftware.smack.filter.PacketTypeFilter; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.Presence; +import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smackx.packet.DelayInformation; import org.jivesoftware.spark.SparkManager; import org.jivesoftware.spark.plugin.Plugin; @@ -39,9 +41,14 @@ public class SoundPlugin implements Plugin, MessageListener, ChatRoomListener { if (presence != null && presence.getType() == Presence.Type.unavailable) { SoundPreferences preferences = soundPreference.getPreferences(); if (preferences != null && preferences.isPlayOfflineSound()) { - String offline = preferences.getOfflineSound(); - File offlineFile = new File(offline); - SparkManager.getSoundManager().playClip(offlineFile); + Roster roster = SparkManager.getConnection().getRoster(); + final String bareJID = StringUtils.parseBareAddress(presence.getFrom()); + presence = roster.getPresence(bareJID); + if (presence == null) { + String offline = preferences.getOfflineSound(); + File offlineFile = new File(offline); + SparkManager.getSoundManager().playClip(offlineFile); + } } } }