Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2015-10-29 | 1 | -1/+1 |
|\ | |||||
| * | Don't synchronize on non-final field | Sam Whited | 2015-10-26 | 1 | -1/+1 |
| | | |||||
* | | load avatars in message adapter in background task | Daniel Gultsch | 2015-10-29 | 4 | -17/+115 |
| | | |||||
* | | show encryption type in warned/red messages | Daniel Gultsch | 2015-10-28 | 3 | -0/+32 |
|/ | |||||
* | Merge pull request #1520 from saqura/self_handle_orientation | Daniel Gultsch | 2015-10-26 | 9 | -1/+57 |
|\ | | | | | Handle some orientation changes manually | ||||
| * | Reset the margins manually after rotating | saqura | 2015-10-26 | 8 | -1/+53 |
| | | |||||
| * | Handle some orientation changes manually | saqura | 2015-10-25 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently most activities get destroyed/recreated when rotating the device. This commit prevents this from happening where it is not necessary. The most obvious improvements are: * The options menu in the EditAccountActivity does not disappear when rotating the device. * CSI inactive/active states are no longer sent on every rotate. | ||||
* | | invalidate menu after backend connection. | Daniel Gultsch | 2015-10-25 | 1 | -0/+1 |
|/ | | | | fixes the menu not being shown after rotation in edit account details | ||||
* | join muc even if initial conference configuration fetch failed | Daniel Gultsch | 2015-10-22 | 2 | -2/+43 |
| | |||||
* | fixed read conversations showing up as notifications after a restart | Daniel Gultsch | 2015-10-21 | 1 | -5/+4 |
| | |||||
* | open unknown files with wildcard intent | Daniel Gultsch | 2015-10-20 | 2 | -10/+15 |
| | |||||
* | open manage account + certificate chooser when cbe mode is enabled | Daniel Gultsch | 2015-10-20 | 4 | -88/+105 |
| | |||||
* | move chat state reset from background switch to foreground switch to account ↵ | Daniel Gultsch | 2015-10-19 | 1 | -3/+3 |
| | | | | for chat states sent in the mean time | ||||
* | update last seen in mucs. fixes #1508 | Daniel Gultsch | 2015-10-19 | 1 | -1/+5 |
| | |||||
* | add nick to bookmark when entering full jid in join conference dialog | Daniel Gultsch | 2015-10-19 | 1 | -4/+6 |
| | |||||
* | synchronize around the disco object | Daniel Gultsch | 2015-10-19 | 1 | -44/+53 |
| | |||||
* | disconnet in background thread | Daniel Gultsch | 2015-10-17 | 1 | -1/+7 |
| | |||||
* | only try EXTERNAL auth if client certificate is set for account | Daniel Gultsch | 2015-10-17 | 1 | -1/+1 |
| | |||||
* | don't retry building broken omemo keys | Daniel Gultsch | 2015-10-17 | 1 | -4/+15 |
| | |||||
* | allow redownloading files from remote hosts. fixes #1504 | Daniel Gultsch | 2015-10-17 | 2 | -3/+13 |
| | |||||
* | load axolotl session cache on first device update | Daniel Gultsch | 2015-10-17 | 1 | -2/+6 |
| | |||||
* | improved error reporting in trust keys activity | Daniel Gultsch | 2015-10-17 | 7 | -22/+49 |
| | |||||
* | introduced code to verify omemo device keys with x509 certificates. | Daniel Gultsch | 2015-10-16 | 8 | -65/+190 |
| | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do | ||||
* | block code when doing unforced disconnect | Daniel Gultsch | 2015-10-16 | 2 | -223/+220 |
| | |||||
* | moved other name parsing into seperate method | Daniel Gultsch | 2015-10-15 | 1 | -40/+45 |
| | |||||
* | use constants for oids in xmppdomainverifier | Daniel Gultsch | 2015-10-15 | 1 | -2/+5 |
| | |||||
* | more checks for xmppdomainverifier and better wildcard handling | Daniel Gultsch | 2015-10-15 | 1 | -4/+10 |
| | |||||
* | use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier. ↵ | Daniel Gultsch | 2015-10-15 | 2 | -2/+116 |
| | | | | fixes #1189 | ||||
* | pulled translations from transifex | Daniel Gultsch | 2015-10-14 | 26 | -26/+61 |
| | |||||
* | changed some source strings | Daniel Gultsch | 2015-10-14 | 1 | -2/+2 |
| | |||||
* | clear bitmap cache before running out of memory | Daniel Gultsch | 2015-10-14 | 1 | -0/+9 |
| | |||||
* | make unread status and notifications presistent across restarts | Daniel Gultsch | 2015-10-14 | 6 | -34/+74 |
| | |||||
* | work with muc services that change the message id | Daniel Gultsch | 2015-10-14 | 2 | -1/+3 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-10-13 | 7 | -453/+913 |
| | |||||
* | cleaned up some code. log last tag | Daniel Gultsch | 2015-10-13 | 1 | -8/+14 |
| | |||||
* | set cursor to end of jid in edit account | Daniel Gultsch | 2015-10-13 | 1 | -2/+3 |
| | |||||
* | add config variable to enable x509 verification | Daniel Gultsch | 2015-10-12 | 6 | -27/+31 |
| | |||||
* | code clean up | Daniel Gultsch | 2015-10-12 | 11 | -47/+19 |
| | |||||
* | enable SASL EXTERNAL (certificate login | Daniel Gultsch | 2015-10-11 | 2 | -3/+90 |
| | |||||
* | add menu item in account details to renew certificate | Daniel Gultsch | 2015-10-11 | 7 | -61/+228 |
| | |||||
* | make add account from key visible | Daniel Gultsch | 2015-10-11 | 1 | -1/+1 |
| | |||||
* | Clean up | Andreas Straub | 2015-10-11 | 2 | -13/+5 |
| | | | | Fixes some random linter warnings. | ||||
* | Improve InvalidJidException handling in Jid class | Andreas Straub | 2015-10-11 | 1 | -2/+2 |
| | | | | | | This code should never be triggered anway, so with this 'fix', we should at least get more meaningful stack traces. Plus, it makes the linter happy by preventing NullPointerExceptions. | ||||
* | Merge pull request #1461 from akallabeth/captcha_support | Daniel Gultsch | 2015-10-11 | 6 | -24/+238 |
|\ | | | | | Implemented account registration with captcha | ||||
| * | Captcha support. | Armin Novak | 2015-10-11 | 6 | -24/+238 |
| | | |||||
* | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2015-10-11 | 1 | -1/+1 |
|\| | |||||
| * | Fixed a typo in string.xml | Safwat Halaby | 2015-10-10 | 1 | -1/+1 |
| | | |||||
* | | prevent null pointer when trying to display device fingerprints of not ↵ | Daniel Gultsch | 2015-10-11 | 1 | -0/+3 |
|/ | | | | existing sessions | ||||
* | initial UI work to allow setting up accounts from certifcates | Daniel Gultsch | 2015-10-09 | 7 | -44/+155 |
| | |||||
* | do not dismiss editAccountActivity when still trying to register new account | Daniel Gultsch | 2015-10-09 | 1 | -1/+3 |
| |