aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-2/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/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-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-061-1/+1
| |
| * rename purge keys positive button to 'purge keys'Daniel Gultsch2016-02-281-1/+1
| |
| * changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-0/+14
| |
* | Imports organizedsteckbrief2016-02-121-3/+0
| |
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-1/+1
| |
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-51/+305
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-5/+4
| |
| * added convenience method to extract account from intentDaniel Gultsch2016-01-221-1/+13
| |
| * check for file storage permission before selecting avatarDaniel Gultsch2016-01-131-0/+14
| |
| * Revert "Add additional warnings to OMEMO purge key function"Daniel Gultsch2016-01-121-26/+2
| | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03.
| * Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-121-2/+26
| | | | | | | | | | | | People continue to press the "don't press this" button. Maybe adding some warnings indicating that this button will not fix their problems will help...
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-0/+11
| |
| * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-0/+2
| | | | | | | | | | fixes #1611 fixes #1602
| * strip leading 0x05 off omemo fingerprintsDaniel Gultsch2015-12-271-4/+7
| |
| * show certificate informationDaniel Gultsch2015-12-231-3/+7
| |
| * Sign empty statusfiaxh2015-11-091-2/+1
| |
| * Use OpenPGP-API 9.0fiaxh2015-11-091-23/+50
| |
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-6/+11
| |
| * Reset the margins manually after rotatingsaqura2015-10-261-1/+1
| |
| * Merge pull request #1461 from akallabeth/captcha_supportDaniel Gultsch2015-10-111-0/+6
| |\ | | | | | | Implemented account registration with captcha
| | * Captcha support.Armin Novak2015-10-111-0/+6
| | |
| * | prevent null pointer when trying to display device fingerprints of not ↵Daniel Gultsch2015-10-111-0/+3
| |/ | | | | | | existing sessions
| * initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-091-0/+5
| |
| * Only show that have sessions in fingerprint listAndreas Straub2015-09-061-11/+8
| | | | | | | | | | | | | | | | | | Doesn't access database directly anymore but goes through AxolotlService now to obtain list of fingerprints associated with an Account/Contact. This should prevent orphaned keys littering the UI which previously couldn't be removed through the Clear Devices function. Together with 1c79982da84964c1d81179a0927d9cd1eadf53de this fixes #1393
| * use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-261-1/+1
| |
| * renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-081-3/+3
| |
| * Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-011-12/+18
| |
| * fixed some colors in message adapterDaniel Gultsch2015-07-301-1/+1
| |
| * Highlight selected message's fingerprint in listAndreas Straub2015-07-291-8/+20
| |
| * Improve trust toggle responsivenessAndreas Straub2015-07-291-6/+1
| | | | | | | | Removed unnecessary UI refreshes, explicitly update UI where needed.
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-291-9/+9
| | | | | | | | | | | | | | 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.
| * Disable trust toggle completely for INACTIVE keysAndreas Straub2015-07-221-0/+1
| |
| * Add INACTIVE state for removed keysAndreas Straub2015-07-211-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | We introduce a new trust state: INACTIVE. This state is intended for old keys that have been removed. When a TRUSTED device is removed from the PEP devicelist, it's status will be set to INACTIVE. INACTIVE keys are shown in the UI as greyed out, non-interactible key rows. Messages are not encrypted for INACTIVE devices. When an INACTIVE device reappears in PEP, or a message is received from an INACTIVE device, it is set back to trusted.
| * allow for private messages being started from muc details in anonymous mucsDaniel Gultsch2015-07-211-4/+9
| |
| * Add purge axolotl key optionAndreas Straub2015-07-201-4/+33
| | | | | | | | Can now long-press a key to permanently purge it.
| * rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-4/+2
| |
| * Optimize importsAndreas Straub2015-07-201-1/+0
| |
| * Ask for key trust when sending messagesAndreas Straub2015-07-191-1/+8
| | | | | | | | | | | | If the contact (or the own account) has keys that have UNDECIDED trust, we now drop the user into the new TrustKeysActivity, where they have to decide for each new key whether it should be TRUSTED or UNTRUSTED.
| * Refactor trust key ui and show in account detailsAndreas Straub2015-07-191-0/+79
| | | | | | | | | | | | | | | | | | Refactored the trust key row UI element so it can be used in multiple places. It now also uses a slider to toggle the trust state, and the redundant trust state description was removed. EditAccountActivity now shows the keys of other devices associated with that account.
| * Disable Axolotl option if not usableAndreas Straub2015-07-191-23/+0
| | | | | | | | | | In MUCs or if contact is not axolotl capable, disable axolotl menu option
| * Added axolotl activation code to UIAndreas Straub2015-07-191-0/+23
| |
| * renamed colorsDaniel Gultsch2015-07-131-12/+8
| |
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-101-6/+9
| | | | | | | | fixes #954
| * removed debug loggingDaniel Gultsch2015-05-121-2/+0
| |
| * handle conference invites differently to deal with killed activities. fixes ↵Daniel Gultsch2015-05-121-31/+56
| | | | | | | | #1188
| * fixed regression where the selected conversation wasn't highlighted anymore ↵iNPUTmice2015-04-131-1/+7
| | | | | | | | on tabled layout
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-5/+0
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-1/+1
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-8/+6
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 10:31:30 +0000