aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* clear avatar cache with new roster push from serveriNPUTmice2014-11-171-0/+2
* avoided some null pointersiNPUTmice2014-11-173-24/+35
* context menu for muc participants + refactor trueCounterpart to use Jid classiNPUTmice2014-11-177-38/+102
* synchronized around cache clear in avatar serviceiNPUTmice2014-11-171-9/+15
* Use `Locale.US' for string comparisons in searchSam Whited2014-11-172-6/+14
* trim search before searchingiNPUTmice2014-11-171-2/+2
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-171-2/+3
|\
| * Fix linter suppressionSam Whited2014-11-171-2/+3
* | split search keywords by whitespaces and imply AND operatioriNPUTmice2014-11-171-1/+11
|/
* highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-173-72/+105
* made tags searchableiNPUTmice2014-11-162-157/+180
* fixed regression of xmpp uris not workingiNPUTmice2014-11-162-14/+11
* Merge pull request #673 from SamWhited/developmentDaniel Gultsch2014-11-161-1/+1
|\
| * Fix fetching accounts by JIDsSam Whited2014-11-161-1/+1
* | happy hanukkahiNPUTmice2014-11-168-23/+132
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-162-3/+3
|\
| * Don't escape passwords in SASLSam Whited2014-11-152-3/+3
* | show full time stamp in connection established fieldiNPUTmice2014-11-161-1/+1
* | better error checking in ssl switch overiNPUTmice2014-11-161-5/+9
|/
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-163-53/+186
* Merge branch 'master' into developmentiNPUTmice2014-11-161-5/+18
|\
| * close cursor for databaseiNPUTmice2014-11-161-5/+18
| * made presences synchronizediNPUTmice2014-11-131-13/+27
| * more npe checks in muc packet parseriNPUTmice2014-11-131-32/+35
* | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-1611-69/+119
* | Merge pull request #669 from SamWhited/scramcachingDaniel Gultsch2014-11-152-10/+51
|\ \
| * | Cache SCRAM-SHA-1 keys for current sessionSam Whited2014-11-152-10/+51
* | | small modifications for changing an account status in XmppConnectioniNPUTmice2014-11-151-8/+6
|/ /
* | Merge pull request #668 from SamWhited/auth-pinningDaniel Gultsch2014-11-1517-280/+293
|\ \
| * | Set security error status on TLS cert mismatchSam Whited2014-11-151-6/+7
| * | Remove extra status wrapper methodSam Whited2014-11-152-6/+1