aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into HEADChristian S2016-05-041-8/+61
|\|
| * spelling fixesklemens2016-05-041-1/+1
| * ping all accounts at the same timeDaniel Gultsch2016-05-021-5/+17
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-261-0/+1
| * don't create templates for empty status messagesDaniel Gultsch2016-04-231-2/+6
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-2/+38
* | Prevent presences from being cleared on connectionChristian S2016-04-231-2/+1
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-211-0/+12
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-191-0/+12
* | changed default values to match preferences.xmlChristian S2016-04-161-2/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-151-5/+11
|\|
| * removed unnecessary call to stopSelf() after logging outDaniel Gultsch2016-04-141-5/+11
* | make foreground service always enabledChristian S2016-04-151-5/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-141-31/+82
|\|
| * removed unused call to cancel eventsDaniel Gultsch2016-04-141-1/+0
| * hacky workaround to determine if uri points to private file on < lolipopDaniel Gultsch2016-04-131-2/+2
| * minor code cleanupDaniel Gultsch2016-04-121-3/+1
| * republish avatar if server offers non-persistent pep :-(Daniel Gultsch2016-04-111-25/+79
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-091-0/+10
|\|
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+10
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-071-0/+1
|\|
| * better detect broken pepDaniel Gultsch2016-04-051-0/+1
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-041-6/+0
|\|
| * removed unnecessary wait for disconnectDaniel Gultsch2016-04-041-6/+0
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-031-7/+9
|\|
| * check max http file size when attaching filesDaniel Gultsch2016-04-011-4/+7
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-311-2/+1
| * save otr fingerprint in messageDaniel Gultsch2016-03-311-2/+2
| * Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
* | fixed bug in ShortcutBadgerChristian S2016-03-271-2/+2
* | Merge remote-tracking branch 'refs/remotes/origin/patch-2' into developmentChristian S2016-03-271-2/+2
|\ \
| * | Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
| |/
* | Merge branch 'siacs/master' into developmentChristian S2016-03-261-1/+1
|\|
| * Typo `attempt`licaon-kter2016-03-221-1/+1
* | Merge pull request #80 from siacs/masterChristian S2016-03-201-0/+1
|\|
| * be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-201-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-19/+63
|\|
| * moved avatarfetcher reset code to bindDaniel Gultsch2016-03-031-8/+8
| * avoid unnecessary disconnect. prevent NetworkOnMainThreadExceptionDaniel Gultsch2016-03-031-3/+3
| * expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-1/+9
| * use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-291-5/+5
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-2/+38
* | Revert "disallow message correction by default. fixes #1720"Christian S2016-02-271-1/+1
|/
* disallow message correction by default. fixes #1720Daniel Gultsch2016-02-261-1/+1
* execute pending mam queries every time we come onlineDaniel Gultsch2016-02-261-1/+1
* made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-12/+17
* set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-231-1/+2
* turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-1/+3
* change uuid when replacing messagesDaniel Gultsch2016-02-201-0/+5
* don't log start reasonDaniel Gultsch2016-02-171-1/+0