aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* parse stanza-id from messagesDaniel Gultsch2015-12-042-3/+23
|
* properly clear muc user avatar cachesDaniel Gultsch2015-12-044-13/+30
|
* fixed showing avatars for contacts in mucDaniel Gultsch2015-12-041-1/+10
|
* Merge pull request #1595 from fiaxh/pgp_database_signatureDaniel Gultsch2015-12-043-74/+96
|\ | | | | Regenerate PGP signatures once
| * Unset all PGP signatures oncefiaxh2015-12-023-74/+96
| | | | | | | | ... so they will be redone to match the changed status.
* | avoid some NPEsDaniel Gultsch2015-12-042-3/+4
| |
* | rely on message id if message id is uuid and pgp encryption was used to ↵Daniel Gultsch2015-12-041-1/+3
| | | | | | | | deduplicate messages. fixes #1357
* | use proposed nick as default nick in mucoptionsDaniel Gultsch2015-12-043-8/+1
| |
* | parse vcard avatars from muc presencesDaniel Gultsch2015-12-036-181/+295
| |
* | enabled previously disabled http uploadDaniel Gultsch2015-12-031-1/+1
| |
* | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2015-12-023-3/+22
|\ \
| * \ Merge pull request #1545 from SamWhited/show_new_contact_request_messagesDaniel Gultsch2015-12-023-3/+22
| |\ \ | | |/ | |/| Show status message when contact requests presence
| | * Show status message when contact requests presenceSam Whited2015-12-023-3/+22
| | | | | | | | | | | | Remove presence when conversation closed
* | | show tor config in paranoid modeDaniel Gultsch2015-12-021-1/+1
|/ /
* | fixed avatar loading for non-file urisDaniel Gultsch2015-12-022-11/+7
| |
* | users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-022-8/+35
| | | | | | | | library
* | hide message content in notifications in paranoia modeDaniel Gultsch2015-12-021-20/+30
|/
* introduced build-time paranoia mode that disables unencrypted chats and ↵Daniel Gultsch2015-12-015-4/+24
| | | | forces TOR
* introduce config.java variable to optionally show number of connected ↵Daniel Gultsch2015-12-012-37/+57
| | | | accounts in notification
* fixed crashes when activity got destroyed when selecting pgp keyDaniel Gultsch2015-12-012-40/+95
|
* combine multiple message receipts into single messageDaniel Gultsch2015-12-012-12/+15
|
* add error state for unavailable tor networkDaniel Gultsch2015-12-013-13/+14
|
* always use http proxy for http requests. (socks is leaking dns)Daniel Gultsch2015-12-011-5/+1
|
* refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-014-53/+72
|
* do socks5 connect manuallyDaniel Gultsch2015-12-013-51/+69
|
* initial tor supportDaniel Gultsch2015-12-0111-129/+273
|
* changed method signature of calcSampleSizeDaniel Gultsch2015-11-301-1/+1
|
* hide subject edit button if not editable by userDaniel Gultsch2015-11-264-5/+30
|
* encrypt pgp messages to selfDaniel Gultsch2015-11-261-8/+8
|
* detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-263-5/+49
|
* removed unnecessary configuration fetch after joinDaniel Gultsch2015-11-261-1/+1
|
* removed unecessary chat stateDaniel Gultsch2015-11-261-1/+1
|
* fail jingle file transfer if axolotl key message could not be created. fixes ↵Daniel Gultsch2015-11-261-1/+5
| | | | #1576
* pgp fixes and revert configuration changesDaniel Gultsch2015-11-2515-129/+91
|
* Merge pull request #1569 from fiaxh/conference_one_other_occupantDaniel Gultsch2015-11-241-20/+48
|\ | | | | Show own avatar in tile for conferences with only one other occupant next to theirs
| * Own contact picture in tile for conferences with only one other occupantfiaxh2015-11-151-20/+48
| |
* | Merge pull request #1558 from fiaxh/pgp_api_9.0Daniel Gultsch2015-11-247-44/+137
|\ \ | | | | | | Use OpenPGP-API 9.0
| * | Sign empty statusfiaxh2015-11-092-3/+1
| | |
| * | Use OpenPGP-API 9.0fiaxh2015-11-096-43/+138
| |/
* / PgpEngine: Get account from conversation instead of from contact. fixes ↵fiaxh2015-11-151-3/+3
|/ | | | #1568, fixes #1544
* Move migration 19 before 17Andreas Straub2015-11-061-3/+6
| | | | | | | | | Migration 17 depends on Account deserialization, so any migrations that touch the accounts table need to be applied beforehand. Re-writing the migration to work directly on the database would lead to a lot of code duplication, so it's not worth it at this time, but might become necessary later on to avoid dependency cycles.
* don't close socket on disconnectDaniel Gultsch2015-11-011-1/+0
|
* indicate cbe in chat message hintDaniel Gultsch2015-10-312-1/+23
|
* explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-316-16/+46
|
* fixed session objects not being build on start upDaniel Gultsch2015-10-302-2/+1
|
* Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-3010-74/+292
|\ | | | | PGP messages background decryption
| * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-281-1/+5
| |
| * Decrypt PGP messages in backgroundfiaxh2015-10-289-73/+287
| |
* | moved db calls made from UI into serial background threadDaniel Gultsch2015-10-291-5/+21
| |
* | avoid npe when checking for stream restartDaniel Gultsch2015-10-291-2/+4
| |