Commit graph

2565 commits

Author SHA1 Message Date
Daniel Gultsch 540f6f3d7a send caps hash in muc join
this prevents desktop clients from iq'ing use when they join
2016-05-15 09:54:49 +02:00
Daniel Gultsch 6a28b5a9fa don't show duplicate status message in contact details 2016-05-13 11:57:02 +02:00
Daniel Gultsch e41a9483bd only default to omemo when all our devices support it 2016-05-13 11:47:29 +02:00
Daniel Gultsch aced9d2697 do not process self presence
we don't want our own resource show up in the self contact
2016-05-13 11:20:27 +02:00
Daniel Gultsch b756d61c45 show presence of other resources as template 2016-05-13 10:45:30 +02:00
Daniel Gultsch b8c1bd2cba reset attempt count when reconnecting because of timeout 2016-05-12 21:57:07 +02:00
Daniel Gultsch 2014f388b1 interrupt XMPPConnection Thread
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
2016-05-12 21:54:46 +02:00
Daniel Gultsch cbdb413613 prefer IPv4 DNS servers
some devices might have problems contacting the IPv6 DNS server while in sleep mode
2016-05-12 21:39:47 +02:00
Daniel Gultsch f4369b29ae improve keyboard handling. fixes #1387
* 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
2016-05-12 18:49:54 +02:00
Daniel Gultsch 7113e21a43 use 'phone' or 'tablet' as default resource 2016-05-12 18:47:41 +02:00
Daniel Gultsch 908aa19a36 make omemo default when all resources support it 2016-05-12 14:20:11 +02:00
Daniel Gultsch 09e20f6e01 check if pgpengine is still bound before using it 2016-05-12 11:30:53 +02:00
Daniel Gultsch 1bc92482e9 scroll to bottom after sending multi-line message 2016-05-12 10:39:04 +02:00
Daniel Gultsch cc209afc51 stop processing PreKeyWhisperMessage if there is no PreKeyId
fixes #1832
2016-05-10 18:11:13 +02:00
Daniel Gultsch 8e3948e495 don’t let attempt count fall below zero 2016-05-10 17:48:09 +02:00
Daniel Gultsch c37b5af2ca add lock domain and magic create domain to known hosts 2016-05-10 10:53:44 +02:00
Daniel Gultsch e542dd3923 always show download button when link is encrypted
dont check for known mime type
2016-05-10 10:32:25 +02:00
Daniel Gultsch 549be9bb3d report host-account as account state in UI 2016-05-10 10:29:02 +02:00
Daniel Gultsch 27b245ac35 do not show last-seen metric in UI 2016-05-10 09:41:30 +02:00
Daniel Gultsch 488780d2ce fix logging wrong variable for failed resume 2016-05-08 21:53:45 +02:00
Daniel Gultsch 6f3b8f64d1 check for h attribute in 'failed' nonza 2016-05-08 21:45:18 +02:00
Daniel Gultsch fb7525e0b9 catch all exceptions thrown by xml pull parser 2016-05-07 11:34:45 +02:00
Daniel Gultsch 76889b9c58 handle invalid base64 is SASl SCRAM response 2016-05-07 11:34:17 +02:00
Daniel Gultsch e2d3bef739 Merge pull request #1829 from sebastianv89/patch-1
Remove copy of innerkey
2016-05-05 20:23:03 +02:00
Daniel Gultsch a7cd05bd4e report bind failure as account state 2016-05-05 20:22:47 +02:00
Daniel Gultsch 0157039e87 log more information about HTTP’s max upload size 2016-05-05 19:34:44 +02:00
Sebastian 544e1dee65 Remove copy of innerkey
The line overwrites this.innerkey with the value that was already there.
2016-05-05 17:09:01 +02:00
Daniel Gultsch 6e0ec9b924 republish pgp signature when changing status 2016-05-05 13:17:04 +02:00
Daniel Gultsch 12704fa640 refactor captcha response handling to avoid network on main thread exception 2016-05-05 09:58:35 +02:00
Daniel Gultsch c27663c456 clear password field before setting new one 2016-05-04 18:23:36 +02:00
Daniel Gultsch fb41a4ffaa fixed npe when calling changepassword activity directly 2016-05-04 18:22:17 +02:00
Daniel Gultsch 16eb1bfbd0 pulled translations from transifex 2016-05-04 13:19:07 +02:00
klemens 7047d68165 spelling fixes 2016-05-04 10:29:29 +02:00
Sebastian cf374ec4ef Renaming of variable
Was probably just a copy/paste typo.
2016-05-03 23:35:57 +02:00
Daniel Gultsch cef2eb58a7 fixed presence template dedup for 'online' status 2016-05-03 22:16:51 +02:00
Daniel Gultsch fad8b702aa use app name in resource suggestions 2016-05-03 12:41:37 +02:00
Daniel Gultsch 06a561743a ping all accounts at the same time 2016-05-02 14:31:30 +02:00
Daniel Gultsch bf92ef6cd3 pulled translations from transifex 2016-05-02 11:05:31 +02:00
Daniel Gultsch d23178acb9 show only username when registering account with magic create 2016-05-02 10:37:28 +02:00
Daniel Gultsch 98ecac0ffa removed unnecessary logging 2016-04-30 13:34:20 +02:00
Daniel Gultsch 936006173c properly cancel avatar tasks 2016-04-29 20:38:23 +02:00
Daniel Gultsch d5608cb4f3 catch ActivityNotFoundException when requesting battery op 2016-04-29 13:58:37 +02:00
Daniel Gultsch c7882b7225 port all android drop down list items to our own 2016-04-29 13:48:30 +02:00
Daniel Gultsch 6d9ca25915 catch rare NPE when determining max http size 2016-04-29 13:24:26 +02:00
Daniel Gultsch 252d015b71 synchronize around thumbnail cache to avoid loading images twice 2016-04-28 20:15:28 +02:00
Daniel Gultsch 1d2e2f71c2 cancel potential tasks when receiving image preview from cache 2016-04-28 20:14:53 +02:00
Daniel Gultsch 51753a1d39 cleaned up captcha dialog 2016-04-28 20:13:58 +02:00
Daniel Gultsch 5021b9a5dd don't request disco from self 2016-04-28 19:02:20 +02:00
Daniel Gultsch 29616d02a8 removed unused config variables 2016-04-27 16:43:02 +02:00
Daniel Gultsch ebcb13c8eb made it possible to go back to welcome screen from edit account 2016-04-27 10:35:08 +02:00
Daniel Gultsch e6b526230a renamed welcome header to untranslatable 'Start your Conversations' 2016-04-27 09:59:25 +02:00
Daniel Gultsch 9c3e910dc4 prevent user from accidentally changing password after using magic create 2016-04-26 23:23:48 +02:00
Daniel Gultsch 59652ecaf2 fixed table creation 2016-04-25 11:06:17 +02:00
Daniel Gultsch a363e0a5d8 don't create templates for empty status messages 2016-04-23 15:10:35 +02:00
Daniel Gultsch cd1fbf60ec add change prescence to manage account context menu 2016-04-23 12:33:56 +02:00
Daniel Gultsch a9c1768107 show status messages in contact details 2016-04-23 12:19:00 +02:00
Daniel Gultsch 1901abd05f expert setting to manually change presence 2016-04-22 21:25:06 +02:00
Daniel Gultsch 195b745efc put welcome screen in scrollview 2016-04-22 00:17:08 +02:00
Daniel Gultsch 1a073ca454 added magic create welcome screen 2016-04-19 18:03:24 +02:00
Daniel Gultsch e9494af098 always notify by default in conferences 2016-04-14 22:37:05 +02:00
Daniel Gultsch eb63cdb9ad removed unnecessary call to stopSelf() after logging out 2016-04-14 21:45:36 +02:00
Daniel Gultsch 72aa10b536 add setting for quick sharing 2016-04-14 21:12:44 +02:00
Daniel Gultsch 39e717ed94 removed unused call to cancel events 2016-04-14 00:16:59 +02:00
Daniel Gultsch c53c6cb6b6 create Config varibale to show the disable foreground service button 2016-04-13 18:00:12 +02:00
Daniel Gultsch 594e65bb2b hacky workaround to determine if uri points to private file on < lolipop 2016-04-13 11:14:36 +02:00
Daniel Gultsch 4332b0df44 return own jid as true counterpart on self messages in muc 2016-04-13 11:13:47 +02:00
Daniel Gultsch 3e654bea0e added share uri button to conference details 2016-04-12 18:30:02 +02:00
Daniel Gultsch 2a4db01709 reverse order in contact chooser 2016-04-12 18:29:41 +02:00
Daniel Gultsch 7223b5b274 minor code cleanup 2016-04-12 17:52:58 +02:00
Daniel Gultsch 7ff890e513 republish avatar if server offers non-persistent pep :-( 2016-04-11 22:20:32 +02:00
Daniel Gultsch 77f4513862 pulled translations from transifex 2016-04-10 21:19:50 +02:00
Daniel Gultsch 5786e75374 don't throw IO exception at end of stream 2016-04-10 00:19:53 +02:00
Daniel Gultsch 91b17c6925 fixed 'connecting…' button 2016-04-10 00:19:20 +02:00
Daniel Gultsch 607b7d1593 moved authentication into seperate method. force close socket before changing status 2016-04-10 00:18:14 +02:00
Daniel Gultsch 83fab06508 introduced setting to turn of notification led 2016-04-09 21:48:06 +02:00
Daniel Gultsch 65548ddccb use startdate as lower bound when querying archive with after=x 2016-04-09 12:31:08 +02:00
Daniel Gultsch b99d70bfe7 don't show contact details when in conversations with self 2016-04-09 10:59:54 +02:00
Daniel Gultsch 2713fd50c8 use last received message id when querying archive 2016-04-09 10:29:34 +02:00
Daniel Gultsch 14b46c3ee7 transform nimbuzz workaround into a more general 'waitForDisco' condition 2016-04-09 08:53:58 +02:00
Daniel Gultsch a8ebc5fafc add required disco#items query to timeout list 2016-04-08 20:20:37 +02:00
Daniel Gultsch db0301310b removed ernoexception in exchange for a regular exeption to prevent verify error on <5.0 2016-04-08 18:28:40 +02:00
Daniel Gultsch c55f7645a4 pulled translations from transifex 2016-04-08 10:41:37 +02:00
Daniel Gultsch 0460702710 check file owner when attaching files or using them as avatar 2016-04-07 20:29:40 +02:00
Daniel Gultsch 290f0a123e prevent null pointer when checking http upload max size 2016-04-07 19:20:45 +02:00
Daniel Gultsch ecaf75e5ec better detect broken pep
mark pep as broken when publishing bundle or device list failed
reset 'brokenness' when account is getting disabled
2016-04-05 13:31:03 +02:00
Daniel Gultsch 0385e3a8d6 switched around info and items query to avoid race condition 2016-04-04 20:35:40 +02:00
Daniel Gultsch e94e06246b pulled translations from transifex 2016-04-04 20:21:00 +02:00
Daniel Gultsch 5787687997 removed unnecessary wait for disconnect 2016-04-04 20:07:09 +02:00
Daniel Gultsch 61997912fd made sure the disco#items query has returned before finalizing the bind 2016-04-04 20:06:07 +02:00
Daniel Gultsch 701742f550 don't ask for resource when server uses http upload v0.1 2016-04-02 18:07:38 +02:00
Daniel Gultsch 2549ce89b0 check max http file size when attaching files 2016-04-01 00:03:14 +02:00
Daniel Gultsch 74c496fe3e add methods to check max file size for http upload 2016-03-31 21:56:59 +02:00
Daniel Gultsch e074104004 save otr fingerprint in message 2016-03-31 21:15:49 +02:00
Daniel Gultsch 867d0ef191 include form fields into caps hash calculation 2016-03-31 14:21:56 +02:00
Daniel Gultsch 8d98c52803 closed some cursors under error conditions 2016-03-31 13:55:46 +02:00
Daniel Gultsch 343a6b4e6b made setting aes keys in DownloadableFile more readable 2016-03-31 13:55:25 +02:00
Christian S 1d458e8ab3 Update ShortcutBadger to version 1.1.4 2016-03-27 20:17:51 +02:00
Daniel Gultsch a9b66e3ea5 allow to delete attachments. fixes #1539 2016-03-23 19:23:22 +01:00
Daniel Gultsch 281cb65046 only add image files to media scanner 2016-03-23 12:20:09 +01:00
licaon-kter 6ba90ec43c Typo attempt 2016-03-22 11:54:45 +02:00
Daniel Gultsch 135c8567a5 show room nick for /me command in sent muc messages. fixes #1773 2016-03-20 17:33:42 +01:00
Daniel Gultsch ac09011690 be less strict when sharing EXTRA_TEXT intents 2016-03-20 17:25:16 +01:00
Daniel Gultsch 7df24407dc be more careful to avoid creating multiple connections 2016-03-20 17:24:41 +01:00
Daniel Gultsch b51ce43d36 don't show v\omemo keys as such if not enabled 2016-03-20 17:24:15 +01:00
Daniel Gultsch b17ca3543f made it possible to share text files 2016-03-16 18:09:19 +01:00
Daniel Gultsch 48be5af55f reworked sharewith activity to stay open during sharing
closing the activity prematuraly caused uri permissions to be revoked
2016-03-16 10:46:33 +01:00
fiaxh eaddfa7fd1 Check if path for URI is accessible
The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed.
Fixes sharing from open-keychain's TemporaryContentProvider
2016-03-15 11:42:13 +01:00
Daniel Gultsch 815c534da8 pulled translations from transifex 2016-03-13 17:43:43 +01:00
Daniel Gultsch 0af8ee341c simplified getUsers(max) code 2016-03-13 17:42:17 +01:00
Daniel Gultsch 1153e6120d added logging in case fragment wasn't attached 2016-03-13 17:41:38 +01:00
Daniel Gultsch 290f53f4a6 fixed recursive call instead of call to super in PublishProfileActivity 2016-03-13 17:39:13 +01:00
Daniel Gultsch 817d344521 log reason for bind failure 2016-03-11 09:01:40 +01:00
Daniel Gultsch 9548f43998 close cursor in caps db query 2016-03-11 09:01:27 +01:00
Daniel Gultsch 24aefa109c pulled translations from transifex 2016-03-06 21:35:59 +01:00
Daniel Gultsch e6a9829dd2 don't show opt-out of battery optimization dialog when push is enabled 2016-03-06 15:53:49 +01:00
Daniel Gultsch 86fff5839a warn in conversations when account is disabled 2016-03-06 12:16:29 +01:00
Daniel Gultsch d3542202b5 Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun018-Mess 2016-03-04 21:31:54 +01:00
Daniel Gultsch e9b4a2a021 show host in file size checker 2016-03-04 21:30:34 +01:00
Daniel Gultsch 09d87965fb mark oob messages and always display download button 2016-03-04 20:09:21 +01:00
Daniel Gultsch aa24a0f779 don't automatically crop avatar 2016-03-04 14:32:38 +01:00
Daniel Gultsch 89eea3636f add a few more know file extensions 2016-03-04 11:24:53 +01:00
Daniel Gultsch 07263370d9 allow to copy original url even while downloading. fixes #1743 2016-03-04 11:24:40 +01:00
Daniel Gultsch bc5f64bffe moved avatarfetcher reset code to bind 2016-03-03 13:33:02 +01:00
Daniel Gultsch 4cb2d0ca93 avoid unnecessary disconnect. prevent NetworkOnMainThreadException 2016-03-03 13:31:59 +01:00
Daniel Gultsch c9e4b332bf don't break with srcoll events on empty message lists 2016-03-03 11:14:59 +01:00
Daniel Gultsch aaf64732b0 expert option to treat vibrate as silent mode for XA. fixes #1530 2016-03-01 19:00:18 +01:00
Daniel Gultsch 15a1873d97 removed unused config variable 2016-03-01 18:58:33 +01:00
Daniel Gultsch fd246f7e5a properly persist accepted crypto targets 2016-03-01 12:22:20 +01:00
Daniel Gultsch 198dc2c6b4 let users confirm each member in a conference even if that contact is already trusted 2016-03-01 11:26:59 +01:00
Tarun df7b399e04 Fix Issue #1634 : Shows XMPP URI as links.
Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI.
2016-02-29 23:35:50 +05:30
Daniel Gultsch 134c75ae01 use correct jid when leaving a conference. fixes #1732 2016-02-29 16:32:24 +01:00
Daniel Gultsch 9e0466d1e6 refactored omemo to take multiple recipients 2016-02-29 13:18:07 +01:00
Daniel Gultsch 199ae3a4d8 rename purge keys positive button to 'purge keys' 2016-02-28 23:10:50 +01:00
Daniel Gultsch 4ba41540fd made hashtable in roster store jids instead of strings 2016-02-28 20:45:50 +01:00
Daniel Gultsch 24a9ac2908 always search offline contacts as well. fixes #1653 2016-02-27 15:41:34 +01:00
Daniel Gultsch 2c224d0f18 Merge branch 'master' of github.com:siacs/Conversations 2016-02-27 11:26:09 +01:00
Daniel Gultsch 3cf21e2d37 Merge pull request #1721 from fiaxh/export_logs_storage_permission
Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M
2016-02-27 11:25:56 +01:00
Daniel Gultsch 60ab03afb1 changed single_account config into more simple lock_settings 2016-02-27 10:25:31 +01:00
Daniel Gultsch 7fd6a37e67 disallow message correction by default. fixes #1720 2016-02-26 09:48:58 +01:00
Daniel Gultsch dc00a92499 execute pending mam queries every time we come online 2016-02-26 09:46:25 +01:00
Daniel Gultsch 5d3ee60ca4 hide add account icons when single_account is set to true 2016-02-24 17:12:29 +01:00
Daniel Gultsch bbede8bbeb optionally lock conference domains as well and hide known domains in ui 2016-02-24 16:53:19 +01:00
fiaxh e1a2f248af Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M 2016-02-24 16:35:26 +01:00
fiaxh a88c2d48c0 No possibility of multiple invocation of log export 2016-02-24 15:10:41 +01:00
Daniel Gultsch d1a456f3e3 made hard coded choice for encryptions more flexible and disable parsing 2016-02-24 14:47:49 +01:00
Daniel Gultsch ddafa65849 Merge pull request #1715 from fiaxh/gpg_decryption_failed
PGP Retry decryption from message menu
2016-02-24 09:23:30 +01:00
Daniel Gultsch 17b1fcc3ea set noMessagesLeftOnServer before conference configuration fetch 2016-02-23 16:15:55 +01:00
Daniel Gultsch 34f2a63190 update notification after message correction 2016-02-23 16:15:23 +01:00
Daniel Gultsch 0298f0181e reset pending subscription request when receiving roster update 2016-02-23 16:14:55 +01:00
fiaxh 894b5892a9 Retry decryption from message menu 2016-02-23 16:05:42 +01:00
Daniel Gultsch beb216c300 made presences object final in contact 2016-02-23 14:25:01 +01:00
Daniel Gultsch 689ded1607 properly trigger show load more messages in mucs 2016-02-22 20:28:58 +01:00
Daniel Gultsch a0d0ed34ae turned muc errors into enum. added error codes for service shutdown 2016-02-22 20:19:58 +01:00
Daniel Gultsch d2cfac222e show load more messages when auto loading is disabled and messages are still left on server 2016-02-21 17:32:46 +01:00
Daniel Gultsch b00c561f81 check for uuid change when decrypting pgp messages 2016-02-21 11:43:03 +01:00
Daniel Gultsch ed740b4868 some mucs may grant voice to visitors in unmoderated rooms 2016-02-21 11:42:41 +01:00
Daniel Gultsch 43b466704a pulled translations from transifex 2016-02-20 10:25:23 +01:00
Daniel Gultsch 3bde4dbedb change uuid when replacing messages 2016-02-20 00:01:39 +01:00
Daniel Gultsch e6f8b7d9fa decrypt pgp message corrections 2016-02-19 21:02:33 +01:00
Daniel Gultsch a2cb009f4c skip avatar ui when pep is not available. fixes #1706 2016-02-19 20:54:53 +01:00
Daniel Gultsch df992d2566 don't reset whisper on reInit. fixes #1637 2016-02-19 20:54:43 +01:00
Daniel Gultsch ad60bc002c pulled translations from transifex 2016-02-19 11:14:16 +01:00
Daniel Gultsch 49a3f6f281 never parse show in presences as offline 2016-02-19 11:09:28 +01:00
Daniel Gultsch ac687d6bbd don't log start reason 2016-02-17 16:52:57 +01:00
Daniel Gultsch 59978e157c only offer message correction for the very last message 2016-02-17 16:51:36 +01:00
Daniel Gultsch 3626e4b3a0 fixed regression that caused messages in muc not being send 2016-02-17 16:50:48 +01:00
Daniel Gultsch c2fbdbde83 log reason why otr message won't be parsed 2016-02-16 14:22:47 +01:00
Daniel Gultsch 86b1865eec fixed regression that caused ui to redraw a lot 2016-02-16 14:22:21 +01:00
Daniel Gultsch 349dd8291d made clear that archiving preferences are server side 2016-02-16 12:52:31 +01:00
Daniel Gultsch a9b957e8a2 added setting to opt-out of message correction. renamed preferences and options to settings 2016-02-16 09:57:59 +01:00
Daniel Gultsch 0ca4a33bfb added some OTR logging 2016-02-16 09:15:41 +01:00
Daniel Gultsch c0b3a3ff0c basic support for XEP-0308: Last Message Correction. fixes #864 2016-02-15 23:15:04 +01:00
Daniel Gultsch 335058b78b removed unnecessary conditions when sending read marker 2016-02-15 23:09:42 +01:00
Daniel Gultsch c4b1df1bf3 add missing type='submit' attribute to enable push form 2016-02-15 22:12:39 +01:00
Daniel Gultsch c3f0503a91 pulled translations from transifex 2016-02-15 12:35:35 +01:00
Daniel Gultsch 8ccb2005b3 only show load more messages button when mam is available
also update ui after that button has been pressed. fixes #1695
2016-02-14 23:53:17 +01:00
Daniel Gultsch 356199978e fixed server info push not showing up when unavailable 2016-02-14 18:19:11 +01:00
Daniel Gultsch 92a6e956fd be more carefull when checking push availability 2016-02-14 15:36:37 +01:00
Daniel Gultsch 300326fba3 deleted invalid gcm strings 2016-02-14 14:14:53 +01:00
Daniel Gultsch 251f2479c2 optional mode to close tcp connection when going into background
acts only when push is available. disable all non-push accounts to test properly
2016-02-14 13:20:23 +01:00
Daniel Gultsch 6f9f871928 send push enable to server. simplified logging 2016-02-13 14:20:07 +01:00
Daniel Gultsch c7a14092a8 fixed compile bug in free version 2016-02-13 00:03:57 +01:00
Daniel Gultsch c430848ade push gcm token on bind instead of every connect 2016-02-12 23:37:42 +01:00
Daniel Gultsch 32da65f910 client side support for XEP-0357: Push Notifications 2016-02-12 11:39:27 +01:00
Daniel Gultsch 93dad9b737 pulled translations from transifex 2016-02-11 22:45:40 +01:00
Daniel Gultsch f37098a54f catch all axolotl parse exception at once. fixes #1692 2016-02-11 12:26:43 +01:00
Daniel Gultsch 1bb38e25f2 send muc messages after join 2016-02-10 09:53:48 +01:00
Daniel Gultsch f16690ae1f allow user to set MAM preferences 2016-02-09 13:01:17 +01:00
Daniel Gultsch 91ec4839ac prepend instead off append mam messages to conversations when going in reverse 2016-02-04 16:40:18 +01:00
Daniel Gultsch 28733e052f fixed performance regression in on scroll listener 2016-02-04 16:29:17 +01:00
Daniel Gultsch 4fdb0d92fe prevent previoulsly cleared messages from reloading. fixes #1110 2016-02-04 14:39:16 +01:00
Daniel Gultsch f88b8c703e add more fault tolerant checks for messages left on server 2016-02-04 11:55:42 +01:00
Daniel Gultsch 17791a703e removed unecessary logging when muc tiles update 2016-02-04 10:27:38 +01:00
Daniel Gultsch 7dd9545ea3 use TLSv1.2 as SSL context on supported plattforms 2016-02-03 18:17:16 +01:00
Daniel Gultsch 1d572c61d0 cache server caps 2016-02-03 17:19:05 +01:00
Daniel Gultsch 0911669b07 count all messages in a query 2016-02-03 16:04:21 +01:00
Daniel Gultsch 1274b0ef39 Revert "get rid of broken totalMessageCount for mam queries"
This reverts commit 58c6f9bfb2.
2016-02-03 10:40:44 +01:00
Daniel Gultsch f0798216d5 refactored disco cache. avoid making duplicate call. check hash 2016-02-03 10:40:02 +01:00
Daniel Gultsch 4a1a59f0c8 Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps 2016-02-02 18:19:26 +01:00
Daniel Gultsch 01bad12708 fixed 'unencrypted' not showing up for conferences when encryption is forced 2016-02-02 18:15:57 +01:00