vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
3,239 Commits 61 Branches 35 Tags 36 MiB
Commit Graph

3239 Commits

Author SHA1 Message Date
vanitasvitae 9d6a858b23
So close... 2017-06-26 23:18:34 +02:00
vanitasvitae 69b3f5837e
Rewrote S5BTransportSession 2017-06-26 18:05:17 +02:00
vanitasvitae 5eba48b7d8 Merge branch 'singleJingleTransport' into jingle2 2017-06-26 15:05:40 +02:00
vanitasvitae 20eabca1b3
Also replace list with single transport-info info 2017-06-26 15:04:22 +02:00
vanitasvitae 0952c20a5c
Coming closer... 2017-06-25 23:19:35 +02:00
vanitasvitae daa6b6b999
Some bugfixes 2017-06-25 22:18:19 +02:00
vanitasvitae 04e898083c
Much progress, such wow 2017-06-25 16:59:09 +02:00
vanitasvitae d7cf19aca7
Add createCandidateUsed 2017-06-25 16:39:02 +02:00
vanitasvitae a3d6562791
Even more progress 2017-06-25 16:28:59 +02:00
vanitasvitae 5ebd07ac3c
More progress 2017-06-25 15:13:56 +02:00
vanitasvitae 09548855dd
Progess 2017-06-25 14:25:17 +02:00
vanitasvitae ad32393b61 Merge branch 'fixMUC' into jingle2 2017-06-25 12:32:57 +02:00
vanitasvitae 76e40e2682
Fix muc receiving 
The method OmemoManager.getSender() was faulty and returned null for MUC
occupants, which lead to NPEs when receiving MUC messages with OMEMO.
 2017-06-25 11:31:11 +02:00
vanitasvitae 699a19d3c2
Add S5B candidate accept/error 2017-06-24 17:46:03 +02:00
vanitasvitae a101de29fd
JIBB works 2017-06-24 12:14:05 +02:00
vanitasvitae c4ef2c9552
Temp 2017-06-23 23:41:40 +02:00
vanitasvitae 136af25342
Add JingleTransportSession classes 2017-06-23 22:48:28 +02:00
vanitasvitae ab82a58e0f Merge branch 'fixProxyTest' into jingle2 2017-06-23 13:01:50 +02:00
vanitasvitae 847a39b6ab
Fix shouldPreserveAddressOrderOnInsertions test 
The test failed because the ArrayList - in contrast to the underlying Set - did not check for duplicates on insert. Under certain circumstances this lead to an index out
of bounds exception because the list in the test contained duplicated entries which were not present in the set of the Socks5Proxy.
I fixed the issue by only inserting the address when it was not in the list before.
 2017-06-23 12:51:07 +02:00
vanitasvitae cb3583e510
IBB sending works using worker thread 2017-06-22 14:47:39 +02:00
vanitasvitae 5dc37ab239
Fixed some sending issues 2017-06-21 18:03:31 +02:00
vanitasvitae 4f03cf9a24
Add send method 2017-06-21 17:34:34 +02:00
vanitasvitae 4649defe4f
Add license 2017-06-21 16:16:52 +02:00
vanitasvitae 4c7feeb11b
Receive in thread 2017-06-21 16:16:27 +02:00
vanitasvitae 6a4695b6c6
Receive file 2017-06-21 16:11:13 +02:00
vanitasvitae 7f04265bb9
Some improvements 2017-06-21 15:54:20 +02:00
vanitasvitae ecd29a1ea8
s5b createTransport 2017-06-21 15:42:00 +02:00
vanitasvitae 4c1ee37ea7
Reuse S5B methods 2017-06-21 15:28:32 +02:00
vanitasvitae 6023350364
Progress 2017-06-21 14:11:42 +02:00
vanitasvitae 9da555f57e Merge branch 'singleJingleTransport' into jingle2 2017-06-21 13:44:27 +02:00
vanitasvitae e2b8ffdf22
Switch to single transport instead of list 2017-06-21 13:42:02 +02:00
vanitasvitae 16a7f31a46
Add sendingThread 2017-06-21 00:16:47 +02:00
vanitasvitae 96197d4092
Add transport replace actions 2017-06-19 19:22:59 +02:00
vanitasvitae 2bac6297ee
Split JingleFileTransferSession in incoming and outgoing 2017-06-19 17:55:04 +02:00
vanitasvitae 73f9af474e
Send session-accept/decline 2017-06-19 15:26:10 +02:00
vanitasvitae e0a54c19d6
First state representing stuff 2017-06-19 14:44:35 +02:00
vanitasvitae 1912ebb8d0
Join JingleSession and Handler in JingleFT 2017-06-19 10:47:24 +02:00
vanitasvitae b14aca744f
Add Jingle SOCKS5Bytestream transport method 2017-06-19 10:11:08 +02:00
vanitasvitae b91a9c120f
More ground work 2017-06-18 16:47:49 +02:00
vanitasvitae dcb5da76d6 Merge branch 'jingleFTElements' into jingle2 2017-06-18 14:12:04 +02:00
vanitasvitae e5502564b1
Add more errors 2017-06-18 14:11:37 +02:00
vanitasvitae 49868ecdaf Merge branch 'jingleFTElements' into jingle2 2017-06-18 13:08:56 +02:00
vanitasvitae d3af7cd9c1
Add creating methods to JingleUtil 2017-06-18 13:08:09 +02:00
vanitasvitae d0701f8fd1 Merge branch 'jingleS5B' into jingle2 2017-06-18 12:32:08 +02:00
vanitasvitae 781e809390
Merge jingleFTElements 2017-06-18 12:31:54 +02:00
vanitasvitae 21435a72c5
Reorder imports 2017-06-18 12:29:44 +02:00
vanitasvitae 20e6580469 Merge remote-tracking branch 'upstream/master' into jingleFTElements 2017-06-18 12:11:17 +02:00
vanitasvitae 3c4441af4f
Reorder imports 2017-06-18 12:08:47 +02:00
vanitasvitae 93a363377e Merge remote-tracking branch 'upstream/master' into jingleS5B 2017-06-18 12:05:15 +02:00
vanitasvitae d34539126b
Fix import order 2017-06-18 11:52:56 +02:00