Smack

vanitasvitae/Smack

Fork 0

mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-15 20:19:39 +02:00

Commit graph

2b11074950 Merge branch '4.2' Florian Schmaus 2017-06-17 15:55:38 +02:00
813219179f Add support for <text/> elements in SM's <failed/> element Florian Schmaus 2017-06-17 11:43:49 +02:00
1448fa4632 Add ParserUtils.getXmlLang(XmlPullParser) Florian Schmaus 2017-06-17 11:42:09 +02:00
5424c9635f Add XmlStringBuilder.optXmlLangAttribute(String) Florian Schmaus 2017-06-17 11:41:35 +02:00
8038b7a3e1 Add TODO comment about renaming XMPPError to StanzaError Florian Schmaus 2017-06-17 11:41:07 +02:00
2f3de3a64d

Add Jingle File Transfer elements and JingleUtil class vanitasvitae 2017-06-17 00:56:32 +02:00
6cb23d08e0

Add Jingle File Transfer elems and providers vanitasvitae 2017-06-17 00:40:51 +02:00
fdd2ff960c Merge remote-tracking branch 'upstream/master' into jingle2 vanitasvitae 2017-06-17 00:26:59 +02:00
46b352ef88

Add JingleFileTransfer class vanitasvitae 2017-06-17 00:26:44 +02:00
f783ecab4b

Move ft to experimental, more jingleUtil stuff vanitasvitae 2017-06-17 00:17:21 +02:00
2ee10fa83b Merge branch 'JingleErrors' into jingle2 vanitasvitae 2017-06-17 00:04:13 +02:00
f80472e082

Fix reviewed points vanitasvitae 2017-06-16 23:45:00 +02:00
05148ab0ad Merge pull request #142 from vanitasvitae/jingleIBB Florian Schmaus 2017-06-16 23:32:59 +02:00
aaad697b02 Merge pull request #140 from vanitasvitae/TransportInfo Florian Schmaus 2017-06-16 23:25:23 +02:00
ddcc7aa568 Merge pull request #141 from vanitasvitae/HashManagerAdditions Florian Schmaus 2017-06-16 23:25:13 +02:00
6712cc91c8 Merge pull request #139 from vanitasvitae/JingleErrors Florian Schmaus 2017-06-16 23:19:50 +02:00
a33d596756 Merge pull request #138 from vanitasvitae/JingleReason Florian Schmaus 2017-06-16 23:19:14 +02:00
5699373cd9

Add method to set Reason vanitasvitae 2017-06-16 22:54:32 +02:00
759a7d7a70 Fix InitationListenerTest's timeouts Florian Schmaus 2017-06-16 22:51:14 +02:00
b3cec53cc5 Merge branch 'jingleS5B' into jingle2 vanitasvitae 2017-06-16 22:46:15 +02:00
0bc62e3cd9

Merge vanitasvitae 2017-06-16 22:46:07 +02:00
287976e0e0

Add Jingle InBandBytestream transports vanitasvitae 2017-06-16 22:43:50 +02:00
8488831ddc

Add Jingle SOCKS5Bytestream transport vanitasvitae 2017-06-16 22:14:42 +02:00
d1e0a4683f Merge branch 'jingleIBB' into jingle2 vanitasvitae 2017-06-16 21:55:50 +02:00
6b472d0ccd

Add JingleUtil vanitasvitae 2017-06-16 21:55:42 +02:00
3c6ca94cb4

Add Jingle InBandBytestream transports vanitasvitae 2017-06-16 21:52:20 +02:00
064af388b4

Temp jingle vanitasvitae 2017-06-16 20:24:01 +02:00
366dbf66d6

Prevent NPE in JingleManager vanitasvitae 2017-06-15 10:21:45 +02:00
b106ff8a8b

Add license header vanitasvitae 2017-06-15 10:21:16 +02:00
e6e2a6cd08

SOCKS5 WERKSgit add . vanitasvitae 2017-06-14 18:25:46 +02:00
f3c1eebd05

Should work, but doesnt vanitasvitae 2017-06-14 17:56:46 +02:00
08e897113d Add CustomImportOrder checkstyle rule Florian Schmaus 2017-06-14 17:12:43 +02:00
e33bb5a741

Reorder imports vanitasvitae 2017-06-14 00:01:05 +02:00
a604266336

Create alternative-session JingleReason vanitasvitae 2017-06-14 00:00:27 +02:00
62167a7857

Reorder imports vanitasvitae 2017-06-13 23:58:41 +02:00
4ae8434852

Remove unused errors and add missing ones vanitasvitae 2017-06-13 23:57:59 +02:00
95d2cd75ec

Reorder imports vanitasvitae 2017-06-13 23:54:47 +02:00
3ecd01135c

Add convenience methods to HashManager vanitasvitae 2017-06-13 23:51:57 +02:00
7a7b45ad9b

Change Dest.Addr vanitasvitae 2017-06-13 23:43:18 +02:00
7320d01997

So close to working socks... vanitasvitae 2017-06-13 21:59:40 +02:00
1cd59370e6

More Progress vanitasvitae 2017-06-12 16:42:46 +02:00
4feda2ffa9

Progress vanitasvitae 2017-06-12 14:44:00 +02:00
d4deaa2517

Fix bugs. JIBB works again vanitasvitae 2017-06-11 15:59:57 +02:00
7a9b819b18

Proper Statemachine vanitasvitae 2017-06-11 02:52:34 +02:00
4d11422335

Temp vanitasvitae 2017-06-10 21:45:00 +02:00
a4454aa8b5

Towards S5B! vanitasvitae 2017-06-10 18:27:41 +02:00
e5edb4cd04

remove unused code vanitasvitae 2017-06-10 17:46:57 +02:00
830b2deb2e

Fix IBB vanitasvitae 2017-06-10 17:16:22 +02:00
4728aa4452

Temp vanitasvitae 2017-06-10 15:09:30 +02:00
38f54b140c

Typo vanitasvitae 2017-06-10 01:53:59 +02:00
eda7859aa7

S5B session-initiate and -accept vanitasvitae 2017-06-10 00:07:27 +02:00
a8f172c66b

Rename classes and reuse Socks5Utils class vanitasvitae 2017-06-09 23:25:59 +02:00
327e63f52d

Fix checkstyle vanitasvitae 2017-06-09 23:16:15 +02:00
df69c8a81c

Rewrote Jingle code vanitasvitae 2017-06-09 21:35:49 +02:00
a6b27f62d2

Fix merge errorsF vanitasvitae 2017-06-08 23:47:03 +02:00
7785f3d38f Merge branch 'HashManagerAdditions' into jingle vanitasvitae 2017-06-08 18:31:10 +02:00
3b2f970a8d

Add convenience methods to HashManager vanitasvitae 2017-06-08 18:00:22 +02:00
db294f3f1b

Add functionality to create TransportElements vanitasvitae 2017-06-08 17:32:37 +02:00
6c0162c341

Reuse S5B-Managers discovery methods vanitasvitae 2017-06-08 16:46:39 +02:00
d49dc71bae

Add JingleContentTransportInfo class vanitasvitae 2017-06-08 15:04:25 +02:00
135f1ed77b

Add proxy discovery method vanitasvitae 2017-06-08 14:59:49 +02:00
1775c691af

Create JingleTransportManager framework vanitasvitae 2017-06-08 01:59:38 +02:00
05b0e3650e

Introduce JingleSocks5TransportInfo class vanitasvitae 2017-06-08 00:48:23 +02:00
f528e4dd9d Merge branch 'TransportInfo' into jingle vanitasvitae 2017-06-07 23:29:03 +02:00
9eba23c733

Add JingleContentTransportInfo class vanitasvitae 2017-06-07 23:26:38 +02:00
bfd3fbdc5b

Progress vanitasvitae 2017-06-07 23:18:23 +02:00
8240e92c3e

Add S5B providers vanitasvitae 2017-06-07 21:08:08 +02:00
2686fc1ccb

Proper(er) implementation vanitasvitae 2017-06-06 16:51:45 +02:00
83cedbe00f Merge remote-tracking branch 'upstream/master' into jingle vanitasvitae 2017-06-05 19:07:13 +02:00
acc98b4b2f Merge pull request #137 from vanitasvitae/jingleTests Florian Schmaus 2017-06-05 19:06:29 +02:00
eb5b51165e Merge remote-tracking branch 'upstream/master' into jingle vanitasvitae 2017-06-05 12:38:46 +02:00
349d1ba2ae Merge pull request #136 from vanitasvitae/jingleManagerFixes Florian Schmaus 2017-06-05 11:04:52 +02:00
3a4f758b6a

Fix jingle ft vanitasvitae 2017-06-05 00:27:03 +02:00
23190604bd

Fix typos and xml issues vanitasvitae 2017-06-04 20:41:27 +02:00
491db53f89

Send/recv works vanitasvitae 2017-06-04 20:33:44 +02:00
598c193408

Progress vanitasvitae 2017-06-04 17:18:40 +02:00
e6d365fb92 Merge branch 'jingleManagerFixes' into jingle vanitasvitae 2017-06-04 15:51:07 +02:00
37c6961bb0

Fix typos and xml issues vanitasvitae 2017-06-04 15:49:06 +02:00
4b50e44135 Merge branch 'jingleManagerFixes' into jingle vanitasvitae 2017-06-04 13:05:05 +02:00
1da1f6a712

Fix typos and xml issues vanitasvitae 2017-06-04 13:02:57 +02:00
f7775bf053 Merge pull request #135 from vanitasvitae/securityInfo Florian Schmaus 2017-06-04 10:12:20 +02:00
55ae8193b7 Merge pull request #134 from vanitasvitae/hashes Florian Schmaus 2017-06-04 10:11:59 +02:00
d231024547

Fix errors vanitasvitae 2017-06-04 00:06:37 +02:00
ff96a7c336 Merge branch 'jingleTests' into jingle vanitasvitae 2017-06-03 23:48:05 +02:00
0a31161950

Add tests for jingle classes vanitasvitae 2017-06-03 23:46:29 +02:00
efdf6d7db8

Merge fixes (wip) vanitasvitae 2017-06-03 23:38:46 +02:00
9e064a9feb Merge branch 'securityInfo' into jingle vanitasvitae 2017-06-03 23:32:26 +02:00
ea3b1cbccc

Fix typos and xml issues vanitasvitae 2017-06-03 23:30:37 +02:00
23ed0bdbce

Add missing security-info in JingleAction vanitasvitae 2017-06-03 23:23:23 +02:00
28f3130cf9

Add Use of Cryptographic Hashfunctions (XEP-300) vanitasvitae 2017-06-03 00:33:56 +02:00
1bf8cf9a12

Add missing jingle action, some comments vanitasvitae 2017-06-02 21:47:20 +02:00
9d34cbc6f3 Merge remote-tracking branch 'upstream/master' into jingle vanitasvitae 2017-06-02 18:48:02 +02:00
df216b2141

More progress vanitasvitae 2017-06-02 18:45:11 +02:00
f5ef42ec56 Merge branch '4.2' Florian Schmaus 2017-06-02 13:51:56 +02:00
e86700b040 Add OMEMO support vanitasvitae 2017-06-02 12:26:37 +02:00
ce36fb468c Increase getSocket() timeout in Socks5ClientForInitiatorTest Florian Schmaus 2017-05-25 11:59:45 +02:00
cf9dc49bee

Progress. Add Checksum element + provider (wip) vanitasvitae 2017-06-01 16:49:58 +02:00
1a16565697

Add some listeners and callbacks vanitasvitae 2017-06-01 13:43:17 +02:00
9e1f777332

Simplify providers, add JingleSessionTest vanitasvitae 2017-06-01 02:02:40 +02:00
306a7bc0ff

Add Jingle Tests vanitasvitae 2017-06-01 01:25:39 +02:00