aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/persistance (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-1/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-1/+13
| |
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-1/+40
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵Daniel Gultsch2016-02-021-1/+40
| |\ | | | | | | | | | into singpolyma-disco-caps
| | * Persisitence and loading for ServiceDiscoveryResultStephen Paul Weber2016-01-231-1/+40
| | |
* | | Imports organizedsteckbrief2016-02-122-8/+0
| | |
* | | database error while upgrading from db version 14 fixedsteckbrief2016-02-121-1/+1
| | |
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-144/+33
| | |
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-112-149/+852
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | changed FileBackend API to allow files instead of messages to be copied and ↵Daniel Gultsch2016-01-241-33/+34
| |/ | | | | | | resized
| * removed some unused methods from db backendDaniel Gultsch2016-01-161-83/+0
| |
| * catch exception when reading message id from databaseDaniel Gultsch2016-01-151-8/+12
| |
| * use batch transactions when writing rosterDheeraj CVR2016-01-131-0/+3
| | | | | | | | Fixes https://github.com/siacs/Conversations/issues/1648
| * automatically adjust image compression to keep files under 512MiBDaniel Gultsch2016-01-091-8/+14
| |
| * null check in getOriginalPathDaniel Gultsch2016-01-041-1/+0
| |
| * properly rotate avatarsDaniel Gultsch2016-01-041-15/+7
| |
| * show certificate informationDaniel Gultsch2015-12-231-5/+34
| |
| * save certificate when verifying with x509Daniel Gultsch2015-12-231-2/+29
| |
| * get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-111-0/+14
| |
| * ask for contact permissions when first opening StartConversationActivityDaniel Gultsch2015-12-071-2/+6
| |
| * Unset all PGP signatures oncefiaxh2015-12-021-1/+10
| | | | | | | | ... so they will be redone to match the changed status.
| * fixed avatar loading for non-file urisDaniel Gultsch2015-12-021-2/+2
| |
| * users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-021-2/+2
| | | | | | | | library
| * initial tor supportDaniel Gultsch2015-12-011-109/+113
| |
| * changed method signature of calcSampleSizeDaniel Gultsch2015-11-301-1/+1
| |
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-10/+14
| |
| * Move migration 19 before 17Andreas Straub2015-11-061-3/+6
| | | | | | | | | | | | | | | | | | Migration 17 depends on Account deserialization, so any migrations that touch the accounts table need to be applied beforehand. Re-writing the migration to work directly on the database would lead to a lot of code duplication, so it's not worth it at this time, but might become necessary later on to avoid dependency cycles.
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-2/+3
| |
| * push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-1/+5
| |
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-1/+5
| |
| * changed store path for filesDaniel Gultsch2015-10-061-20/+10
| |
| * properly recycle bitmapsDaniel Gultsch2015-10-021-4/+16
| |
| * rotate thumbnails. fixes #1438Daniel Gultsch2015-09-291-6/+15
| |
| * Iterator to go through all messages of a conversationfiaxh2015-09-201-0/+38
| |
| * add null pointer check to db migrationDaniel Gultsch2015-09-051-1/+5
| |
| * Never build a session with oneselfAndreas Straub2015-09-051-11/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we detect our own ID is not in our own devicelist on receiving an update, we reannounce ourselves. This used to have the side effect of modifying the list of devices we thought were in the update set, causing us to accidentally build a session with ourselves. This lead to our own key being set to TRUSTED_INACTIVE, resulting in red lock icons on messages sent by the own device. We fix this by having publishOwnDeviceId() operate on a copy of the original set. This commit also includes a db migration which deletes sessions with oneself and sets own keys back to TRUSTED.
| * made useImageAsIs determination a bit more foolproof (samsung)Daniel Gultsch2015-08-311-1/+6
| |
| * remove unused imports.Michael2015-08-251-2/+0
| |
| * additonal null checks in file backendDaniel Gultsch2015-08-251-0/+3
| |
| * bugfix: next encryption is now being properly detectedDaniel Gultsch2015-08-231-1/+0
| |
| * check if inputstream is null before cropping avatar imagesDaniel Gultsch2015-08-191-0/+6
| |
| * catch broken base64 in avatarsDaniel Gultsch2015-08-161-5/+1
| |
| * provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-151-0/+10
| |
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-111-18/+19
| | | | | | | | fixed #522
| * Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-011-9/+10
| |
| * added missing carbon column message table create statementDaniel Gultsch2015-07-311-0/+1
| | | | | | | | fixes #1310
| * Tag carbon messages in parser, adapt session logicAndreas Straub2015-07-291-1/+5
| | | | | | | | | | | | Messages sent from another device of the own account are now explicitly tagged as carboned message. The session detection logic now uses this tag to find "session borders".
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-291-130/+131
| | | | | | | | | | | | | | Moves SQLiteAxolotlStore and XmppAxolotlSession into proper classes. IdentityKeys trust statuses are now cached in an LruCache to prevent hammering the database when rendering the UI.
| * made image file format configurable by Config.javaDaniel Gultsch2015-07-211-4/+14
| |
| * Use properly fixed numeral values in Trust enumAndreas Straub2015-07-211-5/+5
| | | | | | | | Why, oh God, why?! #thanksjamesgosling
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 12:19:46 +0000