aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (unfollow)
Commit message (Collapse)AuthorFilesLines
2015-01-03code cleanupDaniel Gultsch1-8/+12
2015-01-02allow cancellation of waiting filesDaniel Gultsch1-0/+4
2015-01-02improved OTR verification part oneDaniel Gultsch2-17/+16
2014-12-25Add ability to change password on serverSam Whited1-28/+17
Fixes #260
2014-12-25catch another exception in fingerprint generationDaniel Gultsch1-1/+1
2014-12-22Add support for XEP-0191 (Blocking command)Sam Whited9-103/+171
Fixes #791 Squash of commits: 534f25d7dae3ce6852243e28fdd0a69ac01e9463 808fdf5147f27a912a60bee39aa4bf1ddd4f43b4 1eaf8a8330710ad35ba7c368e04f909af623ae4c 31585242c2359efdcd0eeddb9745077f54dbc9eb 2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b e904fb5015bf3a1904ab941a1957edf3b1e7abd2 eebbadf3b3816bbf8fcccb763e419fed252d266f 7c5b87724ce494e5a6e8026557ed50a8fd9f23e8 b0eaaf446937794fe19cbdb4f8309c3ff83d4e42 8c652f9e8bb3512958d9ad8c6f1326505f2d98c8 ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f f5d49897e0dba691ef53a0eddb9ed34d129ad442 a08fa64c505bd895b7c626cfad182380373be20b de67079113e08394a276048c31f6b21baa300829 9069f342173ba30c2b20c67529c7ff497a6a257d 0169fa79d161ee898c4b6762e207087682a952d8 8585a5bd75a5d56927fed8317729bd15fffe4dcc 0053528a078369e0b65dcf71bda251072a1299c7 e901a9c3554bd7cca193e92919b463991eadfea7 c5c78257434813c69ab9b7558bcc8f7cbe858433 e905af348d46d77bc46b5f7211527684acc02fab 13a0f9a10c7892b0f90f5fabd2f2615701b0fd66 2cfba1e24b0139839e4453b92be7e20634d150cf 58e074fb5bb44b05a8104250fccd7c024c808c1a 0d6cf98fc8eab212d798ac79b336f9b70a14f06d e23620f56b85bcab9f3b5d9ce1c01524cd9674dc d72cd2fcc8d54176c3ff53411a69b9bb4642eff3 195143dff8836623a37094a6b8fa6aa01ef31580 5f5f3caf3a1e480a99d27ee5c34ba516419c52e4 1dee3d5861c9f9c710da4cbda3688d94c622ca93 23949b8aa32c78b27bab49bb3c4f3ff588925ce1 9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
2014-12-20get rid of special self presence object and incorporate that into rosteriNPUTmice1-18/+2
2014-12-20more null checks for otr fingerprintsiNPUTmice1-1/+1
2014-12-20don't include empty fingerprints in list of otrfingerprintsiNPUTmice1-4/+6
2014-12-17clean up conversation history after swtiching to a different conversationiNPUTmice1-4/+10
2014-12-15migrated more jid parsing to use getAttributeAsJid. added error loggingiNPUTmice1-10/+1
2014-12-14refactored the way certain messages are being found within a conversationiNPUTmice2-16/+108
2014-12-13reverse through mam history when loading larger chuncksiNPUTmice2-9/+10
2014-12-13various mam improvmentsiNPUTmice1-0/+2
2014-12-10changed lastMessageReceived into lastMessageTransmitted to account for sent ↵iNPUTmice1-7/+11
messages as well. (will trigger on sm ack)
2014-12-10save server id from mam messages. check for dups before adding mamiNPUTmice1-3/+26
2014-12-10added max history age (default 1w). automatically sort newly added mam messagesiNPUTmice3-3/+42
2014-12-10very basic mam supportiNPUTmice1-3/+1
2014-12-10store last message received date in conversationiNPUTmice1-0/+9
2014-12-03fixed #651iNPUTmice1-0/+12
2014-12-03further npe checksiNPUTmice1-1/+2
2014-12-03made muc parser more compatible with legacy mucs?! (whatever that is exactly)iNPUTmice1-3/+1
2014-12-03fixed another npe in hasBookmarkiNPUTmice1-2/+3
2014-12-03clean up getProposedNickiNPUTmice1-6/+5
2014-12-01worked around rare npeiNPUTmice1-5/+12
2014-11-23MUC: do not add yourself to the muc user list.Michael1-0/+2
2014-11-21remove unused imports.Michael2-3/+0
2014-11-21STATUS_CODE_SELF_PRESENCE is not set in all case.Michael1-10/+16
2014-11-21verify contacts key only on initiating side of smpiNPUTmice1-1/+1
2014-11-20change status codes string 'number' to a better readable constant.Michael1-3/+5
2014-11-20brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2-64/+114
2014-11-19sent read marker to full jidiNPUTmice1-2/+2
2014-11-18simplified message merge conditioniNPUTmice1-43/+13
2014-11-18better usage of synchronized in some placesiNPUTmice1-5/+1
2014-11-17context menu for muc participants + refactor trueCounterpart to use Jid classiNPUTmice3-13/+27
2014-11-17Use `Locale.US' for string comparisons in searchSam Whited2-6/+14
2014-11-17trim search before searchingiNPUTmice1-2/+2
2014-11-17split search keywords by whitespaces and imply AND operatioriNPUTmice1-1/+11
2014-11-16made tags searchableiNPUTmice2-157/+180
2014-11-16happy hanukkahiNPUTmice3-11/+91
2014-11-16parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵iNPUTmice3-36/+50
shareable uri where ever possible
2014-11-15Remove extra status wrapper methodSam Whited1-4/+0
2014-11-15Add incompatible server statusSam Whited1-1/+4
2014-11-15Add security error statusSam Whited1-12/+15
2014-11-15Make account status an enumSam Whited1-49/+64
2014-11-15Add auth method pinningSam Whited1-0/+2
2014-11-15fixed description in notifications and conversation overviewiNPUTmice1-0/+39
2014-11-15made file transfers cancelableiNPUTmice1-0/+2
2014-11-15some mime and pgp fixes for file transferiNPUTmice1-6/+8
2014-11-15progress for http images as well. fixed open button for sent filesiNPUTmice1-0/+1