aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-5/+57
|\ | | | | | | | | | | | | | | | | 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
| * Added multiple select to Choose Contact ActivityAndreas Straub2015-03-181-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * limit ui refresh rateiNPUTmice2015-02-171-0/+29
| |
* | Merge master-originsteckbrief2015-02-201-11/+27
|\| | | | | | | | | | | | | | | | | | | 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
| * adapt caps on whether or not message confirmation is oniNPUTmice2015-01-261-3/+1
| |
| * Changed online color to green instead of primaryAnders Sandblad2015-01-231-0/+4
| |
| * always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-211-5/+7
| |
| * fixed up button on v21 devicesiNPUTmice2015-01-201-2/+6
| |
| * Add option to swap enter/emoticon keySam Whited2015-01-141-0/+6
| |
* | - Avoiding accessing shared preferences to know if emoticons should be ↵steckbrief2015-01-201-1/+3
|/ | | | | | parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-38/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #791 Squash of commits: 534f25d7dae3ce6852243e28fdd0a69ac01e9463 808fdf5147f27a912a60bee39aa4bf1ddd4f43b4 1eaf8a8330710ad35ba7c368e04f909af623ae4c 31585242c2359efdcd0eeddb9745077f54dbc9eb 2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b e904fb5015bf3a1904ab941a1957edf3b1e7abd2 eebbadf3b3816bbf8fcccb763e419fed252d266f 7c5b87724ce494e5a6e8026557ed50a8fd9f23e8 b0eaaf446937794fe19cbdb4f8309c3ff83d4e42 8c652f9e8bb3512958d9ad8c6f1326505f2d98c8 ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f f5d49897e0dba691ef53a0eddb9ed34d129ad442 a08fa64c505bd895b7c626cfad182380373be20b de67079113e08394a276048c31f6b21baa300829 9069f342173ba30c2b20c67529c7ff497a6a257d 0169fa79d161ee898c4b6762e207087682a952d8 8585a5bd75a5d56927fed8317729bd15fffe4dcc 0053528a078369e0b65dcf71bda251072a1299c7 e901a9c3554bd7cca193e92919b463991eadfea7 c5c78257434813c69ab9b7558bcc8f7cbe858433 e905af348d46d77bc46b5f7211527684acc02fab 13a0f9a10c7892b0f90f5fabd2f2615701b0fd66 2cfba1e24b0139839e4453b92be7e20634d150cf 58e074fb5bb44b05a8104250fccd7c024c808c1a 0d6cf98fc8eab212d798ac79b336f9b70a14f06d e23620f56b85bcab9f3b5d9ce1c01524cd9674dc d72cd2fcc8d54176c3ff53411a69b9bb4642eff3 195143dff8836623a37094a6b8fa6aa01ef31580 5f5f3caf3a1e480a99d27ee5c34ba516419c52e4 1dee3d5861c9f9c710da4cbda3688d94c622ca93 23949b8aa32c78b27bab49bb3c4f3ff588925ce1 9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
* recreate activity after theme has changed. fixed #764iNPUTmice2014-12-091-3/+11
|
* add an listener for the muc roster update.Michael2014-11-231-0/+6
| | | | | this is for the ConferenceDetailsActivity to show precence updates immediately.
* remove unused imports.Michael2014-11-211-1/+0
|
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-14/+45
|
* some saftey checks before registering listeners in XmppActivityiNPUTmice2014-11-191-1/+12
|
* highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-171-0/+11
|
* Make account status an enumSam Whited2014-11-151-1/+1
|
* initial smp supportiNPUTmice2014-11-111-0/+2
|
* auto register/unregister listenersiNPUTmice2014-11-111-4/+46
|
* temporarliy got rid of some insane work arounds in favor of some maybe less ↵iNPUTmice2014-11-111-1/+5
| | | | insane work arounds
* more refactoring for presence selection. removed getTo, getFrom and getJid ↵iNPUTmice2014-11-101-1/+13
| | | | from Element
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-2/+2
| | | | Remove `Account.getFullJid()'
* refactored code to always contain full jid for counterpartiNPUTmice2014-11-091-5/+14
|
* Update another chunk of stuff to use JID objectsSam Whited2014-11-091-21/+20
|
* register nfc callback in every activity that provides a proper sharable uriiNPUTmice2014-11-041-0/+14
|
* made qr code available from muc and contact details as welliNPUTmice2014-11-041-44/+117
|
* fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to ↵iNPUTmice2014-11-031-0/+10
|\ | | | | | | @emdete
| * basic beam code / untestediNPUTmice2014-11-031-0/+8
|/
* Merge branch 'gradle' into developmentSam Whited2014-10-301-4/+15
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-221-0/+637
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 12:05:40 +0000