aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-4/+33
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+2
| |
| * automatically adjust image compression to keep files under 512MiBDaniel Gultsch2016-01-091-0/+1
| |
| * added Config.java variable to change the default notification behaviour to ↵Daniel Gultsch2016-01-081-0/+2
| | | | | | | | always
| * timeout service discovery after 20sDaniel Gultsch2015-12-151-0/+1
| |
| * default force encryption to falseDaniel Gultsch2015-12-141-1/+1
| |
| * splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+3
| |
| * disable sm loggingDaniel Gultsch2015-12-101-5/+1
| |
| * enabled previously disabled http uploadDaniel Gultsch2015-12-031-1/+1
| |
| * introduced build-time paranoia mode that disables unencrypted chats and ↵Daniel Gultsch2015-12-011-1/+1
| | | | | | | | forces TOR
| * introduce config.java variable to optionally show number of connected ↵Daniel Gultsch2015-12-011-0/+2
| | | | | | | | accounts in notification
| * refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-011-1/+1
| |
| * initial tor supportDaniel Gultsch2015-12-011-0/+4
| |
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-1/+2
| |
| * work with muc services that change the message idDaniel Gultsch2015-10-141-0/+2
| |
| * add config variable to enable x509 verificationDaniel Gultsch2015-10-121-0/+2
| |
| * introduced Config variable to use legacy namespace for http uploadDaniel Gultsch2015-09-171-0/+2
| |
| * increased dns timeoutDaniel Gultsch2015-09-101-1/+1
| |
| * increased carbon grace period to 90sDaniel Gultsch2015-08-241-1/+1
| |
| * report wrong file size in otr encrypted jingle file transfers to be ↵Daniel Gultsch2015-08-101-0/+2
| | | | | | | | compatible with conversations > 1.6
| * added config.java variable to hide openpgp as an encryption methodDaniel Gultsch2015-08-051-0/+1
| |
| * added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-031-0/+4
| |
| * lets try jpeg for a whileDaniel Gultsch2015-08-011-1/+1
| |
| * Hide regenerate keys buttonAndreas Straub2015-07-221-0/+2
| | | | | | | | Can re-enable it via Config.java setting
| * made image file format configurable by Config.javaDaniel Gultsch2015-07-211-0/+4
| |
| * rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-1/+0
| |
| * disable automatic aes encryption for the time beingDaniel Gultsch2015-06-301-1/+1
| |
| * added trigger to Config.java to always enable aes encryption for uploaded filesDaniel Gultsch2015-06-291-0/+2
| |
| * use same socket time out for jingle and xmpp connectionsDaniel Gultsch2015-05-181-1/+1
| |
| * use a 20s timeout on socks5 connectionsDaniel Gultsch2015-05-181-0/+1
| |
| * config option to reset attempt counts when changing network (default=true)Daniel Gultsch2015-05-081-0/+1
| |
| * enabled sm logging by default at least for development branchDaniel Gultsch2015-05-051-1/+1
| |
| * added config option to be a bit more verbose about stanza countsDaniel Gultsch2015-04-291-0/+1
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-1/+1
|\ \
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-81/+0
| | | | | | | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-0/+5
|/ /
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-3/+19
|\| | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
| * disable all really weak cipher suitesBoris Wachtmeister2015-03-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With #959 all ciphers of the platform were enabled, but this also includes several suites that are considered as very weak, even down to NULL- and anon-ciphers which disable completely disable encryption and/or authentication. Especially the anon-ciphers could be easily used for a mitm-attack. To remove all weak ciphers a blacklist with patterns of cipher-names was added to Config.java. The blacklist is based on the "mandatory discards" that Mozilla suggests to not use for TLS-servers because they are weak or known to be broken. https://wiki.mozilla.org/Security/Server_Side_TLS#Mandatory_discards
| * added config option to disable string prep in jidsiNPUTmice2015-03-051-0/+1
| |
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+5
| |
| * limit ui refresh rateiNPUTmice2015-02-171-1/+2
| |
| * Use platform ciphers as well, just prefer oursSam Whited2015-02-021-2/+2
| |
* | Merge master-originsteckbrief2015-02-201-0/+28
|\| | | | | | | | | | | | | | | | | | | Conflicts: 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/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
| * added more ciphers for old openssl versionsiNPUTmice2015-02-021-1/+3
| |
| * Harden the TLS connection cipher suitesSam Whited2015-01-141-0/+26
| |
* | - Avoiding accessing shared preferences to know if emoticons should be ↵steckbrief2015-01-201-1/+0
| | | | | | | | | | | | parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")
* | Merge branch 'master' of ssh://git.fucktheforce.de/conversationslookshe2015-01-031-0/+8
|\| | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
| * clean up conversation history after swtiching to a different conversationiNPUTmice2014-12-171-0/+1
| |
| * Handle time comparisons using longsSam Whited2014-12-161-1/+1
| |
| * go through mam history page by page. load mam dynamically on scrolliNPUTmice2014-12-151-2/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 20:29:52 +0000