aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Compile Clean after mergetrz/merge_1.5.2steckbrief2015-08-111-0/+3
|
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-111-228/+385
|\
| * bugfix: use sendIqPacket method in service instead of invoking ↵Daniel Gultsch2015-07-211-3/+2
| | | | | | | | XmppConnection directly
| * only try to change affilations for known jidsDaniel Gultsch2015-07-111-1/+1
| |
| * renamed downloadable to transferableDaniel Gultsch2015-07-101-5/+4
| |
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-101-4/+44
| | | | | | | | fixes #954
| * refactored sendMessage and merged with resendMessageDaniel Gultsch2015-07-051-148/+97
| |
| * make sure unread count is initialized as 0. fixes #1270Daniel Gultsch2015-07-031-1/+2
| |
| * fixed share with activity to account for http file uploadDaniel Gultsch2015-07-021-3/+4
| |
| * show attach button in conferences when http upload is availableDaniel Gultsch2015-06-291-3/+2
| |
| * initial http upload supportDaniel Gultsch2015-06-291-29/+37
| | | | | | | | be careful: little error handling and no encryption
| * made i/o and memory intensive operations execute in serial orderDaniel Gultsch2015-06-051-11/+18
| |
| * reworked handeling of system contactsDaniel Gultsch2015-06-031-3/+12
| |
| * removed unnecessary / inacurate debug loggingDaniel Gultsch2015-05-261-2/+1
| |
| * update unread count badge only when necessaryDaniel Gultsch2015-05-261-7/+11
| |
| * added default iq handler to print some iq error messagesDaniel Gultsch2015-05-261-4/+16
| |
| * renamed OtrEngine to OtrServiceDaniel Gultsch2015-05-261-3/+3
| |
| * Merge branch 'master' into developmentDaniel Gultsch2015-05-251-4/+11
| |\
| | * log connection age and reshedule ping checkDaniel Gultsch2015-05-251-4/+11
| | |
| * | added ShortcutBadger as a dependency to create unread counts on launcher iconDaniel Gultsch2015-05-201-6/+18
| | |
| * | provide helper function for getting the content of a child directlyDaniel Gultsch2015-05-201-2/+1
| |/
| * let jingle connection and manager handle message statusDaniel Gultsch2015-05-161-4/+0
| |
| * clear avatar cache when uploading new avatarDaniel Gultsch2015-05-131-0/+1
| |
| * handle conference invites differently to deal with killed activities. fixes ↵Daniel Gultsch2015-05-121-0/+1
| | | | | | | | #1188
| * config option to reset attempt counts when changing network (default=true)Daniel Gultsch2015-05-081-8/+18
| |
| * fixed npe when binval value of vcard avatar is nullDaniel Gultsch2015-05-071-2/+3
| |
| * avoid fetching avatars multiple times in parallelDaniel Gultsch2015-05-051-8/+39
| |
| * r/o support for vcard avatars. pep avatars will be preferedDaniel Gultsch2015-05-051-9/+44
| |
| * Merge pull request #1146 from BrianBlade/minor_otr_tweaksDaniel Gultsch2015-04-251-5/+15
| |\ | | | | | | OTR: Fix onContactStatusChanged & dont archive OTR
| | * OTR: Fix onContactStatusChanged & dont archive OTRBrianBlade2015-04-211-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix session handling on contact status change: Do not reset potentially active sessions; check peer's OTR-resource on disconnect - use no-permanent-store hint instead of no-store to ensure finished messages are delivered to offline/disconnected clients - add no-permanent-store to ask compliant servers not to archive OTR messages
| * | send invite to other instanzes after creating ad hoc conference. fixes #1136Daniel Gultsch2015-04-231-0/+8
| |/
| * Merge branch 'dont_trust_cas_preference' of ↵iNPUTmice2015-04-141-3/+16
| |\ | | | | | | | | | | | | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml
| | * Add option to use MTM without default TrustManagerBrianBlade2015-04-111-3/+16
| | | | | | | | | | | | | | | | | | Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked.
| * | don't resume old session when changing resourceiNPUTmice2015-04-091-0/+5
| | |
| * | Enable end-conversation by swipe gestureBrianBlade2015-04-081-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4 to enable swipe-out for ListViews Re-enable selectableItemBackground Dont end selectedConversation on swipe Call mConversationFragment.reinit() instead. Add separate undo string for swipe MUC. Add blacklistedConversation for undo swipe Update title_undo_swipe_* strings Fix undo(), rename blacklistedConversation Fix discardUndo(); re-init selectedConversation maintain scroll position after undo clear notification when dismissing a conversation modified / simplified maintain scroll position code simplify handling of selectedConversation change undo_muc string, remove notifyDataSetChanged()
* | changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-141-9/+1
| | | | | | | | settings class
* | implementation for downloading only when enabled wlanlookshe2015-04-121-0/+20
| |
* | differ between received and read messagelookshe2015-04-111-1/+5
|/
* # add delivery receipts for private muc msgsBrianBlade2015-03-181-1/+1
| | | | # enable update last-seen for muc-msgs
* display geo uris as location. show 'send loction' in share menu if request ↵iNPUTmice2015-03-071-0/+18
| | | | location intent can be resolved
* avoid unnecessary thread creationiNPUTmice2015-03-051-16/+21
|
* added methods to count number of unread messagesDaniel Gultsch2015-03-021-0/+8
|
* mark all sent messages up to a marker as displayedDaniel Gultsch2015-03-011-9/+10
|
* reset incoming chat state when going into backgroundiNPUTmice2015-02-231-0/+3
|
* added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+22
|
* always go through reconnect method instead of just starting XmppConnection ↵iNPUTmice2015-02-181-4/+1
| | | | threads
* moved roster loading to async task as welliNPUTmice2015-02-171-10/+22
|
* load messages asynchronouslyiNPUTmice2015-02-121-2/+18
|
* added actions to error notificationiNPUTmice2015-02-101-0/+24
|
* adapt caps on whether or not message confirmation is oniNPUTmice2015-01-261-1/+5
|