Commit Graph

3374 Commits

Author SHA1 Message Date
Florian Schmaus 858ba3f82a Fix HTTP File Upload's SlotRequest
Fixes SMACK-774. Thanks to Nathan Freitas for reporting this.
2017-07-05 18:27:47 +02:00
vanitasvitae a3bb7e3f59
Merge master 2017-07-05 13:00:21 +02:00
Florian Schmaus 6775cf862d Merge pull request #146 from vanitasvitae/fixProxyTest
Fix shouldPreserveAddressOrderOnInsertions test
2017-07-05 08:33:12 +02:00
vanitasvitae 99c1c93c2a 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-07-04 21:50:08 +02:00
vanitasvitae 55d41e3390
More tests 2017-07-03 15:22:34 +02:00
Florian Schmaus 12a8645864 Merge pull request #148 from vanitasvitae/js5btbFixes
Enforce jingle s5b transport invariants.
2017-07-03 11:48:17 +02:00
Florian Schmaus e87c463927 Merge pull request #147 from vanitasvitae/fixMUC
Fix OMEMO MUC receiving
2017-07-03 11:48:03 +02:00
Florian Schmaus cd2d55944f Merge pull request #144 from vanitasvitae/jingleFTElements
Add Jingle File Transfer elements and JingleUtil class
2017-07-03 11:46:23 +02:00
Florian Schmaus ddabe439b4 build.gradle: Add hint about obtaining system console
with newer Gradle versions and the Gradle daemon.
2017-07-03 11:07:27 +02:00
Florian Schmaus b0298619ba build.gradle: Use "def console"
as otherwhise there may be a GroovyCastException:

org.codehaus.groovy.runtime.typehandling.GroovyCastException: Cannot cast object 'java.io.Console@148b13e5' with class 'java.io.Console' to class 'org.gradle.api.tasks.Console'
        at build_5dq456k95ni7h1f54hn45uzb7$_run_closure2.doCall(/home/flo/data/code/smack/build.gradle:194)
        at org.gradle.listener.ClosureBackedMethodInvocationDispatch.dispatch(ClosureBackedMethodInvocationDispatch.java:40)
        at org.gradle.listener.ClosureBackedMethodInvocationDispatch.dispatch(ClosureBackedMethodInvocationDispatch.java:25)
        at org.gradle.internal.event.AbstractBroadcastDispatch.dispatch(AbstractBroadcastDispatch.java:42)
        at org.gradle.internal.event.BroadcastDispatch$SingletonDispatch.dispatch(BroadcastDispatch.java:221)
        at org.gradle.internal.event.BroadcastDispatch$SingletonDispatch.dispatch(BroadcastDispatch.java:145)
        at org.gradle.internal.event.AbstractBroadcastDispatch.dispatch(AbstractBroadcastDispatch.java:58)
        at org.gradle.internal.event.BroadcastDispatch$CompositeDispatch.dispatch(BroadcastDispatch.java:315)
        at org.gradle.internal.event.BroadcastDispatch$CompositeDispatch.dispatch(BroadcastDispatch.java:225)
        at org.gradle.internal.event.ListenerBroadcast.dispatch(ListenerBroadcast.java:138)
        at org.gradle.internal.event.ListenerBroadcast.dispatch(ListenerBroadcast.java:35)
        at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:93)
        at com.sun.proxy.$Proxy59.graphPopulated(Unknown Source)
        at org.gradle.execution.taskgraph.DefaultTaskGraphExecuter.execute(DefaultTaskGraphExecuter.java:111)
        at org.gradle.execution.SelectedTaskExecutionAction.execute(SelectedTaskExecutionAction.java:37)
        at org.gradle.execution.DefaultBuildExecuter.execute(DefaultBuildExecuter.java:37)
        at org.gradle.execution.DefaultBuildExecuter.access$000(DefaultBuildExecuter.java:23)
        at org.gradle.execution.DefaultBuildExecuter$1.proceed(DefaultBuildExecuter.java:43)
        at org.gradle.execution.DryRunBuildExecutionAction.execute(DryRunBuildExecutionAction.java:32)
        at org.gradle.execution.DefaultBuildExecuter.execute(DefaultBuildExecuter.java:37)
        at org.gradle.execution.DefaultBuildExecuter.execute(DefaultBuildExecuter.java:30)
        at org.gradle.initialization.DefaultGradleLauncher$RunTasksAction.execute(DefaultGradleLauncher.java:230)
        at org.gradle.initialization.DefaultGradleLauncher$RunTasksAction.execute(DefaultGradleLauncher.java:227)
        at org.gradle.internal.Transformers$4.transform(Transformers.java:169)
        at org.gradle.internal.progress.DefaultBuildOperationExecutor.run(DefaultBuildOperationExecutor.java:106)
        at org.gradle.internal.progress.DefaultBuildOperationExecutor.run(DefaultBuildOperationExecutor.java:56)
        at org.gradle.initialization.DefaultGradleLauncher.doBuildStages(DefaultGradleLauncher.java:161)
        at org.gradle.initialization.DefaultGradleLauncher.doBuild(DefaultGradleLauncher.java:112)
        at org.gradle.initialization.DefaultGradleLauncher.run(DefaultGradleLauncher.java:95)
        at org.gradle.launcher.exec.GradleBuildController.run(GradleBuildController.java:66)
        at org.gradle.tooling.internal.provider.ExecuteBuildActionRunner.run(ExecuteBuildActionRunner.java:28)
        at org.gradle.launcher.exec.ChainingBuildActionRunner.run(ChainingBuildActionRunner.java:35)
        at org.gradle.launcher.exec.InProcessBuildActionExecuter.execute(InProcessBuildActionExecuter.java:41)
        at org.gradle.launcher.exec.InProcessBuildActionExecuter.execute(InProcessBuildActionExecuter.java:26)
        at org.gradle.tooling.internal.provider.ContinuousBuildActionExecuter.execute(ContinuousBuildActionExecuter.java:75)
        at org.gradle.tooling.internal.provider.ContinuousBuildActionExecuter.execute(ContinuousBuildActionExecuter.java:49)
        at org.gradle.tooling.internal.provider.ServicesSetupBuildActionExecuter.execute(ServicesSetupBuildActionExecuter.java:49)
        at org.gradle.tooling.internal.provider.ServicesSetupBuildActionExecuter.execute(ServicesSetupBuildActionExecuter.java:31)
        at org.gradle.launcher.cli.RunBuildAction.run(RunBuildAction.java:51)
        at org.gradle.internal.Actions$RunnableActionAdapter.execute(Actions.java:173)
        at org.gradle.launcher.cli.CommandLineActionFactory$ParseAndBuildAction.execute(CommandLineActionFactory.java:281)
        at org.gradle.launcher.cli.CommandLineActionFactory$ParseAndBuildAction.execute(CommandLineActionFactory.java:254)
        at org.gradle.launcher.cli.JavaRuntimeValidationAction.execute(JavaRuntimeValidationAction.java:33)
        at org.gradle.launcher.cli.JavaRuntimeValidationAction.execute(JavaRuntimeValidationAction.java:24)
        at org.gradle.launcher.cli.ExceptionReportingAction.execute(ExceptionReportingAction.java:33)
        at org.gradle.launcher.cli.ExceptionReportingAction.execute(ExceptionReportingAction.java:22)
        at org.gradle.launcher.cli.CommandLineActionFactory$WithLogging.execute(CommandLineActionFactory.java:247)
        at org.gradle.launcher.cli.CommandLineActionFactory$WithLogging.execute(CommandLineActionFactory.java:182)
        at org.gradle.launcher.Main.doAction(Main.java:33)
        at org.gradle.launcher.bootstrap.EntryPoint.run(EntryPoint.java:45)
        at org.gradle.launcher.bootstrap.ProcessBootstrap.runNoExit(ProcessBootstrap.java:60)
        at org.gradle.launcher.bootstrap.ProcessBootstrap.run(ProcessBootstrap.java:37)
        at org.gradle.launcher.GradleMain.main(GradleMain.java:23)

with some Gradle versions.
2017-07-03 11:07:27 +02:00
Florian Schmaus 80b6e30196 build.gradle: Do not resolve runtime configuration to early
as it would cause "Cannot change dependencies of configuration after
it has been included in dependency resolution" errors with Gradle >=
3.

Thanks to James Justinic for pointing this out.
2017-07-03 11:07:26 +02:00
Florian Schmaus 3a79566f1c OmemoManager: Fix typo s/defaulDeviceId/defaultDeviceId/ 2017-07-03 11:07:26 +02:00
Florian Schmaus 2d4312272c Allow roster pushes from our full JID
SMACK-773
2017-07-03 11:07:26 +02:00
vanitasvitae 7e76bc1ae5
More changes to the Jingle package:
- Change visibility of some Socks5Bytestreams code.
- Add central ThreadPool
- Move FullJidAndSessionId in own class
- More complete JingleSession class
- More complete JingleUtil class
- Improved tests
2017-07-03 10:35:46 +02:00
vanitasvitae 63aa2f017c
Fallback works like a charm 2017-07-03 10:13:00 +02:00
vanitasvitae 4a8251fbe5
Transport Fallback works, but does not save file 2017-07-02 21:25:50 +02:00
Florian Schmaus 3fbdcfee63 Smack 4.2.1-beta2-SNAPSHOT 2017-07-02 19:26:03 +02:00
Florian Schmaus 7723210afb Smack 4.2.1-beta1 2017-07-02 18:54:31 +02:00
Florian Schmaus 685edde308 Don't hardcode "SunX509" as key algorithm
in XMPPTCPConnection. Instead use the default algorithm.

Fixes SMACK-771.
2017-07-02 18:30:53 +02:00
Florian Schmaus 3d032298a5 Deal with cases wehre HostAddress.fqdn is null
Fixes SMACK-772
2017-07-02 18:09:15 +02:00
vanitasvitae f26f3bb503
Use static threadPool and start working on async file transfer method 2017-07-02 15:42:16 +02:00
vanitasvitae 71486ab68e
Merge moreJingleTests 2017-06-30 18:56:56 +02:00
vanitasvitae 322587c0b5
More jingle related tests 2017-06-30 18:49:34 +02:00
vanitasvitae ff899d05e7
Merge js5btbFixes 2017-06-30 16:33:27 +02:00
vanitasvitae bae840ebf7
Enforce jingle s5b transport invariants.
There can only either be one info element or
multiple candidates, but not both.
Enforced this in the JingleS5BTransportBuilder
2017-06-30 15:36:02 +02:00
vanitasvitae dec275aa4d
Add methods to enable/disable proxy types 2017-06-30 15:19:36 +02:00
vanitasvitae 5bd01b7385
Add Jingle File Transfer elements and JingleUtil class 2017-06-30 15:03:13 +02:00
vanitasvitae 248e76ff46
Fix receiving OMEMO MUC messages
The method OmemoManager.getSender() was faulty and returned null for MUC
occupants, which lead to NPEs when receiving MUC messages with OMEMO.
2017-06-30 14:30:19 +02:00
vanitasvitae 59a600a0b6
progress 2017-06-29 21:53:57 +02:00
Florian Schmaus 541c9ecfdd Fix compile errors in jingle code
Which where introduced by merging

20eabca1b3

after

b14aca744f
2017-06-29 18:09:25 +02:00
Florian Schmaus 1d53889874 Merge pull request #145 from vanitasvitae/singleJingleTransport
Switch to single transport instead of list
2017-06-28 21:02:52 +02:00
Florian Schmaus 9be94ca474 Merge pull request #143 from vanitasvitae/jingleS5B
Add Jingle SOCKS5Bytestream transport
2017-06-28 21:00:15 +02:00
vanitasvitae a395b11ee9
S5B Works now in both directions and with external proxy 2017-06-28 14:48:39 +02:00
vanitasvitae d537463a42
SOCKS5 works again :) 2017-06-28 11:40:27 +02:00
vanitasvitae 3058ebe8b9
Some debug output and small fixes 2017-06-27 20:27:38 +02:00
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