Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-14 11:42:04 +01:00
Code Issues Releases Wiki Activity
3693 commits 8 branches 0 tags 34 MiB
Commit graph

3693 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Schmaus
4358251e89 Merge branch '4.3' 2018-11-14 15:02:24 +01:00
asokolov
2900c5ae23 Move xml-not-well-formed (RFC 3920) condition handling to StreamError 
Fixes SMACK-842.
 2018-11-14 14:53:04 +01:00
Florian Schmaus
b705355e3d Add IntegrationTestRosterUtil 2018-11-11 17:10:40 +01:00
Florian Schmaus
5c090c35d4 Ensure sync listeners not being called after they removed themselves 2018-11-11 16:55:57 +01:00
Florian Schmaus
004b849bc3 Improve Roster documentation (roster.md) 2018-11-11 16:55:57 +01:00
Florian Schmaus
e835db15a5
Merge pull request #262 from vanitasvitae/mood 
Add support for XEP-0107: User Mood
 2018-11-11 16:55:33 +01:00
Florian Schmaus
41284b9e8b
Merge pull request #282 from vanitasvitae/rosterIntTestOmemo 
Utilize RosterIntegrationTest methods
 2018-11-11 16:42:32 +01:00
Paul Schaub
22e3f463fa
Utilize RosterIntegrationTest methods 
Use RosterIntegrationTest.ensureBothAccountsAreSubscribedToEachOther() to subscribe users to another.
 2018-11-11 16:32:45 +01:00
Paul Schaub
cc1bee4659
SMACK-828: Add support for XEP-0107: User Mood 2018-11-11 16:13:41 +01:00
Florian Schmaus
62795112d7
Merge pull request #281 from vanitasvitae/fixDocuLinks 
Update jingle link and fix formatting
 2018-11-10 23:54:05 +01:00
Paul Schaub
ada64e170d
Update jingle link and fix formatting 2018-11-10 21:13:02 +01:00
Florian Schmaus
49b7e8b905
Merge pull request #280 from MarcelHeckel/bosh_connection_with_compression 
Enables the HTTP compression in JBOSH
 2018-11-09 13:52:16 +01:00
Marcel Heckel
1ea10831b6 Enables the HTTP compression in JBOSH 
Adds an extra parameter "compressionEnabled" to ConnectionConfiguration
that is used to set the setCompressionEnabled() of BOSHClientConfig
 2018-11-08 13:36:45 +01:00
Florian Schmaus
0adcf889bf
Merge pull request #278 from vanitasvitae/omemoFileBasedStoreUrlEncode 
Use new BareJidEncoder class in FileBasedOmemoStore
 2018-11-08 07:38:43 +01:00
Paul Schaub
9302b08854
Use new BareJidEncoder class in FileBasedOmemoStore 2018-11-07 18:17:25 +01:00
Florian Schmaus
b7ea226c56 Bump "Error Prone" to 2.3.2 
and gradle-errorprone-plugin to 0.6.
 2018-10-31 16:06:31 +01:00
Florian Schmaus
ec7badfda0 Add scala code to smack-repl 2018-10-31 14:24:49 +01:00
Florian Schmaus
04f7b0a9c8 Bump Ammonite REPL to 1.3.2 2018-10-27 15:41:17 +02:00
Florian Schmaus
446b0bb5a9
Merge pull request #277 from vanitasvitae/oxDirectoryFix 
Use URL-encoded bareJid in file-based store implementations
 2018-10-26 13:03:39 +02:00
Paul Schaub
d88e03d70c
Use URL-encoded bareJid in file-based store implementations 2018-10-26 10:08:29 +02:00
Florian Schmaus
77f3864ea8 Bump jxmpp to 0.7.0-alpha5 2018-10-22 20:43:36 +02:00
Florian Schmaus
367580d37b Make sure StanzaCollector is cancelled 
even if nextResult(long) throws an InterruptedException when called in
nextResultOrThrow(long).
 2018-10-22 11:34:49 +02:00
Florian Schmaus
06956a36b9 Bump jxmpp to 0.7.0-alpha3 2018-10-21 10:21:54 +02:00
Florian Schmaus
2ee621ed10 Factor NickProvider in extra file and fill under correct package 2018-10-21 09:31:15 +02:00
Florian Schmaus
382057f520 Make Nick immutable 2018-10-21 09:01:54 +02:00
Florian Schmaus
2f1f0b6c1a Clear comments in Nick 2018-10-21 08:58:33 +02:00
Florian Schmaus
c053f5a41b Escape nickname in Nick.toXML() 2018-10-21 08:58:16 +02:00
Florian Schmaus
00ce194109 Use Enum.toString() instead of Enum.name() in XmlStringBuilder.optElement() 2018-10-19 11:12:57 +02:00
Florian Schmaus
01f9b228f2 Consider enclosing namespace in Stream Management elements 2018-10-18 21:05:23 +02:00
Florian Schmaus
808bb97332 Bump MiniDNS to 0.4.0-alpha3 2018-10-15 16:00:10 +02:00
Florian Schmaus
86e16c9412 Bump MiniDNS to 0.4.0-alpha2 2018-10-14 14:32:01 +02:00
Florian Schmaus
f94c6cd970 Bump jxmpp to 0.7.0-alpha2 2018-10-14 14:31:47 +02:00
Florian Schmaus
ab120691cb Smack 4.3.1 
-----BEGIN PGP SIGNATURE-----
 
 iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAlvDIBdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
 NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
 IFKObAgApvEwstvSXhgzlrA46DM6fXezbPEnO1rh8rCPJEAsmfBSnyINSuuhelzw
 zN8L7GAU0jDeuDivxA12vQx5QB8wuCHKgc5pXDKNRi9eUdsyDUMKswcbMMAJWDvq
 I3bm7TOC1D9ZWmfhGmqfulrsVD1Q0wh+P2A1/CWVR5ZZUB5S4fESFZUrnCfJmeXe
 f+INXUiui3otAF6nPxKm782rSfHWvA32i4Obnagh3oPX/c9R7Ftb78Wukrsbaqfg
 +a5iTlBJXLG75/Yozq+JqmWlUvEKv7le0vkF5fF+oc76H4p1U1wqQyIMei/Pwaer
 H/SyMqLPzCiwpUHiunpWD13e5kkeLw==
 =47on
 -----END PGP SIGNATURE-----

Merge tag '4.3.1'

Smack 4.3.1
 2018-10-14 14:31:31 +02:00
Florian Schmaus
5f05da2f77 Smack 4.3.2-SNAPSHOT 2018-10-14 14:22:00 +02:00
Florian Schmaus
6a43481320 Smack 4.3.1 2018-10-14 12:53:11 +02:00
Florian Schmaus
cf22371d3e Catch IllegalArgumentException in XmlUtil clinit 
Fixes SMACK-833.
 2018-10-14 12:10:50 +02:00
Florian Schmaus
ec982f65e2 Fix IndexOutOfBoundsException in FormField.getFirstValue() 
Fixes SMACK-838.
 2018-10-14 12:07:51 +02:00
Florian Schmaus
89c9a41863 Bump MiniDNS to 0.3.3 2018-10-14 11:57:50 +02:00
Florian Schmaus
85731fbe3e
Merge pull request #275 from spslinger/fix-getPresence-ConcurrentModificationException 
Fix getPresence ConcurrentModificationException
 2018-10-11 14:11:02 +02:00
spslinger
1e21ab763c
Fix getPresence ConcurrentModificationException 
Fix for SMACK-841

Since Smack 4.2.4, the getPresencesInternal method in the Roster class
can return a LruCache object, which is a LinkedHashMap with access
order. This means that any access using get or getOrDefault will be a
modification of the Map. If you loop over the keySet of the Map and
there are more than one, the second call to get will throw a
ConcurrentModificationException!

Since the keys are only used here to obtain the corresponding
values, the simplest solution is to just loop over the values instead.
 2018-10-11 12:29:32 +02:00
Florian Schmaus
a6776e25bb
Merge pull request #273 from vanitasvitae/omemoMessageCounter 
OMEMO: Add Message Counter Logic
 2018-10-10 15:01:52 +02:00
Paul Schaub
410c652074
Add integration test and fix checkstyle issues 2018-10-10 14:48:22 +02:00
Paul Schaub
378aa4b262 Business logic for handling read-only devices 2018-10-10 14:07:23 +02:00
Paul Schaub
afb432dcee Add store methods for message counters 2018-10-10 14:07:23 +02:00
Florian Schmaus
082540c633 Enable Xwerror for smack-android-extensions 2018-10-07 09:55:36 +02:00
Florian Schmaus
eab5682a03 Improve javadoc of ServerPingWithAlarmManager 2018-10-07 09:46:39 +02:00
Florian Schmaus
b60a772df1 Remove unnecessary getNamespace() call in XmlStringBuilder 2018-10-03 20:09:56 +02:00
Florian Schmaus
127510692d Remove unnecessary supress "deprecation" warning in ReconnectionManager 2018-10-03 20:09:19 +02:00
Florian Schmaus
e4aacf3e77
Merge pull request #271 from beedle-/master 
Fix example for Establishing a Connection
 2018-10-02 20:52:21 +02:00
Bastien Rouiller
864cc0050c Fix example for Establishing a Connection 2018-10-02 11:13:17 +02:00