Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add support for XEP-0191 (Blocking command) | Sam Whited | 2014-12-22 | 9 | -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 | ||||
* | get rid of special self presence object and incorporate that into roster | iNPUTmice | 2014-12-20 | 1 | -18/+2 |
| | |||||
* | more null checks for otr fingerprints | iNPUTmice | 2014-12-20 | 1 | -1/+1 |
| | |||||
* | don't include empty fingerprints in list of otrfingerprints | iNPUTmice | 2014-12-20 | 1 | -4/+6 |
| | |||||
* | clean up conversation history after swtiching to a different conversation | iNPUTmice | 2014-12-17 | 1 | -4/+10 |
| | |||||
* | migrated more jid parsing to use getAttributeAsJid. added error logging | iNPUTmice | 2014-12-15 | 1 | -10/+1 |
| | |||||
* | refactored the way certain messages are being found within a conversation | iNPUTmice | 2014-12-14 | 2 | -16/+108 |
| | |||||
* | reverse through mam history when loading larger chuncks | iNPUTmice | 2014-12-13 | 2 | -9/+10 |
| | |||||
* | various mam improvments | iNPUTmice | 2014-12-13 | 1 | -0/+2 |
| | |||||
* | changed lastMessageReceived into lastMessageTransmitted to account for sent ↵ | iNPUTmice | 2014-12-10 | 1 | -7/+11 |
| | | | | messages as well. (will trigger on sm ack) | ||||
* | save server id from mam messages. check for dups before adding mam | iNPUTmice | 2014-12-10 | 1 | -3/+26 |
| | |||||
* | added max history age (default 1w). automatically sort newly added mam messages | iNPUTmice | 2014-12-10 | 3 | -3/+42 |
| | |||||
* | very basic mam support | iNPUTmice | 2014-12-10 | 1 | -3/+1 |
| | |||||
* | store last message received date in conversation | iNPUTmice | 2014-12-10 | 1 | -0/+9 |
| | |||||
* | fixed #651 | iNPUTmice | 2014-12-03 | 1 | -0/+12 |
| | |||||
* | further npe checks | iNPUTmice | 2014-12-03 | 1 | -1/+2 |
| | |||||
* | made muc parser more compatible with legacy mucs?! (whatever that is exactly) | iNPUTmice | 2014-12-03 | 1 | -3/+1 |
| | |||||
* | fixed another npe in hasBookmark | iNPUTmice | 2014-12-03 | 1 | -2/+3 |
| | |||||
* | clean up getProposedNick | iNPUTmice | 2014-12-03 | 1 | -6/+5 |
| | |||||
* | worked around rare npe | iNPUTmice | 2014-12-01 | 1 | -5/+12 |
| | |||||
* | MUC: do not add yourself to the muc user list. | Michael | 2014-11-23 | 1 | -0/+2 |
| | |||||
* | remove unused imports. | Michael | 2014-11-21 | 2 | -3/+0 |
| | |||||
* | STATUS_CODE_SELF_PRESENCE is not set in all case. | Michael | 2014-11-21 | 1 | -10/+16 |
| | |||||
* | verify contacts key only on initiating side of smp | iNPUTmice | 2014-11-21 | 1 | -1/+1 |
| | |||||
* | change status codes string 'number' to a better readable constant. | Michael | 2014-11-20 | 1 | -3/+5 |
| | |||||
* | brought ad hoc conferences back. fixed #688 fixed #367 | iNPUTmice | 2014-11-20 | 2 | -64/+114 |
| | |||||
* | sent read marker to full jid | iNPUTmice | 2014-11-19 | 1 | -2/+2 |
| | |||||
* | simplified message merge condition | iNPUTmice | 2014-11-18 | 1 | -43/+13 |
| | |||||
* | better usage of synchronized in some places | iNPUTmice | 2014-11-18 | 1 | -5/+1 |
| | |||||
* | context menu for muc participants + refactor trueCounterpart to use Jid class | iNPUTmice | 2014-11-17 | 3 | -13/+27 |
| | |||||
* | Use `Locale.US' for string comparisons in search | Sam Whited | 2014-11-17 | 2 | -6/+14 |
| | |||||
* | trim search before searching | iNPUTmice | 2014-11-17 | 1 | -2/+2 |
| | |||||
* | split search keywords by whitespaces and imply AND operatior | iNPUTmice | 2014-11-17 | 1 | -1/+11 |
| | |||||
* | made tags searchable | iNPUTmice | 2014-11-16 | 2 | -157/+180 |
| | |||||
* | happy hanukkah | iNPUTmice | 2014-11-16 | 3 | -11/+91 |
| | |||||
* | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵ | iNPUTmice | 2014-11-16 | 3 | -36/+50 |
| | | | | shareable uri where ever possible | ||||
* | Remove extra status wrapper method | Sam Whited | 2014-11-15 | 1 | -4/+0 |
| | |||||
* | Add incompatible server status | Sam Whited | 2014-11-15 | 1 | -1/+4 |
| | |||||
* | Add security error status | Sam Whited | 2014-11-15 | 1 | -12/+15 |
| | |||||
* | Make account status an enum | Sam Whited | 2014-11-15 | 1 | -49/+64 |
| | |||||
* | Add auth method pinning | Sam Whited | 2014-11-15 | 1 | -0/+2 |
| | |||||
* | Merge branch 'feature/file_transfer' into development | iNPUTmice | 2014-11-15 | 4 | -7/+80 |
|\ | | | | | | | | | Conflicts: src/main/res/values/strings.xml | ||||
| * | fixed description in notifications and conversation overview | iNPUTmice | 2014-11-15 | 1 | -0/+39 |
| | | |||||
| * | made file transfers cancelable | iNPUTmice | 2014-11-15 | 1 | -0/+2 |
| | | |||||
| * | some mime and pgp fixes for file transfer | iNPUTmice | 2014-11-15 | 1 | -6/+8 |
| | | |||||
| * | progress for http images as well. fixed open button for sent files | iNPUTmice | 2014-11-15 | 1 | -0/+1 |
| | | |||||
| * | basic arbitrary file transfer | iNPUTmice | 2014-11-15 | 3 | -7/+36 |
| | | |||||
* | | Merge branch 'feature/otr_verification' into development | iNPUTmice | 2014-11-15 | 1 | -2/+32 |
|\ \ | |/ |/| | |||||
| * | added snackbar to indicate smp. more error handling in verify activity | iNPUTmice | 2014-11-11 | 1 | -0/+4 |
| | | |||||
| * | initial smp support | iNPUTmice | 2014-11-11 | 1 | -2/+28 |
| | |