moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-06 09:15:05 -05:00
Code Issues Releases Wiki Activity
3,563 Commits 5 Branches 73 Tags 39 MiB
856029a611
Commit Graph

3563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Straub
25a9d59412 Add more logging to pep attemp counter logic 2015-08-25 18:52:36 +02:00
Andreas Straub
eafcf38ec9 Limit number of PEP publish tries 
If PEP publish tries are repeatedly triggered by empty PEP updates, stop
attempting to publish after 3 tries. This should work around broken PEP
implementations in older ejabberd and OpenFire versions.
 2015-08-25 18:43:44 +02:00
Daniel Gultsch
11b9fc3191 Merge pull request #1365 from betheg/remove_imports 
remove unused imports.
 2015-08-25 14:14:13 +02:00
Daniel Gultsch
04e21660b6 Merge pull request #1364 from betheg/jdk15on 
update bcprov-jdk15on to v1.52
 2015-08-25 12:41:27 +02:00
Michael
ae9de26f59 remove unused imports. 2015-08-25 12:40:22 +02:00
Andreas Straub
b84fecf51a Pass through device IDs when updating own list 2015-08-25 12:17:09 +02:00
Daniel Gultsch
5eae1e52d2 cleared up some error messages in axolotl service and execute publishOwnDevicesWhenNeeded() only if processing our own jid 2015-08-25 11:43:10 +02:00
Michael
61c0f8adb0 update bcprov-jdk15on to v1.52 2015-08-25 11:17:05 +02:00
Daniel Gultsch
25c49d5e34 catch some db query exceptions 2015-08-25 11:12:10 +02:00
Daniel Gultsch
7617a19280 additonal null checks in file backend 2015-08-25 11:11:53 +02:00
Daniel Gultsch
476db24c10 fixed session time 2015-08-25 11:11:32 +02:00
Daniel Gultsch
dd20f41f1b Merge pull request #1363 from betheg/minidns 
update minidns to v0.1.7
 2015-08-25 11:09:11 +02:00
Michael
a898d9d5f7 update minidns to v0.1.7 2015-08-25 10:55:57 +02:00
Daniel Gultsch
919c3a47be Merge pull request #1362 from betheg/roundedimageview 
update roundedimageview to v2.2.0
 2015-08-25 10:50:39 +02:00
Michael
3552b96c8a update roundedimageview to v2.2.0 2015-08-25 10:18:00 +02:00
Daniel Gultsch
4f87413b16 Merge branch 'betheg-sdk_version' into development 2015-08-24 22:21:24 +02:00
Daniel Gultsch
120810b9ca Merge branch 'sdk_version' of https://github.com/betheg/Conversations into betheg-sdk_version 2015-08-24 22:21:04 +02:00
Daniel Gultsch
3da90638c6 version bump to 1.7.0-beta 2015-08-24 21:25:33 +02:00
Daniel Gultsch
f6374f466b increased carbon grace period to 90s 2015-08-24 21:25:04 +02:00
Daniel Gultsch
98e7d9c74e pulled translations from transifex 2015-08-24 21:24:48 +02:00
Daniel Gultsch
730a5c644b renamed plain text to unencrypted. fixes #1331 2015-08-24 21:15:47 +02:00
Daniel Gultsch
865e08401b fixed regression with mlinks stream managment. fixes #1206 2015-08-24 20:56:36 +02:00
Daniel Gultsch
fb0b4bb445 added setting to allow for white backgrounds in incoming message bubbles 2015-08-24 20:56:25 +02:00
Daniel Gultsch
d36ae091b6 Merge branch 'master' into development 2015-08-24 18:18:24 +02:00
Daniel Gultsch
d0b8bd0f8a catch invalid base64 in axolotl key parsing 2015-08-24 18:18:01 +02:00
Michael
97c28b13a6 add the the previously deleted build-tools. 2015-08-24 11:32:21 +02:00
Michael
4cc48f01df update travis.yml 2015-08-24 11:26:17 +02:00
Michael
5f0ed62833 update android sdk and support library. 
make use of the archivesBaseName and
rename only 'zipaligned' release build.
 2015-08-24 10:59:52 +02:00
Daniel Gultsch
deb9c20e5e Merge branch 'master' into development 2015-08-23 21:06:58 +02:00
Daniel Gultsch
5a53ff80fb version bump to 1.6.3 and changelog 2015-08-23 21:01:54 +02:00
Daniel Gultsch
c19adebaf0 open files with capital extensions as well. fixes #1354 2015-08-23 21:00:51 +02:00
Daniel Gultsch
91a3cee6d2 Merge branch 'master' into development 2015-08-23 19:44:58 +02:00
Daniel Gultsch
8043833156 bugfix: next encryption is now being properly detected 2015-08-23 19:40:45 +02:00
Daniel Gultsch
412efe93c0 Merge branch 'master' into development 2015-08-23 18:06:40 +02:00
Daniel Gultsch
b1f1a99190 version bump to 1.6.2 and changelog 2015-08-23 17:59:10 +02:00
Daniel Gultsch
7bd0f31244 Merge branch 'master' into development 2015-08-23 17:57:53 +02:00
Daniel Gultsch
0dfb9bd1a0 introduce special iq type for internal timeouts. always use != result to check for error in callbacks 2015-08-23 17:53:23 +02:00
Daniel Gultsch
777dd4b51e Merge branch 'master' into development 2015-08-23 17:29:46 +02:00
Daniel Gultsch
bbfd98b726 reformating 2015-08-23 17:29:31 +02:00
Daniel Gultsch
d51c4b9655 deal with another set of stream:features after bind 2015-08-23 17:26:50 +02:00
Daniel Gultsch
b0710cdf04 Merge branch 'master' into development 2015-08-23 13:57:14 +02:00
Daniel Gultsch
bea7b2bcc1 Merge pull request #1348 from betheg/zxing 
update zxing to v3.2.1
 2015-08-23 13:36:08 +02:00
Daniel Gultsch
560e63564d added changelog for 1.6.1 2015-08-23 13:29:55 +02:00
Michael
10a9bd3864 update zxing to v3.2.1 2015-08-23 13:27:06 +02:00
Daniel Gultsch
96c6c793b3 version bump to 1.6.1 2015-08-23 13:25:04 +02:00
Andreas Straub
e1dc7f990d Add error handling to OMEMO PEP code 
Log received errors and abort processing
 2015-08-23 13:23:51 +02:00
Michael
c0502c2165 remove the READ_PHONE_STATE permission. 2015-08-23 13:07:27 +02:00
Daniel Gultsch
3d6fb9b21d remove callbacks directly from iterator 2015-08-23 10:20:29 +02:00
Daniel Gultsch
1688b65965 don't make subsequent iq request when original stanza returned an error 2015-08-23 08:27:05 +02:00
Daniel Gultsch
496f531e2e modified clearIqCallbacks into 2-step process 2015-08-23 08:01:47 +02:00