aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3lookshe2015-08-241-8/+155
|\
| * 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
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-291-9/+9
| * Disable trust toggle completely for INACTIVE keysAndreas Straub2015-07-221-0/+1
| * Add INACTIVE state for removed keysAndreas Straub2015-07-211-4/+20
| * 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
| * 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
| * Refactor trust key ui and show in account detailsAndreas Straub2015-07-191-0/+79
| * Disable Axolotl option if not usableAndreas Straub2015-07-191-23/+0
| * 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
| * removed debug loggingDaniel Gultsch2015-05-121-2/+0
| * handle conference invites differently to deal with killed activities. fixes #...Daniel Gultsch2015-05-121-31/+56
| * fixed regression where the selected conversation wasn't highlighted anymore o...iNPUTmice2015-04-131-1/+7
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-46/+74
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-5/+57
|\|
| * Added multiple select to Choose Contact ActivityAndreas Straub2015-03-181-5/+28
| * limit ui refresh rateiNPUTmice2015-02-171-0/+29
* | Merge master-originsteckbrief2015-02-201-11/+27
|\|
| * 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 parsed...steckbrief2015-01-201-1/+3
|/
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-38/+46
* 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
* 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 i...iNPUTmice2014-11-111-1/+5
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-101-1/+13
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-2/+2
* 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