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

4718 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Schmaus
32a38c4e77 [core] Check if the successor vertex exists in StateDescriptorGraph 
If the successor's module is disabled then the vertex may be null. In
this case, we can simple continue with the next successor in the list.

Previously, due to d33a5a23c3 ("[core] Introduce
Builder.failOnUnknownStates() and unit tests") this would trigger an
assert in addOutgoingEdge().

Fixes: d33a5a23c3 ("[core] Introduce Builder.failOnUnknownStates() and unit tests")
 2021-08-22 16:30:30 +02:00
Florian Schmaus
a0b9279441 [sinttest] Add "compatibility mode" setting 2021-08-22 16:16:03 +02:00
Dan Caseley
48c057ab10 [sinttest] Additional tests for s5 of XEP-0045 
Modified-by: Florian Schmaus <flo@geekplace.eu>
 2021-08-22 15:29:07 +02:00
Florian Schmaus
98d530819f
Merge pull request #488 from vanitasvitae/bumpPgpainless 
OpenPGP: Bump PGPainless to 0.2.8
 2021-08-10 16:49:46 +02:00
Paul Schaub
9e33fc56e1
Bump PGPainless to 0.2.8 2021-08-10 15:23:49 +02:00
Paul Schaub
9c5b0a2a16
Bump Bouncycastle to 1.69 2021-08-10 14:51:52 +02:00
Florian Schmaus
b9be45ae2c [xdata] Fix ProtectedMembersInFinalClass Error Prone warning 2021-08-03 22:07:04 +02:00
Florian Schmaus
59d3d75a71 Merge branch '4.4' 2021-08-03 21:54:50 +02:00
Florian Schmaus
b47225c2c1 [caps] Use the raw character data of form fields when caclulating the hash 2021-07-18 17:22:06 +02:00
Florian Schmaus
097d245358 [xdata] Safe the raw character data of form field values 2021-07-18 17:21:50 +02:00
Florian Schmaus
4643d07ef4 [xdata] Add missing ensureAtMostSingleValue() to parseBooleanFormField 2021-07-18 17:20:50 +02:00
Florian Schmaus
a057db107e [ox-im] Annotate sporadically failing assertTrue() 2021-07-16 08:56:48 +02:00
Florian Schmaus
f64288ba6d [sinttest] Treat NPE as test failure not as abort condition 2021-07-16 08:56:48 +02:00
Florian Schmaus
c9af25c674
Merge pull request #483 from guusdk/SMACK-908_debugger-tabs 
SMACK-908: Don't use components to count tabs in Debugger
 2021-07-08 12:03:31 +02:00
Guus der Kinderen
0a8da1a07f SMACK-908: Don't use components to count tabs in Debugger 
Although the amount of components in a JTabbedPane apparently is often equal to the amount of tabs in it, that need not be the case.
 2021-07-08 10:32:19 +02:00
Florian Schmaus
56507a761f Smack 4.4.3 
-----BEGIN PGP SIGNATURE-----
 
 iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAmDkTYtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
 NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
 IFJ5lwf/eOMA+WdaddTsn/uQj0dq7Qhtt89Zj02bW1zIF6isYs8boGGtOqaQkcqa
 Cc1hLXVg725f8UU6wTy+5MRTUG/vj8/SH/1zbrgI1oizOv0Ug+ipBy5wzM1i5Om7
 1PVpy2yH9UHVXljt9ejUo+WcC/UQSy2REQ4gzm+aTox74lW/rC99NAFa98vr7uHf
 YZAmEp/vAfI0mRymrYxgir/M0aeCY20Dlo2xvUZbugq7Nm6tIHbELm8g6M52XYkw
 7T6VB5W/2p+IZH4itgtfuiQk4jTgkn9T6oVAZzw3kufv0DCuNN9dMtIIfJwXwOv9
 jgv76LBZPzL18lhBDfxyyG0ws97O+A==
 =EZ8x
 -----END PGP SIGNATURE-----

Merge tag '4.4.3'

Smack 4.4.3
 2021-07-06 14:51:29 +02:00
Florian Schmaus
524e4b1d9b Smack 4.4.3 2021-07-06 14:33:15 +02:00
Florian Schmaus
d33a5a23c3 [core] Introduce Builder.failOnUnknownStates() and unit tests 
The previous approach of emitting a severe log message when a
state (descriptor) was unknown was misleading. There are valid cases
where some states are not known, if, for example, a module was
explicitly disabled.

Using Builder.failOnUnknownStates() in unit tests is far cleaner, as
the existence of unknown states is tested in a controlled environment:
one where are states are supposed to be known.
 2021-07-06 14:06:39 +02:00
Florian Schmaus
b6c8754012 Merge branch '4.4' 2021-07-06 13:38:56 +02:00
Florian Schmaus
31e4e1faf2 Do not call XmlPullParser.getName() when the event is unknown 
XmlPullParser.getName() only returns a result if the current parser
event is START_ELEMENT or END_ELEMENT. If this is not the case, then
the method may throw (if StAX is used).
 2021-07-06 13:37:57 +02:00
Florian Schmaus
5eef31e49c Do not call XmlPullParser.getName() when the event is unknown 
XmlPullParser.getName() only returns a result if the current parser
event is START_ELEMENT or END_ELEMENT. If this is not the case, then
the method may throw (if StAX is used).
 2021-07-06 12:33:11 +02:00
Florian Schmaus
4120b42761 [omemo] Add OmemoManager.purgeEveryting() 
This is basically the already existing method from
OmemoManagerSetupHelper.cleanUpPubSub() moved over into OmemoManager
as purgeEverything().
 2021-07-06 12:31:47 +02:00
Florian Schmaus
3fde4830e4 Merge branch '4.4' 2021-06-25 15:08:36 +02:00
Florian Schmaus
2762325639 [repl] Bump Scala to 2.13.6 and Ammonite to 2.4.0 2021-06-21 15:04:26 +02:00
Florian Schmaus
6434e77336 [sinttest] Use correct camel case in method name: s/MUC/muc/ 
See also https://google.github.io/styleguide/javaguide.html#s5.3-camel-case
 2021-06-21 14:52:18 +02:00
Florian Schmaus
2e18442b11
Merge pull request #475 from Fishbowler/xep-0045-coverage-part1 
[sinttest] Refactor MUC tests ready to add more
 2021-06-21 14:45:51 +02:00
Florian Schmaus
b3e1082c09
Merge pull request #479 from Fishbowler/doc_updates 
Various doc additions
 2021-06-21 14:45:22 +02:00
Dan Caseley
e0754df043 [doc] Initial IDE config guide 2021-06-16 17:48:59 +01:00
Dan Caseley
7b3bd6ff96 [doc] Fix config example in MUC doc 2021-06-16 16:34:11 +01:00
Dan Caseley
a0b8ad98c9 [doc] Add debugging section to sinttest doc 2021-06-16 16:33:41 +01:00
Florian Schmaus
82d5ee6ac4
Merge pull request #476 from Fishbowler/doc_updates 
[doc] Fix some wording in integrationtest.md
 2021-06-15 16:26:46 +02:00
Dan Caseley
cedced5b13 [doc] Fix some wording in integrationtest.md 2021-06-15 13:15:30 +01:00
Dan Caseley
cd6ff363c6 [sinttest] Refactor MUC tests ready to add more 2021-06-15 13:03:46 +01:00
Florian Schmaus
8692c0187e
Merge pull request #474 from vanitasvitae/pgpainless_0_2_0 
Bump PGPainless to 0.2.0
 2021-06-05 21:50:26 +02:00
Paul Schaub
340ef42736
Bump PGPainless to 0.2.0 2021-06-05 21:27:47 +02:00
Florian Schmaus
899813a668
Merge pull request #467 from Flowdalic/4.4-data-forms 
Proposed data form updates for 4.4
 2021-06-04 20:58:57 +02:00
Florian Schmaus
26e6efa767 [address] Fix NPE in MultipleRecipientManager 
The arguments 'to', 'cc, and 'bcc' may be null, hence ensure that they
are non-null when calling e.g. size() on them.

Fixes SMACK-907

Fixes: df96c57093 ("[address] Get rid of PacketCopy workaround")
 2021-06-03 19:10:07 +02:00
Florian Schmaus
4f2d8e8d4c
Merge pull request #473 from Flowdalic/coveralls 
[ci] Re-enable coveralls
 2021-05-22 20:21:23 +02:00
Florian Schmaus
b52e02740b [ci] Re-enable coveralls 2021-05-22 13:32:03 +02:00
Florian Schmaus
e9ca16ed12 [websocket-java11] Add test 2021-05-22 13:32:03 +02:00
Florian Schmaus
8d74873925 Merge branch '4.4' 2021-05-20 14:39:32 +02:00
Florian Schmaus
4eb5869860 [build] Remove markdown-gradle-plugin 2021-05-20 14:38:16 +02:00
Florian Schmaus
39b211cde3 [muc] Use StanzaCollector.nextResultBlockForever() in MultiUserChat.nextMessage() 2021-05-12 10:18:17 +02:00
Florian Schmaus
602aafe119 [fix-a-javadoc] Modernize, tell xargs to run in parallel 2021-05-12 10:14:02 +02:00
Florian Schmaus
b0729d83a8 [jingle] Do not call nextResult() in JingleUtil 
StanzaCollector.nextResult() will not cancel the related stanza
collector potentially causing a resource leak.
 2021-05-12 10:12:59 +02:00
Florian Schmaus
aab48570c9 Call XMPPConnection.sendIqRequestAndWaitForResponse(IQ) where possible 
Refactored using

find . -type f -name "*.java" |\
	 xargs sed -i -E |\
		's/\.createStanzaCollectorAndSend\((\w+)\)\.nextResultOrThrow\(\);/.sendIqRequestAndWaitForResponse(\1);/'

and some manual refactoring.
 2021-05-12 10:12:40 +02:00
Florian Schmaus
c9ea1c11b6 [search] Return and expect the high-level forms API types 2021-05-02 22:02:40 +02:00
Florian Schmaus
6ec654ad1e [muc] Fix javadoc of MultiUserChat.getConfigurationForm() 
This method no longer returns null.
 2021-05-02 22:02:00 +02:00
Florian Schmaus
1fee87b24d [openpgp] Do not catch Exception, catch the expected exception types 2021-05-02 18:45:25 +02:00
Florian Schmaus
5e43ef550f [openpgp] Improve control-flow logic in PainlessOpenPgpProvider 
Also remove superfluous toString().
 2021-05-02 18:45:25 +02:00