aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-2655-562/+1760
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java src/main/java/eu/siacs/conversations/entities/Bookmark.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/parser/IqParser.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/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.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/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/res/layout/activity_contact_details.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml 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-eu/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-pt/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
| * disable stanza loggingDaniel Gultsch2016-05-211-1/+1
| |
| * update ui after affiliation changesDaniel Gultsch2016-05-212-0/+6
| |
| * refactore exceptionhandler to have one line file writerDaniel Gultsch2016-05-213-13/+16
| |
| * resetting fetch status error when mutual subscription is reestablishedshow_members_in_conferenceDaniel Gultsch2016-05-194-2/+37
| |
| * sync around individual calls instead of synchronizing entire objectDaniel Gultsch2016-05-191-49/+79
| |
| * show password dialog when account was magic createdDaniel Gultsch2016-05-191-0/+22
| |
| * access disco over caching mechanism instead of querying dbDaniel Gultsch2016-05-191-1/+1
| |
| * remove unwanted 'use previous encryption' lookupDaniel Gultsch2016-05-191-22/+1
| |
| * also save form elements in disco storageDaniel Gultsch2016-05-194-6/+64
| |
| * don't NPE on rare race condition while fetching MAMDaniel Gultsch2016-05-191-0/+9
| |
| * synchronize around identity key generationDaniel Gultsch2016-05-191-7/+9
| |
| * improved ordering of muc participantsDaniel Gultsch2016-05-173-9/+25
| |
| * refactored muc item parsing to also parse muc status messagesDaniel Gultsch2016-05-175-27/+44
| |
| * offer offline members to be invited againDaniel Gultsch2016-05-172-3/+17
| |
| * change affiliation for in memory users that are currently not joined in a ↵Daniel Gultsch2016-05-164-7/+18
| | | | | | | | conference
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-169-97/+184
| |
| * cap exponential backoff at 300s (10 attempts)Daniel Gultsch2016-05-161-1/+1
| |
| * use the same typo in both saving disco and reading discoDaniel Gultsch2016-05-151-1/+2
| |
| * escape HTML in OTR messages if other client is PidginDaniel Gultsch2016-05-152-4/+41
| |
| * include name in locations received in MUCsDaniel Gultsch2016-05-152-8/+12
| |
| * log incoming iq requestsDaniel Gultsch2016-05-152-0/+6
| |
| * send caps hash in muc joinDaniel Gultsch2016-05-151-6/+1
| | | | | | | | this prevents desktop clients from iq'ing use when they join
| * don't show duplicate status message in contact detailsDaniel Gultsch2016-05-131-3/+3
| |
| * only default to omemo when all our devices support itDaniel Gultsch2016-05-131-0/+1
| |
| * do not process self presenceDaniel Gultsch2016-05-131-2/+2
| | | | | | | | we don't want our own resource show up in the self contact
| * show presence of other resources as templateDaniel Gultsch2016-05-136-6/+49
| |
| * reset attempt count when reconnecting because of timeoutDaniel Gultsch2016-05-121-0/+3
| |
| * interrupt XMPPConnection ThreadDaniel Gultsch2016-05-122-1/+15
| | | | | | | | | | in some cases the the DNS query might take too long (even though we specified a timeout) if that happens we need a secondary solution (besides killing the socket) to stop the thread
| * prefer IPv4 DNS serversDaniel Gultsch2016-05-121-3/+16
| | | | | | | | some devices might have problems contacting the IPv6 DNS server while in sleep mode
| * improve keyboard handling. fixes #1387Daniel Gultsch2016-05-122-6/+50
| | | | | | | | | | | | * start a new Conversations by pressing mod+space * automatically start searching when pressing keys in StartConversationsActivity * when hitting enter when number of search results == 1 open that conversation
| * use 'phone' or 'tablet' as default resourceDaniel Gultsch2016-05-121-1/+1
| |
| * make omemo default when all resources support itDaniel Gultsch2016-05-125-15/+38
| |
| * check if pgpengine is still bound before using itDaniel Gultsch2016-05-123-2/+5
| |
| * scroll to bottom after sending multi-line messageDaniel Gultsch2016-05-121-2/+8
| |
| * stop processing PreKeyWhisperMessage if there is no PreKeyIdDaniel Gultsch2016-05-101-3/+5
| | | | | | | | fixes #1832
| * don’t let attempt count fall below zeroDaniel Gultsch2016-05-101-1/+1
| |
| * add lock domain and magic create domain to known hostsDaniel Gultsch2016-05-101-0/+6
| |
| * always show download button when link is encryptedDaniel Gultsch2016-05-101-5/+1
| | | | | | | | dont check for known mime type
| * report host-account as account state in UIDaniel Gultsch2016-05-102-4/+13
| |
| * do not show last-seen metric in UIDaniel Gultsch2016-05-105-24/+6
| |
| * fix logging wrong variable for failed resumeDaniel Gultsch2016-05-081-1/+1
| |
| * check for h attribute in 'failed' nonzaDaniel Gultsch2016-05-081-3/+9
| |
| * catch all exceptions thrown by xml pull parserDaniel Gultsch2016-05-071-11/+2
| |
| * handle invalid base64 is SASl SCRAM responseDaniel Gultsch2016-05-071-5/+9
| |
| * Merge pull request #1829 from sebastianv89/patch-1Daniel Gultsch2016-05-051-1/+0
| |\ | | | | | | Remove copy of innerkey
| | * Remove copy of innerkeySebastian2016-05-051-1/+0
| | | | | | | | | The line overwrites this.innerkey with the value that was already there.
| * | report bind failure as account stateDaniel Gultsch2016-05-052-9/+13
| | |
| * | log more information about HTTP’s max upload sizeDaniel Gultsch2016-05-052-1/+8
| |/
| * republish pgp signature when changing statusDaniel Gultsch2016-05-059-25/+95
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 03:54:24 +0000