aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* compile errorlookshe2016-03-071-1/+0
|
* nearly same as 1.10.1lookshe2016-03-071-6/+8
|
* test for swipe out bug FS#150lookshe2016-03-071-2/+3
|
* Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-1/+2
|
* Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-4/+6
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.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/res/menu/message_context.xml src/main/res/xml/preferences.xml
| * made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-4/+6
| |
* | Unused imports / methods removedsteckbrief2016-02-241-19/+0
| |
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-5/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * removed unnecessary conditions when sending read markerDaniel Gultsch2016-02-151-5/+1
| |
| * only show load more messages button when mam is availableDaniel Gultsch2016-02-141-0/+1
| | | | | | | | also update ui after that button has been pressed. fixes #1695
* | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+6
| |
| * fixed 'unencrypted' not showing up for conferences when encryption is forcedDaniel Gultsch2016-02-021-1/+1
| |
* | Imports organizedsteckbrief2016-02-121-4/+3
| |
* | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-5/+0
| |
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-32/+44
| |
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-225/+540
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-2/+2
| |
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+1
| |
| * Merge pull request #1655 from adithyaphilip/pgp-fixDaniel Gultsch2016-01-161-1/+4
| |\ | | | | | | Fixes having to choose PGP twice, upgrades openpgp-api to 10
| | * fixed PGP having to be selected twiceAdithya Abraham Philip2016-01-161-1/+4
| | |
| * | make ConversationsActivity more resistent against being restartedDaniel Gultsch2016-01-161-3/+9
| |/
| * hide prepare image toasts when attaching multiple imagesDaniel Gultsch2016-01-151-11/+12
| |
| * fixed typo when reading battery_op settingDaniel Gultsch2016-01-141-1/+1
| |
| * check for file storage permission before selecting avatarDaniel Gultsch2016-01-131-15/+1
| |
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-43/+80
| |
| * show trust keys activties if own keys are undecidedDaniel Gultsch2016-01-041-4/+5
| |
| * only offer plain and omemo encryption when x509 verification is enabledDaniel Gultsch2015-12-191-2/+3
| |
| * splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+1
| |
| * request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-1/+55
| |
| * hide prepare file toast after preparing the fileDaniel Gultsch2015-12-061-0/+1
| |
| * be more carefull with pending urisDaniel Gultsch2015-12-051-8/+16
| |
| * introduced build-time paranoia mode that disables unencrypted chats and ↵Daniel Gultsch2015-12-011-0/+1
| | | | | | | | forces TOR
| * fixed crashes when activity got destroyed when selecting pgp keyDaniel Gultsch2015-12-011-5/+22
| |
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-5/+16
| |
| * Use OpenPGP-API 9.0fiaxh2015-11-091-1/+11
| |
| * Decrypt PGP messages in backgroundfiaxh2015-10-281-2/+4
| |
| * open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-201-24/+19
| |
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-2/+1
| |
| * catch IndexOutOfBoundsException when swiping away conversationsDaniel Gultsch2015-09-171-1/+5
| |
| * added possibiltiy to set conferences as moderated (only visible in advanced ↵Daniel Gultsch2015-09-131-1/+1
| | | | | | | | mode)
| * added alt as possible modifier key. use mod+(0..9) to jump to a conversationDaniel Gultsch2015-09-091-26/+45
| |
| * added rotation detection to up/down navigationDaniel Gultsch2015-09-071-4/+23
| |
| * added some key bindingDaniel Gultsch2015-09-071-4/+82
| | | | | | | | | | * ctrl + tab will open the conversations overview (when available) * ctrl + up / down will navigate between conversations
| * show an send button instead of the enter key in softkeyboards when ↵show_send_button_in_softkeyboardDaniel Gultsch2015-09-041-0/+1
| | | | | | | | enterIsSend and showEnterKey are both set
| * added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-241-2/+9
| |
| * hide multi-end and otr encryption in conferencesDaniel Gultsch2015-08-061-2/+3
| |
| * added config.java variable to hide openpgp as an encryption methodDaniel Gultsch2015-08-051-0/+1
| |
| * Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-011-2/+2
| |
| * Refactor axolotl message processing workflowAndreas Straub2015-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | XmppAxolotlMessage is now entirely responsible for handling encryption and decryption of messages, only leveraging XmppAxolotlSession as a packing/unpacking primitive for payload keys. Removed pseudo-dead session generation code step from prepareMessage function, as sessions have been created by invoking the TrustKeysActivity for a while now. Added prepareKeyTransportMessage function, which creates a message with no payload. The key that is packed into the header keyElements can then be used for other purposes (e.g. encrypted file transfer).
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 00:22:23 +0000