aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Compilation errors and merge mixups fixedsteckbrief2016-02-111-291/+30
|
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-333/+1111
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml CHANGELOG.md README.md art/render.rb build.gradle libs/openpgp-api-lib/build.gradle settings.gradle src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/entities/MucOptions.java src/main/java/eu/siacs/conversations/entities/Transferable.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/AbstractConnectionManager.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.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/ConferenceDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.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/ManageAccountActivity.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/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.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/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/PhoneHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/utils/Xmlns.java src/main/java/eu/siacs/conversations/xml/XmlReader.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/drawable-hdpi/ic_launcher.png src/main/res/drawable-hdpi/ic_notification.png src/main/res/drawable-mdpi/ic_launcher.png src/main/res/drawable-mdpi/ic_notification.png src/main/res/drawable-xhdpi/ic_launcher.png src/main/res/drawable-xhdpi/ic_notification.png src/main/res/drawable-xxhdpi/ic_launcher.png src/main/res/drawable-xxhdpi/ic_notification.png src/main/res/drawable-xxxhdpi/ic_launcher.png src/main/res/drawable-xxxhdpi/ic_notification.png src/main/res/layout/account_row.xml src/main/res/layout/activity_about.xml src/main/res/layout/activity_change_password.xml src/main/res/layout/activity_contact_details.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/activity_publish_profile_picture.xml src/main/res/layout/activity_verify_otr.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/enter_jid_dialog.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/join_conference_dialog.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/layout/message_status.xml src/main/res/layout/quickedit.xml src/main/res/values-ar-rEG/strings.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fa-rIR/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-iw/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/values/themes.xml src/main/res/xml/preferences.xml
| * opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-011-3/+10
| |
| * expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-2/+6
| |
| * reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-161-9/+9
| |
| * nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-151-1/+1
| |
| * let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-091-2/+8
| |
| * properly rotate avatarsDaniel Gultsch2016-01-041-2/+1
| |
| * dedublicate bookmarksDaniel Gultsch2015-12-271-3/+7
| |
| * timeout service discovery after 20sDaniel Gultsch2015-12-151-3/+9
| |
| * splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+1
| |
| * changed order of send presence and execute mam queriesDaniel Gultsch2015-12-121-2/+2
| |
| * set bookmark name to room subject if no subject has been set beforeDaniel Gultsch2015-12-111-1/+2
| |
| * get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-111-4/+0
| |
| * notify on mam catchup messagesDaniel Gultsch2015-12-101-1/+1
| |
| * ask for contact permissions when first opening StartConversationActivityDaniel Gultsch2015-12-071-6/+8
| |
| * properly clear muc user avatar cachesDaniel Gultsch2015-12-041-1/+5
| |
| * use proposed nick as default nick in mucoptionsDaniel Gultsch2015-12-041-3/+0
| |
| * parse vcard avatars from muc presencesDaniel Gultsch2015-12-031-6/+16
| |
| * Show status message when contact requests presenceSam Whited2015-12-021-0/+7
| | | | | | | | Remove presence when conversation closed
| * introduced build-time paranoia mode that disables unencrypted chats and ↵Daniel Gultsch2015-12-011-1/+1
| | | | | | | | forces TOR
| * initial tor supportDaniel Gultsch2015-12-011-6/+5
| |
| * hide subject edit button if not editable by userDaniel Gultsch2015-11-261-1/+6
| |
| * detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-261-3/+7
| |
| * removed unnecessary configuration fetch after joinDaniel Gultsch2015-11-261-1/+1
| |
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-39/+37
| |
| * Use OpenPGP-API 9.0fiaxh2015-11-091-2/+2
| |
| * fixed session objects not being build on start upDaniel Gultsch2015-10-301-1/+1
| |
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-301-1/+14
| |\ | | | | | | PGP messages background decryption
| | * Decrypt PGP messages in backgroundfiaxh2015-10-281-1/+14
| | |
| * | moved db calls made from UI into serial background threadDaniel Gultsch2015-10-291-5/+21
| | |
| * | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-0/+17
| |/
| * join muc even if initial conference configuration fetch failedDaniel Gultsch2015-10-221-2/+29
| |
| * move chat state reset from background switch to foreground switch to account ↵Daniel Gultsch2015-10-191-3/+3
| | | | | | | | for chat states sent in the mean time
| * disconnet in background threadDaniel Gultsch2015-10-171-1/+7
| |
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-171-2/+2
| |
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-3/+6
| | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
| * block code when doing unforced disconnectDaniel Gultsch2015-10-161-188/+188
| |
| * clear bitmap cache before running out of memoryDaniel Gultsch2015-10-141-0/+9
| |
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-2/+11
| |
| * add config variable to enable x509 verificationDaniel Gultsch2015-10-121-19/+14
| |
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-111-13/+39
| |
| * Captcha support.Armin Novak2015-10-111-0/+57
| |
| * initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-091-15/+70
| |
| * catch exception when unregistering receivers that have not been registered ↵Daniel Gultsch2015-10-081-3/+11
| | | | | | | | before
| * introduced expert options to set status to away and xa if screen is off or ↵Daniel Gultsch2015-10-081-5/+81
| | | | | | | | if phone is silenced
| * do mam query after joinDaniel Gultsch2015-10-061-1/+3
| |
| * Use MAM for MUC initial history retrievalsaqura2015-10-061-28/+54
| | | | | | | | | | If the MUC supports MAM (XEP-0313), use it to retrieve the history when joining.
| * Properly check for MUC MAM supportsaqura2015-10-061-6/+8
| | | | | | | | | | | | Only use MAM (XEP-0313) in MUCs if it is supported. This should fix #1264
| * don't put conference joins into pending on initial bindDaniel Gultsch2015-10-011-11/+14
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 10:15:20 +0000