aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-261-15/+99
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java src/main/java/eu/siacs/conversations/entities/Bookmark.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/res/layout/activity_contact_details.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml
| * update ui after affiliation changesDaniel Gultsch2016-05-211-0/+3
| |
| * also save form elements in disco storageDaniel Gultsch2016-05-191-2/+2
| |
| * refactored muc item parsing to also parse muc status messagesDaniel Gultsch2016-05-171-14/+4
| |
| * change affiliation for in memory users that are currently not joined in a ↵Daniel Gultsch2016-05-161-0/+1
| | | | | | | | conference
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-161-5/+21
| |
| * send caps hash in muc joinDaniel Gultsch2016-05-151-6/+1
| | | | | | | | this prevents desktop clients from iq'ing use when they join
| * show presence of other resources as templateDaniel Gultsch2016-05-131-0/+10
| |
| * reset attempt count when reconnecting because of timeoutDaniel Gultsch2016-05-121-0/+3
| |
| * use 'phone' or 'tablet' as default resourceDaniel Gultsch2016-05-121-1/+1
| |
| * add lock domain and magic create domain to known hostsDaniel Gultsch2016-05-101-0/+6
| |
| * do not show last-seen metric in UIDaniel Gultsch2016-05-101-4/+2
| |
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-5/+5
| |
| * refactor captcha response handling to avoid network on main thread exceptionDaniel Gultsch2016-05-051-2/+3
| |
| * 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
| |
| * added magic create welcome screenDaniel Gultsch2016-04-191-0/+12
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-091-84/+8
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-45/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
* | | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-12/+13
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
| * | removed unnecessary call to stopSelf() after logging outDaniel Gultsch2016-04-141-5/+11
| | |
| * | 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
| | |
| * | check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+10
| | |
| * | better detect broken pepDaniel Gultsch2016-04-051-0/+1
| | | | | | | | | | | | | | | mark pep as broken when publishing bundle or device list failed reset 'brokenness' when account is getting disabled
| * | removed unnecessary wait for disconnectDaniel Gultsch2016-04-041-6/+0
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-64/+32
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
* | | Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-9/+11
|\ \ \ | | |/ | |/|
| * | 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
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-0/+1
|\ \ \ | | |/ | |/|
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-1/+2
|\ \ \ | | |/ | |/|
| * | Typo `attempt`licaon-kter2016-03-221-1/+1
| | |
| * | be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-201-0/+1
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-221-1/+5
|\ \ \ | | |/ | |/|
* | | fixed merge errorslookshe2016-03-201-1/+1
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-3/+2
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-25/+15
|\| | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-101-19/+21
|\| | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-19/+63
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 09:29:45 +0000