Commit graph

8375 commits

Author SHA1 Message Date
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 c62f3f99be increment version code and release version 1.15.0 2016-11-30 10:48:30 +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
Daniel Gultsch 22ca8200fa Merge branch 'master' of github.com:siacs/Conversations 2016-11-25 16:58:37 +01:00
Daniel Gultsch 988cce6320 Merge pull request #2147 from licaon-kter/patch-5
Typo in Readme
2016-11-25 16:57:43 +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
licaon-kter 6320a3ca7c Typo in Readme 2016-11-24 18:35:10 +02:00
Daniel Gultsch 43fd5e5fe6 Merge pull request #2146 from licaon-kter/patch-4
Add FAQ about the new trust concept
2016-11-24 15:39:51 +01:00
licaon-kter 84a4f4d66d Add FAQ about the new trust concept 2016-11-24 15:17:02 +02:00
Daniel Gultsch a87f7903c6 always force close a connection when disabling from error state 2016-11-24 12:44:24 +01:00
Daniel Gultsch 1e59a9517a bumped gradle to 1.15.0-beta 2016-11-24 12:06:15 +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 568d6c8392 Merge branch 'master' of github.com:siacs/Conversations 2016-11-20 00:39:25 +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