Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-25 15:52:06 +01:00
Code Issues Releases Wiki Activity
3804 commits 8 branches 0 tags 34 MiB
Commit graph

3804 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Florian Schmaus
8702e57f96
Merge pull request #264 from vanitasvitae/emptyBundle 
Do not allow OMEMO bundles without prekeys
 2018-09-16 21:30:06 +02:00
Paul Schaub
2cf23892f6
Fail on parsing OMEMO bundle with missing prekeys 2018-09-16 17:40:59 +02:00
Florian Schmaus
1aa35bc957 Merge branch '4.3' of github.com:Flowdalic/Smack into 4.3 2018-09-12 20:02:16 +02:00
Florian Schmaus
87fac888c6 Improve MultiUserChat's API to query hosted rooms 
Return a Map instead of a List. This makes it possible to check for
the existence of MUC by looking up the MUC's address in the Map's key
set.
 2018-09-12 19:56:46 +02:00
Florian Schmaus
09279b8ac0 Add AbstractBlockingQueueWithShutdown.putAll(Collection) 2018-09-11 21:56:45 +02:00
Florian Schmaus
98c7ba1aa9
Merge pull request #270 from noctux/patch-2 
Documentation: debugging: The debugging jar is now named smack-debug.jar
 2018-09-11 10:01:17 +02:00
Florian Schmaus
c9523f9717
Merge pull request #269 from noctux/patch-1 
Typo in CarbonManager.java
 2018-09-11 10:00:51 +02:00
Florian Schmaus
5097f01b7a Make StreamOpen.toXML(String) 'null' aware 2018-09-11 09:42:08 +02:00
Florian Schmaus
271ac7ee7a Use PossibleFromTypeFilter for MultiUserChat's presence listener 2018-09-10 21:05:47 +02:00
Florian Schmaus
77baaa99bc Do not warn on presence from bare MUC JID in MultiUserChat 
as such presence messages became a thing in XMPP (e.g. for XEP-0153
avatars for MUC).
 2018-09-10 21:00:49 +02:00
Simon Schuster
dcd0fd87b3 Documentation: debugging: The debugging jar is now named smack-debug.jar 
The documentation states that the debugging jar is called
smackx-debug.jar. However, according to maven central, that name was
only used until 3.2.1, newer releases (including 4.4.0-alpha1) only
distribute smack-debug.jar, which contains the debugger as advertised.
 2018-09-10 11:49:51 +02:00
Simon Schuster
f23f27aa75 Typo in CarbonManager.java 
The listeners "were" registered...
 2018-09-09 22:06:43 +02:00
Florian Schmaus
105192d7e7 Only announce support for ChatMarkers if there is a listener 2018-09-06 20:24:41 +02:00
Florian Schmaus
0fa6fb946c Remove broken methods in ChatMarkersManager 2018-09-06 20:24:41 +02:00
Florian Schmaus
0778485243 Deduplicate code ChatMarkersElements 
by introducing ChatMarkerExtensionWithId.
 2018-09-06 20:24:41 +02:00
Florian Schmaus
36bfa060a5 Ensure the ID is given in ChatMarkersElements 2018-09-06 20:24:41 +02:00
Florian Schmaus
3547fde91c Rename EligibleForChatMarker to EligibleForChatMarkerFilter 2018-09-06 20:24:41 +02:00
Florian Schmaus
3f1b18636e Use Message.hasStanzaIdSet() in EligibleForChatMarker filter 2018-09-06 20:24:41 +02:00
Florian Schmaus
0b9cce507d Use asEntityBareJidOrThrow() in ChatMarkersManager listener 2018-09-06 20:24:41 +02:00
Florian Schmaus
b12f5a1591 Make MarkableExtension a singleton 
to reduce pressure on the memory subsystem.
 2018-09-06 20:24:41 +02:00
Florian Schmaus
45736e8ead Remove NORMAL_OR_CHAT_OR_GROUPCHAT MessageTypeFilter 
Type 'groupchat' message stanzas are not like others, they usually
require special handling. Hence such a filter is usually an indication
that multiple concepts are intermixed.
 2018-09-06 18:42:41 +02:00
Florian Schmaus
830f3661e7 Avoid getInstanceOf() in listener as it is a costly operation 2018-09-06 18:41:19 +02:00
Miguel Hincapie
547138b325 Improve ChatMarkersManager 
* Created filters to be used with incoming and outgoing message stanzas
* Added a list of ChatMarkersListener and its add and remove methods.
* Added a stanza listener for outgoing messages.
* Added a stanza listener for incoming messages.
* Added discover feature for XEP-0333.
* Added methods to inform a message was: received, displayed or ack
* Added javadoc autor tag.
 2018-09-06 18:39:00 +02:00
Florian Schmaus
33d01bff34 Merge branch 'master' of github.com:igniterealtime/Smack 2018-09-06 18:32:23 +02:00
Florian Schmaus
a8b682ae80
Merge pull request #268 from vanitasvitae/itemNotFoundFix 
OMEMO: properly handle item-not-found in refreshRepublishDeviceList.
 2018-09-04 23:05:53 +02:00
Paul Schaub
d50bb1df1d
OMEMO: properly handle item-not-found in refreshRepublishDeviceList. 
Fixes SMACK-830
 2018-09-02 16:23:42 +02:00
Florian Schmaus
e7372b05ea
Merge pull request #266 from jitsi/4.3 
Disconnect BOSH client on shutdown and clear client instance.
 2018-08-30 14:36:52 +02:00
Florian Schmaus
9839ff034c
Merge pull request #267 from vanitasvitae/bumpPGP 
Fix failing JUnit test by bumping PGPainless to 0.0.1-alpha4
 2018-08-30 14:36:11 +02:00
Paul Schaub
512a2375be
Fix failing JUnit test by bumping PGPainless to 0.0.1-alpha4 2018-08-30 13:30:05 +02:00
damencho
3ffdb9befd Clears bosh client instance on shutdown. Fixes SMACK-829. 2018-08-27 23:58:49 -05:00
Florian Schmaus
c0b1fee700 Add "rule of thumb" to StanzaFilter javadoc 2018-08-25 12:55:51 +02:00
Florian Schmaus
24267c532d Improve style of RosterStore 2018-08-21 13:33:45 +02:00
Florian Schmaus
0e847f34f3 Remove unused method in pubsub.Subscription 2018-08-21 12:51:52 +02:00
Florian Schmaus
7374caefef Make StringEncoder generic 2018-08-21 11:09:26 +02:00
Florian Schmaus
e91a8336f6 Remove cruft in FileBasedOpenPgpMetadataStore 2018-08-17 13:00:34 +02:00
Florian Schmaus
fb3009adb2 Add FileUtils.maybeCreateFileWithParentDirectories(File) 2018-08-17 13:00:34 +02:00
Florian Schmaus
a70ae7ab8e Add FileUtils.maybeDeleteFileOrThrow(File) 2018-08-17 13:00:34 +02:00
Florian Schmaus
affdcb0557 Add TODO comment to FileBasedOpenPgpMetadataStore 2018-08-17 13:00:33 +02:00
Florian Schmaus
d133f25ca6 Do not mask FileNotFoundException in FileBasedOpenPgpKeyStore 2018-08-17 13:00:33 +02:00