narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity
4115 commits 6 branches 6 tags 68 MiB
Commit graph

3062 commits

Author SHA1 Message Date
Daniel Gultsch f60dd98d3c only count push as available when sm is to avoid race conditions 2017-02-08 16:52:35 +01:00
Daniel Gultsch d9e2ab62b2 add index to message.conversationUuid 2017-02-07 21:17:08 +01:00
Daniel Gultsch 24fab162e2 renamed omemo:// to aesgcm:// 2017-02-07 20:07:57 +01:00
Daniel Gultsch 71ad18beb9 support omemo:// style urls 2017-02-07 19:32:12 +01:00
Daniel Gultsch c37117b940 update copyright information 2017-02-07 19:31:54 +01:00
Daniel Gultsch 6be3ae8ef0 pulled translations from transifex 2017-02-07 17:57:24 +01:00
Daniel Gultsch e35ada4997 only store messages up to a length of 1M chars 2017-02-07 17:45:01 +01:00
Daniel Gultsch 6313c3c92e Merge pull request #2270 from moparisthebest/master 
Stop Conversations force closing over sqlite errors due to long messages
 2017-02-07 17:35:25 +01:00
Daniel Gultsch e459616123 fixed wording for not getting messages from server 2017-02-07 14:03:48 +01:00
Daniel Gultsch 8ab166e817 fixed scrolling and async loading of message of new conversation start 2017-02-07 14:03:23 +01:00
Daniel Gultsch d7198bd68c fixed rare npe when doing file migration 2017-02-07 10:20:13 +01:00
Daniel Gultsch 6fc67d9a60 catch all throwables when working with content provider to retrieve mime 2017-02-07 10:19:45 +01:00
moparisthebest 2a34ece571 Stop Conversations force closing over sqlite errors due to long messages 2017-01-30 00:03:51 -05:00
Daniel Gultsch 53241f2ef1 add explicit encryption hints to outgoing messages 2017-01-26 19:19:08 +01:00
Daniel Gultsch c9e6d05fa0 use base64 encoding for file names uploaded with http 2017-01-26 18:39:25 +01:00
Daniel Gultsch bbceee7f61 pulled translation from transifex 2017-01-26 12:35:34 +01:00
Daniel Gultsch 40ee1a0bfc reset messagesLoaded when changing retention settings 2017-01-25 18:35:22 +01:00
Daniel Gultsch a86b2fefd9 add database and file migrations for 1.16.0 2017-01-25 13:22:20 +01:00
Daniel Gultsch f2d9539d90 share uri for bookmark direclty from Start Conversation 2017-01-25 00:15:50 +01:00
Daniel Gultsch 66457c9f2e transcode videos before sharing. change storage location 2017-01-24 20:17:36 +01:00
Daniel Gultsch 9b6ae6d75f configurable local message retention period. (untested) 2017-01-23 17:14:30 +01:00
Daniel Gultsch 4c6ef3b24e cleaning up crypto targets when conference member is getting removed 2017-01-22 18:58:49 +01:00
Daniel Gultsch b48bf39e08 change behaviour of back button to close finish activity. fixes #704 2017-01-22 18:26:47 +01:00
Daniel Gultsch d53c813408 make sure to set open conversations after connection with background service 2017-01-22 13:08:21 +01:00
Daniel Gultsch b72d7ec8d0 make sure to properly stop tagwriter 2017-01-22 12:54:39 +01:00
Daniel Gultsch 96a6460744 don't quote text when '>' is followed by numeber 2017-01-21 11:07:23 +01:00
Daniel Gultsch 780d1daf7e fixed some issues around ibb 2017-01-20 22:37:50 +01:00
Daniel Gultsch 5faa05ca19 pulled translations from transifex 2017-01-20 15:02:19 +01:00
Daniel Gultsch 97ba0a0d49 write text in bold when highlighted in received muc message 2017-01-20 14:54:59 +01:00
Daniel Gultsch cb9c4d4327 disable automatic foreground enabler. fixes #2239 2017-01-20 14:21:59 +01:00
Daniel Gultsch c324f0c8df modified highlight nick behaviour to better work with quotes 2017-01-20 13:45:09 +01:00
Daniel Gultsch 59f82cbd34 fixed regression introduced in previous commit. 2017-01-20 13:44:29 +01:00
Daniel Gultsch 143ad48be1 don't prematurly mark conversation as read during activity start. fixes #2245 2017-01-20 10:43:50 +01:00
Daniel Gultsch 1dcf804618 fixed pgp encrypted text quick sharing. fixes #2237 2017-01-17 15:56:21 +01:00
Daniel Gultsch ac2eee8e81 Merge pull request #2233 from SamWhited/scram-sha-2 
Add SCRAM-SHA-2 support
 2017-01-16 13:14:48 +01:00
Daniel Gultsch 764026b87e fixed behaviour with non-default encryption masks 2017-01-16 13:09:36 +01:00
Sam Whited bfc2cffc2f Add SCRAM-SHA-2 support 2017-01-15 23:43:44 -06:00
Daniel Gultsch f7c5a5c42e pulled translations from transifex 2017-01-15 19:22:18 +01:00
Daniel Gultsch d028f4b398 refactored whispermessage processing 2017-01-15 18:54:47 +01:00
Daniel Gultsch b085426d22 fixed linkifier 2017-01-15 18:54:15 +01:00
Daniel Gultsch a71e3d0653 pulled translations from transifex 2017-01-14 18:10:18 +01:00
Daniel Gultsch 8f39a594ff partially improved logging for receiving omemo messages 2017-01-14 18:10:04 +01:00
Daniel Gultsch b2e9b4aeb1 pulled translations from transifex 2017-01-12 23:28:30 +01:00
Daniel Gultsch 8e025cbb9e show doze warning when push is running on prosody 2017-01-12 23:22:02 +01:00
Daniel Gultsch 1876b444fa refactor getServerIdentity() to parse disco result directly 2017-01-12 23:17:52 +01:00
Daniel Gultsch c03e3b5965 don't include 'before' reference in mam queries bound by timestamp 2017-01-12 20:56:55 +01:00
Daniel Gultsch fd7216b6a0 finish of backlog only for one particular account 2017-01-12 20:56:27 +01:00
Daniel Gultsch 585a538340 don't show key tile in contact details when there are no keys 2017-01-12 20:50:53 +01:00
Daniel Gultsch b050ff2576 only call UI thread from downloading thread every 250ms 2017-01-12 16:02:09 +01:00
Daniel Gultsch bfacc180c5 don't allow to purge keys. offer distrut instead 2017-01-12 15:59:13 +01:00
Daniel Gultsch 2c1d3ef968 fixed avatar republish missing the mime type 2017-01-12 12:20:10 +01:00
Daniel Gultsch f0c3b31a42 treat omemo keys >= 32 bytes as containing auth tag. add config flag to put auth tag in key 2017-01-09 21:47:07 +01:00
Daniel Gultsch a1cb855739 adding prekey='true' to omemo messages if applicable 2017-01-09 20:20:02 +01:00
Daniel Gultsch ef4ed90811 pulled translations from transifex 2017-01-09 19:54:44 +01:00
Daniel Gultsch 39bb8ad05f automatically bookmark private, non-anonymous mucs where inviter is trusted. fixes #2035 #937 2017-01-09 19:54:27 +01:00
Daniel Gultsch a994d8f847 fixed typo in variable name 2017-01-09 18:05:58 +01:00
Daniel Gultsch b19572ba8c use 7.1 web url pattern matching on old platforms as well. fixes #2228 2017-01-09 17:58:11 +01:00
Daniel Gultsch d192c529e0 add spaces to otr fingerprints copied to clipboard. fixes #2226 2017-01-09 17:57:37 +01:00
Daniel Gultsch b116926bb1 unify getFileUri across share and open intents 2017-01-09 17:00:08 +01:00
Daniel Gultsch 39c8867ed7 add more punctuations to message preview 2017-01-06 20:56:44 +01:00
Daniel Gultsch 4a299920dc add overlay to indicate that image is gif 2017-01-03 14:05:10 +01:00
Daniel Gultsch 470d244414 Merge branch 'feature-gboardgifs' of https://github.com/illegalprime/Conversations into illegalprime-feature-gboardgifs 2017-01-03 11:44:14 +01:00
Daniel Gultsch 2bb7bc1455 show offline contacts as grayed out in conference details 2017-01-03 11:40:29 +01:00
Michael Eden 5a670c88b0 Do not compress GIFs, allow GBoard to send GIFs 2017-01-01 16:16:35 -05:00
Daniel Gultsch fa70bd7536 disable automatic foreground service activation if related config paramaters are set to zero 2016-12-30 20:24:35 +01:00
Daniel Gultsch b8b2051f4c get rid of unecessary config debug paramater that has been replaced by exepert setting 2016-12-30 20:23:50 +01:00
Daniel Gultsch 8c34bb3c6f hide inactive devices by default in contact details 2016-12-30 13:17:45 +01:00
Daniel Gultsch 40a9f70478 always open account details when scanning one of our own keys. fixes #2211 2016-12-29 12:50:18 +01:00
Daniel Gultsch fcd9ab17fe don't throw assertion error when building session with same device id from other contact 2016-12-28 22:15:24 +01:00
Daniel Gultsch b8f67bfaa3 deduplicate corrected messages 2016-12-26 15:13:38 +01:00
Daniel Gultsch 82c2e89d21 stop using broken parallax distance in sliding pane layout 2016-12-25 18:57:30 +01:00
Daniel Gultsch c43f224e8b pulled translations from transifex 2016-12-23 21:22:16 +01:00
Daniel Gultsch 9972f5eabc fixed npe cause by race condition when axolotl service isn't initialized 2016-12-23 21:19:38 +01:00
Daniel Gultsch 28c64c2bd1 skip empty lines in message preview. prevents indexoutofbounds exception 2016-12-23 21:19:11 +01:00
Daniel Gultsch d03c431137 use original message to parse pep 2016-12-23 21:16:58 +01:00
Daniel Gultsch f77afd9596 pulled translations from transifex 2016-12-20 16:38:07 +01:00
Daniel Gultsch b011d46ff2 don't show quoted text in message preview 2016-12-20 16:35:08 +01:00
Daniel Gultsch e5fff42b10 added omemo padding but disabled by Config.java flag 2016-12-20 16:12:12 +01:00
Daniel Gultsch fbbf1a37b4 disable removing of broken devices by default 2016-12-18 11:49:27 +01:00
Daniel Gultsch dbda2afd6d remove broken devices only once to prevent loops 2016-12-18 11:47:42 +01:00
Daniel Gultsch 87746ca2ba remove own fetch errors from device announcement 2016-12-16 17:12:26 +01:00
Daniel Gultsch da914ba09c make sure to display encryption indicatior 2016-12-16 11:30:51 +01:00
Daniel Gultsch 75ee14cfdf don't reconnect accout when system reports no internet connection 2016-12-10 13:20:05 +01:00
Daniel Gultsch 55b60f6b0f don't correct a message if that would create a duplicate 2016-12-09 20:03:48 +01:00
Daniel Gultsch 8abfbf82fa use verified symbol instead of colored lock icons 2016-12-09 18:46:32 +01:00
Daniel Gultsch 8eb292d16a don't show unavailable quick actions in settings 2016-12-06 23:44:39 +01:00
Daniel Gultsch 1739af2a41 fixed http resume 2016-12-06 23:27:29 +01:00
Daniel Gultsch cbc9c1fb20 add support for RFC7711 to MTM 2016-12-05 21:52:44 +01:00
Daniel Gultsch 1e7b4030bb show jid monospaced in verify dialog 2016-12-04 13:39:08 +01:00
Daniel Gultsch 1a89915b31 disable 'show blocklist' if blocklist is empty. fixes #2164 2016-12-03 23:49:00 +01:00
Daniel Gultsch a5b3c579c4 redraw options menu after rotation in muc details. fixes #2161 2016-12-03 23:25:31 +01:00
Daniel Gultsch 56991bbaeb add omemo fingerprints to web links as well 2016-12-03 13:37:26 +01:00
Daniel Gultsch 6e289b8738 show warning dialog beforing verifying keys via a link 2016-12-03 13:19:56 +01:00
Daniel Gultsch 599f7dad2c Merge branch 'feature-quotation' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-quotation 2016-12-02 14:01:26 +01:00
Daniel Gultsch d4b1119240 default using internal storage to false 2016-12-02 11:35:00 +01:00
Daniel Gultsch 6b0242523b Merge branch 'master' of https://github.com/Fenisu/Conversations into Fenisu-master 2016-12-02 11:25:14 +01:00
Daniel Gultsch 5d4aa04e5d support for jid escapting when displaying localpart only 2016-12-01 20:49:18 +01:00
Daniel Gultsch 58de10bcab use prepped string when building axolotl session 2016-12-01 20:48:39 +01:00
Daniel Gultsch e127ba9361 don't use own jid joined from another client to generate muc title 2016-12-01 19:57:40 +01:00
Daniel Gultsch 6e95ad4bdf don't show share button before account is setup 2016-12-01 13:07:18 +01:00
Daniel Gultsch 168ad50ddd only show contact related snackbars when conversation is single 2016-12-01 12:50:40 +01:00
Daniel Gultsch f0f2aab92d made provider authorities relativ to deal with different package ids 2016-12-01 12:09:49 +01:00
Daniel Gultsch 96a992353b avoid binding multiple times from BarcodeService 2016-12-01 11:34:04 +01:00
Daniel Gultsch a7ec23ef30 pulled translations from transifex 2016-11-30 10:47:25 +01:00
Daniel Gultsch 1b9a91eb2f renamed foreground service preference 2016-11-30 10:45:39 +01:00
Daniel Gultsch 9d744add38 pulled translations from transifex 2016-11-29 13:51:34 +01:00
Daniel Gultsch 9e7a54849d better handle the case when same user is joined with multiple nicks in the same room 2016-11-29 13:43:52 +01:00
Daniel Gultsch 33e6d8a1ce pulled translations from transifex 2016-11-28 15:51:52 +01:00
Daniel Gultsch e5d7357e6e mark conversations as read after receiving blocklist push for that conversations 2016-11-28 15:51:11 +01:00
Daniel Gultsch 84a2fa0041 allow fingerprint verification via context menu 2016-11-28 15:11:44 +01:00
Daniel Gultsch bbe01c9a6a add support for body paramater in xmpp uri 2016-11-28 15:09:02 +01:00
Daniel Gultsch fb6f0649c3 sent messages from unverified devices show red lock 2016-11-28 15:08:33 +01:00
Daniel Gultsch fdf19ae287 pulled translations from transifex 2016-11-25 17:06:23 +01:00
Daniel Gultsch d983f0bc71 fixed migrations from pre-btbv phase 2016-11-25 17:04:23 +01:00
Mishiranu f4a769080b Add quotation support 2016-11-25 17:06:43 +03:00
Daniel Gultsch f36dff485e changed blind trust before verification summary to a slightly longer one 2016-11-24 19:59:57 +01:00
Daniel Gultsch a87f7903c6 always force close a connection when disabling from error state 2016-11-24 12:44:24 +01:00
Daniel Gultsch 6a5d2e35b5 pulled translations from transifex 2016-11-24 12:05:52 +01:00
Daniel Gultsch cbd45d3ee5 changed design language to match BTBV proposal 
* untrusted messages have red background
* unverified message have normal background and red lock
 2016-11-24 11:29:26 +01:00
Daniel Gultsch 2ec7165381 update the conversations view (and the lock icon) after receiving device list 2016-11-24 11:28:04 +01:00
Daniel Gultsch 20d3a41b52 explictly scan for aztec and qr codes only 2016-11-23 11:01:58 +01:00
Daniel Gultsch 839ef8e14b introduced blind trust before verification mode 
read more about the concept on https://gultsch.de/trust.html
 2016-11-23 10:42:27 +01:00
Daniel Gultsch 4720ac94d3 Merge branch 'master' of github.com:siacs/Conversations 2016-11-22 22:32:05 +01:00
Daniel Gultsch 07fe434cc7 added share button to account details 2016-11-22 22:31:46 +01:00
Daniel Gultsch d2268c6a6f show proper avatar for 'self' contact. fixes #2138 2016-11-22 12:34:16 +01:00
Daniel Gultsch d76b0a3104 offer verification directly from the trust keys screen 2016-11-22 12:03:21 +01:00
Daniel Gultsch 1a7e0fd153 use aztec code instead of qr 2016-11-21 12:01:01 +01:00
Daniel Gultsch 6631705aea use constants for some preferences 2016-11-21 11:03:38 +01:00
Daniel Gultsch 7b99346a4b when swiping don't clean startup counter entirely. just don't count last startup 2016-11-21 10:48:59 +01:00
Daniel Gultsch 1c31b96920 Merge pull request #2130 from da2x/patch-2 
Fix up the langauge in some Settings strings
 2016-11-20 00:39:57 +01:00
Daniel Gultsch 64e8035f6d introduced custom tls socket factory to make tls1.2 work for http connections 2016-11-20 00:39:01 +01:00
Daniel Gultsch b71aa6d3a4 remove omemo devices from annoucement after 7 days of inactivity 2016-11-19 21:39:16 +01:00
Daniel Gultsch 2614706d39 don't show omemo keys by default in account details 2016-11-19 21:32:40 +01:00
Daniel Gultsch cb639f3fdd don't use xmpp uri for self verification if account is disabled 2016-11-19 21:31:41 +01:00
Daniel Gultsch 6362799d56 save last activation time in fingerprint status 2016-11-19 13:34:54 +01:00
Daniel Gultsch 40c747660d removed some unecessary locking 2016-11-19 13:34:27 +01:00
Daniel Gultsch 8132480b82 close socket after failed stream open 2016-11-19 12:20:31 +01:00
Daniel Gultsch 3bf2876e09 check if thread was interrupted before doing operations on socket 2016-11-19 10:44:40 +01:00
Daniel Gultsch 1820b163a1 fixed regression that would crash create contact dialog. fixes #2131 2016-11-19 10:29:08 +01:00
Daniel Aleksandersen 965f73f95a Fix up the langauge in some Settings strings 2016-11-19 05:00:16 +01:00
Daniel Gultsch 2b9b3be3f1 show 'clear devices' button underneath own devices 2016-11-18 21:49:52 +01:00
Daniel Gultsch a86a36f570 removed some unecessary logging from omemo message generation 2016-11-18 20:13:09 +01:00
Daniel Gultsch 01f92ef4ee lower own otr fingerprint 2016-11-18 20:12:45 +01:00
Daniel Gultsch d68b7cfcfc issue ping after network change 2016-11-18 14:00:05 +01:00
Daniel Gultsch fef601b4ae lower reconnection time 2016-11-18 13:58:01 +01:00
Daniel Gultsch 0303c28ad9 synchronzie on xmpp service around all state changes 2016-11-18 13:58:01 +01:00
Daniel Gultsch 1ed2445c1d don't reset last connect time on network change 2016-11-18 13:55:02 +01:00
Daniel Gultsch a7ee8f8a74 use lower case otr fingerprints for comparison 2016-11-18 13:13:29 +01:00
Daniel Gultsch 9d9a9e63ad removed some very verbose logging from axolotl service 2016-11-18 13:03:02 +01:00
Daniel Gultsch 99a41265b8 lower casing fingerprints when parsing URI 2016-11-18 13:02:33 +01:00
Daniel Gultsch 211354ee26 put omemo fingerprint in own uri (qr code / nfc) 2016-11-17 22:28:45 +01:00
Daniel Gultsch 7e2e42cb11 parse omemo fingerprints from uris 2016-11-17 20:09:42 +01:00
Daniel Gultsch 3f3b360eee fixed back and forth between Welcome- and EditAccountActivity 2016-11-17 11:40:29 +01:00
Daniel Gultsch ad9a8c2281 use base64.nowrap for omemo keys 2016-11-17 10:58:44 +01:00
Daniel Gultsch 4d965e96ed reset startup count when swiped away (only count kills) 2016-11-17 10:58:26 +01:00
Daniel Gultsch d8bff08f1f slightly darken verified icon + mark inactive 2016-11-16 09:39:44 +01:00
Daniel Gultsch ec63900ef3 work around -1 in next encryption 2016-11-15 21:11:35 +01:00
Daniel Gultsch 48afeb571b refactor omemo fingerprint UI code 2016-11-15 20:00:52 +01:00
Daniel Gultsch e84af51272 distinguish between general i/o error and write exception when copying files 2016-11-15 15:43:04 +01:00
Daniel Gultsch d61b00604d fixed enabling trust toggle. unknown->untrusted 2016-11-15 15:14:21 +01:00
Daniel Gultsch 05fc15be3d refactore trust enum to be FingerprintStatus class with trust and active 2016-11-14 22:27:41 +01:00
Daniel Gultsch 6da8b50d95 increase restart threshold 2016-11-14 19:49:17 +01:00
Daniel Gultsch a753e28ad2 pulled ru translation from transifex 2016-11-13 19:26:27 +01:00
Daniel Gultsch 1d3167b520 extract affiliations from unavailable presence 2016-11-13 19:25:58 +01:00
Daniel Gultsch 035d0c7957 Stop automagically select default encryption 
Selecting a default encryption (in our case OMEMO) has several down sides.
First of all users might have perfectly valid reasons not to use encryption
at all such as using the same private server. Second of all the way it was
implemented Conversations would automatically fall back to plain text as soon
as the conditions changed (recipient switches to device with no encryption)
which lead to unexpected situations.
Thirdly having a default encryptions speaks against the 'mission
statement' of Conversations of not forcing its security and privacey
aspects upon the user.
And last but not least the goal of implementing this feature in the
first place: Be encrypted by default didn't work at all. I don't think
there was a single user that we succesfully 'tricked' into using OMEMO
who otherwise wouldn't have used it.
 2016-11-13 17:11:13 +01:00
Daniel Gultsch bec048407a offer message correction in private convs 2016-11-12 20:25:02 +01:00
Daniel Gultsch fe62ef32ae don't add outcasts or non-members in members-only rooms back to list 2016-11-12 20:21:11 +01:00
Daniel Gultsch f7c2cd4807 pulled translations from transifex 2016-11-11 15:01:31 +01:00
Daniel Gultsch e8cc959a7f don't offer message correction in anonymous mucs 2016-11-11 15:01:15 +01:00
Daniel Gultsch bb4952c89e pulled translations from transifex 2016-11-08 21:37:59 +01:00
Daniel Gultsch 698ddadbee brought restart threshold down to 8 times in 8h 2016-11-08 21:37:44 +01:00
Daniel Gultsch 1ef8d0a746 don't mark previous conversation as read when processing pending intent. fixes #2079 2016-11-08 12:42:13 +01:00
Daniel Gultsch bca8f11c9c add frequent restart detection 2016-11-08 12:20:07 +01:00
Ignacio Quezada 297c0a792f Private files using a boolean flag from Config.java. 2016-11-08 11:45:20 +01:00
Daniel Gultsch 1a57599da2 lower case incoming dns records 2016-11-08 10:14:34 +01:00
Daniel Gultsch 00b3d5ee35 Merge branch 'master' of github.com:siacs/Conversations 2016-11-08 10:08:58 +01:00
licaon-kter d341904c4d Fix typo 2016-11-08 01:46:46 +02:00
Daniel Gultsch 7978fd768e fixed regression of showing delivery failed after receipt 2016-11-07 21:57:08 +01:00
Daniel Gultsch 9edbddd7e1 show warning in account details when data saver is enabled 2016-11-07 10:49:43 +01:00
Daniel Gultsch 2c004857f6 handle file attachment when missing connection 2016-11-02 15:21:26 +01:00
Daniel Gultsch 544c5b4a21 removed unnecessary push_mode 2016-11-02 11:04:33 +01:00
Daniel Gultsch e582b9fc10 leaving low ping timeout mode after coming online 2016-11-02 09:36:14 +01:00
Daniel Gultsch 20ddba2aa9 fixed npe when jingle partner is using unknown candidate 2016-11-01 10:27:01 +01:00
Daniel Gultsch 07a71d312a extracting stanza-id where by=account 2016-10-31 12:07:08 +01:00
Daniel Gultsch a5181b22e0 always use ipv4 localhost when using orbot http proxy 2016-10-31 09:53:14 +01:00
Daniel Gultsch ffebb4677a Revert "use file provider on android M as well" 
This reverts commit a4020e85f6.
 2016-10-30 20:27:39 +01:00
Daniel Gultsch a44f35ed69 schedule correct wakeup call when in low ping timeout mode 2016-10-29 21:45:01 +02:00
Daniel Gultsch 8557120ef8 add error message to failed messages. accessible via context menu 2016-10-26 12:26:04 +02:00
Daniel Gultsch a4020e85f6 use file provider on android M as well 2016-10-23 09:03:36 +02:00
Daniel Gultsch 8c1bb058da connect instantly in low ping mode after going offline 2016-10-23 09:03:17 +02:00
Daniel Gultsch 10398cab51 don't leave low timeout mode prematurely 2016-10-20 20:04:16 +02:00
Daniel Gultsch f2696b66ba Merge branch 'feature-remove-merge-separator' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-merge-separator 2016-10-20 18:18:25 +02:00
Daniel Gultsch 52d4be4249 Merge branch 'feature-remove-spans' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-spans 2016-10-20 18:10:52 +02:00
Daniel Gultsch 0f62ff6736 introduced low ping timeout mode after gcm push 2016-10-20 18:02:11 +02:00
Daniel Gultsch 44ce5df359 write prepped string to db. use display version everywhere else 2016-10-20 17:31:46 +02:00
Mishiranu fd4e15ba97 Remove MERGE_SEPARATOR 2016-10-20 01:03:51 +03:00
Mishiranu 8835f08cf7 Remove spans on copying or pasting a text 2016-10-19 20:47:41 +03:00
Daniel Gultsch c3423d6ffe include pgp signature only in non anonymous mucs 2016-10-19 12:31:11 +02:00
Daniel Gultsch dce8149aae retrigger key selection if openpgp key was deleted 2016-10-19 11:53:55 +02:00
Daniel Gultsch 7226fc0010 update conversation in database background thread 2016-10-18 13:06:24 +02:00