aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Compilation errors and merge mixups fixedsteckbrief2016-02-112-2/+3
|
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-119-460/+636
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * refactored user handling in conferences. show try again button when ↵Daniel Gultsch2016-02-011-84/+57
| | | | | | | | conference has errors
| * try to make in-valid-session detection work for pgpDaniel Gultsch2016-01-291-3/+10
| |
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+1
| |
| * made constructor private in Account entityDaniel Gultsch2016-01-161-5/+1
| |
| * added Config.java variable to change the default notification behaviour to ↵Daniel Gultsch2016-01-081-1/+1
| | | | | | | | always
| * show per conference notification settings in details activityDaniel Gultsch2016-01-081-1/+15
| |
| * Merge pull request #1641 from fiaxh/uuid-fixDaniel Gultsch2016-01-081-1/+1
| |\ | | | | | | Correct uuid check according to RFC 4122
| | * Correct uuid check according to RFC 4122fiaxh2016-01-051-1/+1
| | |
| * | avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
| |/
| * only report error after third unsuccesful attempt to connectDaniel Gultsch2016-01-041-1/+1
| |
| * fixed stuck at omemo encryption when x509 verification is being usedDaniel Gultsch2015-12-271-7/+7
| |
| * use presence name not server name when verification is being usedDaniel Gultsch2015-12-191-3/+3
| |
| * only offer plain and omemo encryption when x509 verification is enabledDaniel Gultsch2015-12-191-1/+10
| |
| * prefer server name over address book name when x509 verification is being usedDaniel Gultsch2015-12-191-1/+4
| |
| * splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+1
| |
| * set bookmark name to room subject if no subject has been set beforeDaniel Gultsch2015-12-111-0/+10
| |
| * get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-111-24/+6
| |
| * when no avatar found show avatar of contact and not the muc user in conferencesDaniel Gultsch2015-12-091-3/+3
| |
| * properly clear muc user avatar cachesDaniel Gultsch2015-12-041-2/+7
| |
| * Merge pull request #1595 from fiaxh/pgp_database_signatureDaniel Gultsch2015-12-041-4/+13
| |\ | | | | | | Regenerate PGP signatures once
| | * Unset all PGP signatures oncefiaxh2015-12-021-4/+13
| | | | | | | | | | | | ... so they will be redone to match the changed status.
| * | rely on message id if message id is uuid and pgp encryption was used to ↵Daniel Gultsch2015-12-041-1/+3
| | | | | | | | | | | | deduplicate messages. fixes #1357
| * | use proposed nick as default nick in mucoptionsDaniel Gultsch2015-12-041-1/+1
| | |
| * | parse vcard avatars from muc presencesDaniel Gultsch2015-12-031-155/+122
| | |
| * | Show status message when contact requests presenceSam Whited2015-12-021-1/+1
| |/ | | | | | | Remove presence when conversation closed
| * introduced build-time paranoia mode that disables unencrypted chats and ↵Daniel Gultsch2015-12-011-2/+9
| | | | | | | | forces TOR
| * add error state for unavailable tor networkDaniel Gultsch2015-12-011-3/+3
| |
| * do socks5 connect manuallyDaniel Gultsch2015-12-011-16/+4
| |
| * initial tor supportDaniel Gultsch2015-12-011-4/+46
| |
| * hide subject edit button if not editable by userDaniel Gultsch2015-11-261-4/+18
| |
| * detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-261-0/+8
| |
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-252-24/+5
| |
| * Use OpenPGP-API 9.0fiaxh2015-11-091-2/+36
| |
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-2/+2
| |
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-302-0/+8
| |\ | | | | | | PGP messages background decryption
| | * Decrypt PGP messages in backgroundfiaxh2015-10-282-0/+8
| | |
| * | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-3/+16
| |/
| * Don't synchronize on non-final fieldSam Whited2015-10-261-1/+1
| |
| * fixed read conversations showing up as notifications after a restartDaniel Gultsch2015-10-211-5/+4
| |
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-0/+3
| | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-142-14/+30
| |
| * initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-091-6/+10
| |
| * Show whether MAM is supported in MUCssaqura2015-10-061-0/+5
| | | | | | | | | | The conference details in "Advanced Mode" now indicate whether MAM is supported by the conference server.
| * fixed NPE when executing rename callback in mucDaniel Gultsch2015-09-281-1/+3
| |
| * added missing type='submit' to mam queriesDaniel Gultsch2015-09-152-9/+5
| | | | | | | | | | fixed some nasty inheritance problems along the way fixes #1411
| * added possibiltiy to set conferences as moderated (only visible in advanced ↵Daniel Gultsch2015-09-131-6/+20
| | | | | | | | mode)
| * added mp4 to well known extensions. fixes #1403Daniel Gultsch2015-09-121-1/+1
| |
| * Issues with URLs with multiple dots in file. fixes #1373Daniel Gultsch2015-09-041-7/+15
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 21:36:44 +0000