aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-14/+1
|
* Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-29/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml 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-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
| * fixed regression that caused messages in muc not being sendDaniel Gultsch2016-02-171-1/+1
| |
| * optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-141-20/+38
| | | | | | | | acts only when push is available. disable all non-push accounts to test properly
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-9/+5
| |
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-49/+47
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml
| * use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-031-1/+1
| |
| * cache server capsDaniel Gultsch2016-02-031-1/+16
| |
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵Daniel Gultsch2016-02-021-47/+30
| |\ | | | | | | | | | into singpolyma-disco-caps
| | * Factor out a representation of XEP-0030 resultsStephen Paul Weber2016-01-231-47/+30
| | | | | | | | | | | | And the parser from Element to this representation.
* | | Imports organizedsteckbrief2016-02-121-14/+2
| | |
* | | Simplification of DNS requests.steckbrief2016-02-121-63/+48
| | | | | | | | | | | | Originally introduced for FS#92, but now extended with retrieval for XEP-0368 (http://xmpp.org/extensions/xep-0368.html)
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-380/+760
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | be more careful with resetting the stream idDaniel Gultsch2016-01-291-2/+1
| | |
| * | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-2/+11
| |/
| * reset stanza queue when resetting xmppconnectionDaniel Gultsch2016-01-231-0/+1
| |
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-2/+3
| |
| * reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-161-0/+8
| |
| * nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-151-11/+26
| |
| * throw security exception instead of going to next srv entryDaniel Gultsch2016-01-121-1/+3
| |
| * move some ssl socket modifiers into a seperate helper classDaniel Gultsch2016-01-121-56/+5
| |
| * Implement XEP-0368: SRV records for XMPP over TLSmoparisthebest2016-01-111-54/+149
| |
| * reworked that loop that iterates over various serversDaniel Gultsch2016-01-111-16/+10
| |
| * throw exception at the end of the streamDaniel Gultsch2015-12-171-128/+122
| |
| * timeout service discovery after 20sDaniel Gultsch2015-12-151-7/+42
| |
| * wait with status change to online after all disco queries have been madeDaniel Gultsch2015-12-091-5/+14
| |
| * add error state for unavailable tor networkDaniel Gultsch2015-12-011-6/+2
| |
| * refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-011-23/+6
| |
| * do socks5 connect manuallyDaniel Gultsch2015-12-011-14/+34
| |
| * initial tor supportDaniel Gultsch2015-12-011-5/+13
| |
| * detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-261-2/+34
| |
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-1/+1
| |
| * don't close socket on disconnectDaniel Gultsch2015-11-011-1/+0
| |
| * avoid npe when checking for stream restartDaniel Gultsch2015-10-291-2/+4
| |
| * synchronize around the disco objectDaniel Gultsch2015-10-191-44/+53
| |
| * only try EXTERNAL auth if client certificate is set for accountDaniel Gultsch2015-10-171-1/+1
| |
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-4/+6
| | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
| * block code when doing unforced disconnectDaniel Gultsch2015-10-161-35/+32
| |
| * use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier. ↵Daniel Gultsch2015-10-151-2/+3
| | | | | | | | fixes #1189
| * cleaned up some code. log last tagDaniel Gultsch2015-10-131-8/+14
| |
| * code clean upDaniel Gultsch2015-10-121-16/+4
| |
| * enable SASL EXTERNAL (certificate loginDaniel Gultsch2015-10-111-3/+61
| |
| * Captcha support.Armin Novak2015-10-111-23/+89
| |
| * request stanza count after every ibb data stanza to not fill our own stanza ↵Daniel Gultsch2015-09-301-6/+8
| | | | | | | | queue
| * only invoke MTM in interactive mode after direct user inputDaniel Gultsch2015-09-291-3/+15
| | | | | | | | | | | | fixes #1027 fixes #792 fixes #1439
| * let DnsHelper provide a fallback solutionDaniel Gultsch2015-09-191-42/+33
| |
| * remove the from attribute from sendStartStream() fixes #1419Michael2015-09-191-1/+0
| |
| * ignore spoofed stanzas in facebook chatDaniel Gultsch2015-09-171-1/+1
| |
| * added special error state for dns timeoutDaniel Gultsch2015-09-011-1/+7
| |
| * use build in method on >= lolipop devices to discover dns serversDaniel Gultsch2015-08-281-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 02:37:26 +0000