Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | stop conference details from crashing when rotating the screen | Daniel Gultsch | 2015-04-28 | 1 | -0/+3 | |
| | ||||||
* | fixed npe when rotating screen in contact details activity | Daniel Gultsch | 2015-04-28 | 1 | -4/+8 | |
| | ||||||
* | print stack trace on io error | Daniel Gultsch | 2015-04-28 | 1 | -6/+6 | |
| | ||||||
* | escape nick in highlight regex pattern | Daniel Gultsch | 2015-04-28 | 1 | -1/+1 | |
| | ||||||
* | revert undo timeout to a more reasonable value | Daniel Gultsch | 2015-04-28 | 1 | -1/+1 | |
| | ||||||
* | handle returning from camera without picture | Daniel Gultsch | 2015-04-27 | 1 | -0/+3 | |
| | ||||||
* | use xmppserviceconnection to send iq packets in jingle connection | Daniel Gultsch | 2015-04-26 | 1 | -4/+4 | |
| | ||||||
* | hard code bitmap configs | Daniel Gultsch | 2015-04-26 | 1 | -2/+2 | |
| | ||||||
* | Merge pull request #1135 from BrianBlade/manage_certificates | Daniel Gultsch | 2015-04-25 | 1 | -0/+91 | |
|\ | | | | | Add option to remove manually approved certificates | |||||
| * | Add option to remove manually approved certificates | BrianBlade | 2015-04-19 | 1 | -0/+91 | |
| | | | | | | | | | | | | | | - "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options" | |||||
* | | fixed service discovery by properly storing and checking identities | Daniel Gultsch | 2015-04-25 | 3 | -30/+50 | |
| | | ||||||
* | | fixed #1039 | Daniel Gultsch | 2015-04-25 | 1 | -0/+3 | |
| | | ||||||
* | | Merge pull request #1146 from BrianBlade/minor_otr_tweaks | Daniel Gultsch | 2015-04-25 | 3 | -6/+17 | |
|\ \ | | | | | | | OTR: Fix onContactStatusChanged & dont archive OTR | |||||
| * | | OTR: Fix onContactStatusChanged & dont archive OTR | BrianBlade | 2015-04-21 | 3 | -6/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix session handling on contact status change: Do not reset potentially active sessions; check peer's OTR-resource on disconnect - use no-permanent-store hint instead of no-store to ensure finished messages are delivered to offline/disconnected clients - add no-permanent-store to ask compliant servers not to archive OTR messages | |||||
* | | | cleaned up file handling | Daniel Gultsch | 2015-04-25 | 3 | -71/+87 | |
| | | | ||||||
* | | | send invite to other instanzes after creating ad hoc conference. fixes #1136 | Daniel Gultsch | 2015-04-23 | 1 | -0/+8 | |
| | | | ||||||
* | | | fixed direct invites | Daniel Gultsch | 2015-04-21 | 1 | -12/+28 | |
|/ / | ||||||
* | | always hide pgp snackbar after decrypting a message. fixes #1075 | Daniel Gultsch | 2015-04-20 | 1 | -0/+1 | |
| | | ||||||
* | | removed some dead code | Daniel Gultsch | 2015-04-20 | 1 | -19/+0 | |
| | | ||||||
* | | fixed weird touch on snackbar switched conversation bug | Daniel Gultsch | 2015-04-20 | 1 | -3/+2 | |
| | | | | | | | | when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons. | |||||
* | | some code clean up to fix some rare NPE’s | Daniel Gultsch | 2015-04-19 | 2 | -4/+7 | |
|/ | ||||||
* | increased undo delay | iNPUTmice | 2015-04-17 | 1 | -1/+1 | |
| | ||||||
* | fixed a bug in DNS helper code. fixes #1130 | iNPUTmice | 2015-04-16 | 2 | -2/+2 | |
| | ||||||
* | some bug fixes concerning 0byte files. fixes #1126 | iNPUTmice | 2015-04-15 | 2 | -1/+2 | |
| | ||||||
* | maintain state when rotating settings activity | iNPUTmice | 2015-04-14 | 1 | -14/+16 | |
| | ||||||
* | Merge branch 'dont_trust_cas_preference' of ↵ | iNPUTmice | 2015-04-14 | 2 | -4/+18 | |
|\ | | | | | | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml | |||||
| * | Add option to use MTM without default TrustManager | BrianBlade | 2015-04-11 | 2 | -4/+18 | |
| | | | | | | | | | | | | Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked. | |||||
* | | always show save button when account info was modified. fixes #918 | iNPUTmice | 2015-04-14 | 1 | -5/+9 | |
| | | ||||||
* | | fixed disable account when sliding and not clicking the toggle | iNPUTmice | 2015-04-13 | 2 | -8/+9 | |
| | | ||||||
* | | fixed typos | iNPUTmice | 2015-04-13 | 2 | -2/+2 | |
| | | ||||||
* | | Merge pull request #1123 from lookshe/development | Daniel Gultsch | 2015-04-13 | 1 | -10/+18 | |
|\ \ | | | | | | | Bugfix for issue #1121 | |||||
| * | | Bugfix for issue #1121 | lookshe | 2015-04-13 | 1 | -10/+18 | |
| | | | | | | | | | | | | | | | | | | check with lowercase to also match JPEG, JPeg ... changed image url in comment | |||||
* | | | shut up linter | iNPUTmice | 2015-04-13 | 1 | -0/+1 | |
| | | | ||||||
* | | | Maintain private chat on MUC. fixes #1097 | iNPUTmice | 2015-04-13 | 1 | -1/+0 | |
| | | | ||||||
* | | | fixed regression where the selected conversation wasn't highlighted anymore ↵ | iNPUTmice | 2015-04-13 | 2 | -12/+11 | |
|/ / | | | | | | | on tabled layout | |||||
* | | allow sharing multiple images at once. fixes #1090 | iNPUTmice | 2015-04-11 | 2 | -59/+104 | |
| | | ||||||
* | | don't resume old session when changing resource | iNPUTmice | 2015-04-09 | 5 | -7/+35 | |
| | | ||||||
* | | Enable end-conversation by swipe gesture | BrianBlade | 2015-04-08 | 2 | -9/+95 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4 to enable swipe-out for ListViews Re-enable selectableItemBackground Dont end selectedConversation on swipe Call mConversationFragment.reinit() instead. Add separate undo string for swipe MUC. Add blacklistedConversation for undo swipe Update title_undo_swipe_* strings Fix undo(), rename blacklistedConversation Fix discardUndo(); re-init selectedConversation maintain scroll position after undo clear notification when dismissing a conversation modified / simplified maintain scroll position code simplify handling of selectedConversation change undo_muc string, remove notifyDataSetChanged() | |||||
* | | Merge pull request #1099 from BrianBlade/fix_otr_error_msgs | Daniel Gultsch | 2015-04-02 | 2 | -18/+24 | |
|\ \ | | | | | | | Fix OTR-Error messages (#1021) | |||||
| * | | Fix OTR-Error messages | BrianBlade | 2015-04-01 | 2 | -18/+24 | |
| |/ | | | | | | | | | Send out OTR-Errors on unreadableMessageReceived() as well, not only on messageFromAnotherInstanceReceived | |||||
* / | Add toggle account-state switch | BrianBlade | 2015-04-01 | 2 | -16/+37 | |
|/ | | | | | Add a switch to AccountAdapter that allows self-contained enabling/disabling of accounts without the need to bring up the context-menu | |||||
* | properly set chat states when receiving otr status messages | iNPUTmice | 2015-03-21 | 1 | -1/+1 | |
| | ||||||
* | respond to unreadable OTR messages with error message. fixed #1021 | iNPUTmice | 2015-03-21 | 5 | -3/+42 | |
| | ||||||
* | wait for session iq to return sucessfully before sending other stanzas. ↵ | iNPUTmice | 2015-03-20 | 1 | -26/+42 | |
| | | | | fixed #1017 | |||||
* | don't update presence for muc messages | iNPUTmice | 2015-03-19 | 1 | -5/+2 | |
| | ||||||
* | Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen | Daniel Gultsch | 2015-03-19 | 4 | -8/+24 | |
|\ | | | | | add delivery receipts for private muc msgs & enable update last-seen for muc-msgs | |||||
| * | # add delivery receipts for private muc msgs | BrianBlade | 2015-03-18 | 4 | -8/+24 | |
| | | | | | | | | # enable update last-seen for muc-msgs | |||||
* | | Merge pull request #1043 from strb/choose_contact_multiple_squashed | Daniel Gultsch | 2015-03-18 | 2 | -6/+121 | |
|\ \ | | | | | | | Added multiple select to Choose Contact Activity (squashed) | |||||
| * | | Added multiple select to Choose Contact Activity | Andreas Straub | 2015-03-18 | 2 | -6/+121 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing the Choose Contact Activity a boolean called "multiple" set to true, it now allows the user to select multiple contacts. Long pressing a contact enters multiple selection mode and the selection is confirmed using a button in the CAB. The Activity returns whether or not multiple contacts were selected using the same boolean. If multiple contacts were selected, an array of JID strings called "contacts" is returned. The Choose Contact Activity now also honors "filter_contacts", an array of strings containing JIDs that should not be displayed in the picker. The invite to conference dialog now uses this feature to enable inviting multiple contacts at once. Additionally, Invite Contact uses "filter_contacts" to only display contacts that are not yet participating in the conversation | |||||
* | | | Merge pull request #1036 from QuentinC/development | Daniel Gultsch | 2015-03-18 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Green led color is better with "full-green" |