aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Reviewed commit for FS#34 after mergesteckbrief2016-02-242-2/+2
|
* Removed useless 'button-message' to load more messages. Implementation ↵steckbrief2016-02-232-20/+0
| | | | already done with a more convenient method
* Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-224-21/+100
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * some mucs may grant voice to visitors in unmoderated roomsDaniel Gultsch2016-02-211-1/+3
| |
| * never parse show in presences as offlineDaniel Gultsch2016-02-191-11/+15
| |
| * only offer message correction for the very last messageDaniel Gultsch2016-02-172-4/+26
| |
| * added some OTR loggingDaniel Gultsch2016-02-161-4/+7
| |
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-152-5/+53
| |
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-167-50/+410
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * prepend instead off append mam messages to conversations when going in reverseDaniel Gultsch2016-02-041-1/+8
| |
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-042-0/+20
| |
| * add more fault tolerant checks for messages left on serverDaniel Gultsch2016-02-041-0/+9
| |
| * cache server capsDaniel Gultsch2016-02-031-1/+18
| |
| * refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-033-16/+49
| |
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵Daniel Gultsch2016-02-024-47/+316
| |\ | | | | | | | | | into singpolyma-disco-caps
| | * Fetch cached caps result on new presenceStephen Paul Weber2016-01-241-1/+4
| | |
| | * Use a Presence class for presence informationStephen Paul Weber2016-01-243-47/+71
| | | | | | | | | | | | Only has status for now, but doing it so I can add disco to it
| | * Persisitence and loading for ServiceDiscoveryResultStephen Paul Weber2016-01-231-10/+58
| | |
| | * Implement toJSON on ServiceDiscoveryResultStephen Paul Weber2016-01-231-0/+34
| | |
| | * Generate capHash from any discovery resultStephen Paul Weber2016-01-231-4/+80
| | |
| | * Factor out a representation of XEP-0030 resultsStephen Paul Weber2016-01-231-0/+84
| | | | | | | | | | | | And the parser from Element to this representation.
| * | re-read common name from certificates on startupDaniel Gultsch2016-02-021-2/+7
| | |
* | | Imports organizedsteckbrief2016-02-124-7/+2
| | |
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 17:19:51 +0000