aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* safety net in joinMuciNPUTmice2014-12-031-4/+6
* clean up getProposedNickiNPUTmice2014-12-031-6/+5
* fixed potential npes in message parseriNPUTmice2014-12-031-2/+7
* cleaned up avatar / tile creationiNPUTmice2014-12-032-20/+9
* fixed #728iNPUTmice2014-12-011-5/+2
* bumped cap version as well0.9.1iNPUTmice2014-12-011-1/+1
* clear encrypted messages on reinitiNPUTmice2014-12-011-2/+13
* worked around rare npeiNPUTmice2014-12-011-5/+12
* fixed npe if roster jid couldnt be parsediNPUTmice2014-12-011-8/+5
* do not query service info from main server againiNPUTmice2014-12-011-5/+3
* don't request fragment before updatingiNPUTmice2014-11-301-6/+2
* Merge pull request #721 from SamWhited/warning_fixesDaniel Gultsch2014-11-291-3/+6
|\
| * Misc. "fixes" to correct warnings.Sam Whited2014-11-291-3/+6
* | fixed npe for broken bookmarksiNPUTmice2014-11-291-7/+8
* | fix for concurrency issueiNPUTmice2014-11-291-1/+1
|/
* fixed npe. fixed #717iNPUTmice2014-11-271-5/+6
* create conversation with bare jidiNPUTmice2014-11-271-1/+1
* use getAttributeAsJid methodiNPUTmice2014-11-271-6/+1
* Merge pull request #713 from betheg/mucDaniel Gultsch2014-11-245-1/+65
|\
| * add an listener for the muc roster update.Michael2014-11-234-1/+63
| * MUC: do not add yourself to the muc user list.Michael2014-11-231-0/+2
* | MUC: option to set/delete bookmark in conference details.Michael2014-11-231-0/+39
|/
* work around to not confuse irc transport with real conference serversiNPUTmice2014-11-211-2/+7
* Merge pull request #706 from betheg/unused_importsDaniel Gultsch2014-11-2112-38/+0
|\
| * remove unused imports.Michael2014-11-2112-38/+0
* | update action bar with conversations updates as welliNPUTmice2014-11-212-52/+45
* | MUC: set from when join muc.Michael2014-11-211-0/+1
* | move task to back and not finish when hitting back buttoniNPUTmice2014-11-211-7/+5
|/
* STATUS_CODE_SELF_PRESENCE is not set in all case.Michael2014-11-211-10/+16
* additional null pointer saftey checksiNPUTmice2014-11-211-15/+13
* verify contacts key only on initiating side of smpiNPUTmice2014-11-213-7/+18
* changed listener timing and cache clearing after muc presencesiNPUTmice2014-11-201-6/+9
* create file and dirs before creating fileiNPUTmice2014-11-201-0/+2
* change status codes string 'number' to a better readable constant.Michael2014-11-201-3/+5
* fixed potential NPEsiNPUTmice2014-11-201-39/+43
* import fixesiNPUTmice2014-11-201-0/+2
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-201-3/+0
|\
| * Remove broken / unused importsSam Whited2014-11-191-3/+0
* | brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-2012-137/+476
|/
* sent read marker to full jidiNPUTmice2014-11-192-9/+10
* some saftey checks before registering listeners in XmppActivityiNPUTmice2014-11-191-1/+12
* put error notification into notification serviceiNPUTmice2014-11-183-46/+42
* simplified message merge conditioniNPUTmice2014-11-181-43/+13
* synchronized message list in conversation fragmentiNPUTmice2014-11-181-113/+118
* show dynamic tags in contacts activity as welliNPUTmice2014-11-181-33/+26
* properly remove conversations context menuiNPUTmice2014-11-182-41/+20
* disabled broken conversations context menuiNPUTmice2014-11-181-3/+3
* better usage of synchronized in some placesiNPUTmice2014-11-183-82/+80
* better exception handling in XmppConnection.connect. (never return without th...iNPUTmice2014-11-181-39/+15
* context menu for conversations. fixed #630iNPUTmice2014-11-181-9/+45