aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-202-20/+6
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-092-1/+9
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-1/+1
|\| | | | | | | | | | | | | | | | | 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
* | @Overrides addedlookshe2016-04-171-0/+6
| |
* | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-173-10/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | better detect broken pepDaniel Gultsch2016-04-051-2/+9
| | | | | | | | | | | | | | | mark pep as broken when publishing bundle or device list failed reset 'brokenness' when account is getting disabled
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-4/+1
|\| |
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-2/+1
| | |
| * | only add image files to media scannerDaniel Gultsch2016-03-231-3/+1
| | |
| * | let users confirm each member in a conference even if that contact is ↵Daniel Gultsch2016-03-011-1/+1
| | | | | | | | | | | | already trusted
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-55/+99
| | |
* | | Fixed merge issue with AxolotlService (differentiation between impl and ↵steckbrief2016-03-083-133/+171
| | | | | | | | | | | | interface)
* | | Fixes FS#151 - Missing button on image-linkslookshe2016-03-071-1/+0
| | |
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-025-951/+1275
| | |
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-7/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | check for uuid change when decrypting pgp messagesDaniel Gultsch2016-02-211-7/+6
| | |
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-0/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | re-read common name from certificates on startupDaniel Gultsch2016-02-021-0/+25
| | |
* | | Imports organizedsteckbrief2016-02-124-13/+6
| | |
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-9/+6
| | |
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-1114-52/+2315
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | show fetch errors in trust keys activityDaniel Gultsch2016-01-231-0/+13
| | |
| * | Fix OMEMO session creating logginAndreas Straub2015-12-311-1/+1
| | | | | | | | | | | | | | | Now prints the correct JID to the log when finding devices without sessions.
| * | show certificate informationDaniel Gultsch2015-12-232-0/+8
| | |
| * | save certificate when verifying with x509Daniel Gultsch2015-12-232-2/+10
| | |
| * | store identity key in XmppAxolotlSession instead of the fingerprintDaniel Gultsch2015-12-192-23/+27
| | |
| * | add more debugging to certificate checks after new omemo session was establishedDaniel Gultsch2015-12-191-0/+4
| | |
| * | some more NPE checksDaniel Gultsch2015-12-101-1/+1
| | |
| * | also verify sessions in CBE mode that got created by key transport messagesDaniel Gultsch2015-12-081-2/+14
| | |
| * | encrypt pgp messages to selfDaniel Gultsch2015-11-261-8/+8
| | |
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-2/+10
| | |
| * | Merge pull request #1558 from fiaxh/pgp_api_9.0Daniel Gultsch2015-11-241-13/+29
| |\ \ | | | | | | | | Use OpenPGP-API 9.0
| | * | Use OpenPGP-API 9.0fiaxh2015-11-091-13/+29
| | | |
| * | | PgpEngine: Get account from conversation instead of from contact. fixes ↵fiaxh2015-11-151-3/+3
| |/ / | | | | | | | | | #1568, fixes #1544
| * | indicate cbe in chat message hintDaniel Gultsch2015-10-311-0/+16
| | |
| * | explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-312-5/+29
| | |
| * | fixed session objects not being build on start upDaniel Gultsch2015-10-301-1/+0
| | |
| * | Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-302-0/+181
| |\ \ | | | | | | | | PGP messages background decryption
| | * | Decrypt PGP messages in backgroundfiaxh2015-10-282-0/+181
| | | |
| * | | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-0/+1
| |/ /
| * | don't retry building broken omemo keysDaniel Gultsch2015-10-171-4/+15
| | |
| * | load axolotl session cache on first device updateDaniel Gultsch2015-10-171-2/+6
| | |
| * | improved error reporting in trust keys activityDaniel Gultsch2015-10-171-7/+19
| | |
| * | introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-19/+67
| | | | | | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
| * | moved other name parsing into seperate methodDaniel Gultsch2015-10-151-40/+45
| | |
| * | use constants for oids in xmppdomainverifierDaniel Gultsch2015-10-151-2/+5
| | |
| * | more checks for xmppdomainverifier and better wildcard handlingDaniel Gultsch2015-10-151-4/+10
| | |
| * | use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier. ↵Daniel Gultsch2015-10-151-0/+113
| | | | | | | | | | | | fixes #1189
| * | add config variable to enable x509 verificationDaniel Gultsch2015-10-121-3/+3
| | |
| * | code clean upDaniel Gultsch2015-10-123-16/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 11:36:52 +0000