| Age | Commit message (Collapse) | Author |
|---|
|
Remove explicit hasResource_ boolean and use non-null status of
resource_ instead. Mostly test this with isBare(). Tidy up compare()
method.
A JID is valid by default. Remove extraneous setting of valid_ and
centralize testing of validity to nameprepAndSetComponents().
Ensure that resource_ is initialized to null by default so that it is
correct when a JID instance is restored using some sort of
serialization, including com.google.gson.Gson which is used by Swift.
All JID test cases pass, including ones using invalid "x@y/" test string
representations.
Change-Id: Ib77a7cde03e8390c405633cddea5939aa9e0b576
|
|
When running the latest stroke against harrier android a NetworkOnMainThread exception
was encountered. This was traced to the new constructor HostAddress(String) that was
been called by Connector.start() method.
The issue was dues to difference between the java code in stroke and
the c++ code in swiften.
In swiften the equivalent conde calls boost::asio::ip::address::from_string, which
parses a string that may be an ipv4 or ipv6 address into an IP address object. If
the string is not one of these then the object is left invalid.
In the java code InetAddress.getByName(String name) is used instead. If this
is an ipv4 or ipv6 address then it parses it into an InetAddress object. However if
is not one of these it does a DNS lookup on the address. This was what was causing
the error.
To match the C++ the java code should only create an InetAddress if the input is
an IP address, if not it should be left null.
This was done by copying the IPv4 and IPv6 regexes in the Regex class in isode lib.
The input to HostAddress(String) is checked against these if it matches InetAddress.getByName
is called, otherwise address is set to null.
Test-information:
Ran unit tests in stroke they all pass.
Ran code against android harrier, no longer fails.
Ran against MLC (with updates for other changes in stroke api) it still passes.
Change-Id: I1945c7c3cdfece8feb45b9196483131c0d9c4e7c
|
|
And (therefore) XMPPRosterItem needs a copy constructor.
Change-Id: I9c4d833e559cf70d0c125fc6d841f16b8c2ce5b9
|
|
Each Signal* class extends BaseSignal. Each Slot* class extends
BaseSlot.
BaseSignal manages the set of binds associated with it via addBind() and
getBinds() which are called from Signal*. It is optimized for the cases
of zero or one bind, only allocating a HashMap to hold a larger set when
needed.
The interaction with SignalConnection to handle disconnection is
effected via a callback interface rather than another Signal.
Change-Id: Ifa44c1eb40b778c303db947a6e74fe20d1b41a90
|
|
Not supported on Android.
Change-Id: I55551ceeed06ab1ff4ce9e5995f809466d0e69bd
|
|
Not supported in Android.
Was introduced in commit 8fe7526.
Change-Id: I9fb396749c92b89cbaa7fac6cdeb047161ed0358
|
|
As per swiften patch of the same name.
This change addresses some feedback the previous XEP-0141 commit.
Test-information: Unit tests stil pass.
Change-Id: I3a9f9ec93b56352418f8288371bbd6874e01310d
|
|
As per swiften patch of same name
(6159c580884583bad0e17d4e96ea9ffc7e0be29a).
A JID may have no resource, but may not have an empty resource. Mark
such JIDs as invalid.
Test-information: New unit test passes.
Change-Id: I66ec7810ac29cb3963470b08f0d9f4901d2307f3
|
|
As per patch 'improve profile editing UX when vCard is not supported'
(4da2f1c85f2eeac9fb98d5dcc9097eeed9b34e8b).
Test-information: Unit tests still pass.
Change-Id: Ic5b0e24ac54eaf97c9a4cd1754219a05b59684e4
|
|
As per patch 'Fix possible race condition between Connection and
Connectors' (7eec2000d72f8fa597398704121d0b73a84ca284).
The issue occurs with ProxiedConnection that started connecting but do
not have an external reference anymore. As soon as the handlers of
the ProxiedConnection are disconnected from the signals of the
connection_ object, the remaining references to a shared
ProxiedConnection vanish and the ProxiedConnection is deleted, while
it still requires access to its members in
ProxiedConnection::handleConnectFinished().
Test-information: Unit tests pass ok.
Change-Id: I6c81009262dd51cda17b1b93a15edf968f40e464
|
|
As per swiften patch of the same name
(75703db2de5bbfb6622286600362016edb42dfb0).
Previously Jingle File Transfer in Stroke only used IBB transport as
fallback mechanism. With this patch Stroke will use IBB transport
candidates directly in the first session-initate/session-accept
message if the other party only supports IBB.
Test-information: Unit tests all pass.
Change-Id: Ice73a6028f10c63490bdb775a0a407fad48f587a
|
|
Adds a FileWriteBytestream class plus a test for it. These had been
missed out previously. Also as per patch 'Fix crash when saving a
received file to non-writable location' changed
WriteBytestream.write() method to return a boolean indicating success
or failure.
Test-information: Tests pass ok.
Change-Id: I0c3676db8b67573142e8628f439cecf54f3f8f1a
|
|
As per patch swiften patch 'Change stanza body to
boost::optional<std::string> type'
(1b9ccc1fef6104eaf951153ddccdc6bb15899e9a) allow null values for body
of a Message stanza for the case when it has no body.
Test-information: Unit tests still pass.
Change-Id: I487ecb14e4d915b7a903863d4378b8e2337d3b30
|
|
OutgoingJingleFileTransfer.
Add destroy methods to IncomingJingleFileTransfer and
OutgoingJingeFlieTranser to match the destructors of the swiften code
(as of patch 'Add missing Timer related cleanup code' -
52e685379436794cc0e4c2687c35f5e69a2f09a7).
Test-information: Unit tests ran ok.
Change-Id: Ie86c5fc74f66d9c62095045475eb6d9447c7699e
|
|
Add a destroy method to the WhitespacePingLayer to act like the
destructor introduced in swiften patch 'Stop timer during clean up of
WhitespacePingLayer' (f377207cb896679b4eab9f6773d9d071700852ad).
Test-information: Unit tests still pass ok.
Change-Id: I4fca19c3d3b5f120102727db10b046904da848a4
|
|
Added a getRemoteAddress() method to connection as per patch 'Listen
to IPv6 any address instead of only IPv4'
(13801557b6664426cac26384441ab0b19ff9abb5). Also some modifications
to SOCKS5BytestreamServerManager to use IPv6 address.
Test-information: Unit tests pass ok.
Change-Id: Ic0536745db9052ec1c5fc0832ed90eb5ec609429
|
|
As per patch 'Show file-transfer description if provided'
(523dbfb769069663eda19e381ad35f466b1ef27c) add a description field to
the FileTransfer interface and its implementations.
Test-information: Unit test still pass ok.
Change-Id: I146e2adce67a491ae0381154e54d6d0e480026a2
|
|
As per swiften patch of the same name
(e9ed818dac91e280eb8da86dc8494710f1da0624), some changes to
FileTransferMangerImpl on how it creates an Outgoing File Transfer.
Also added a copy constructor to FileTransferOption that had been in
swiften but was not yet implemented in stroke.
Change-Id: I314ac5ef7f8e082c7121ad89c012b84569f98d6c
Test-information: Unit tests still pass.
|
|
As per patch 'Fix swiften handling when client certificate is
missing' (8405fa16b738b6ef6a5920cd9d0f5735f8b62369).
Change-Id: Iec5036213d8432a3af78647470381485bfcc01e3
Test-information: Code inspection. Unit tests still pass.
|
|
As per patch 4a6950af0f324091553f7ab7271de45721b8667f (Rest of patch
is for implementing TLS on OSX so no need to port).
Test-information:
Code inspection. Unit tests still all pass ok.
Change-Id: I62b2f32f3cba0caa7db84f2806cd49b1a7a202e4
|
|
As per swiften patch of same name
(cb62de17d1e17fd3049a6bc8155a100574a42a85) add getState() method to
FileTransfer interface.
Test-information: Unit tests pass ok.
Change-Id: I27db4e60c3a8df251b813c90fc4a2e029762082d
|
|
As per swiften patch 'Change bare JID presence lookup code to ignore
priorities' (0f5ef716a50c8d9761cafda12aacf818cdfd6353) add a couple of
methods and a test for PresenceOracle.
Test-information: Unit tests still pass.
Change-Id: If3961f29be821a065ffa854faeab7f20da666d25
|
|
As per patch 'Mark removed contacts as unavailable in Swift'
(9e6ee0f262e7dc663f4c706b16a346a268f425aa) added an XMPPRoster to the
member variables and constructor arguments for PresenceOracle.
Test-information: Unit tests pass.
Change-Id: I062d256c088a968e061d864fbd1386f850b614a7
|
|
Fix how DiscoServiceWalker handles it disconnections from the
discoInfoRequests and discoItemsRequest, as per swiften patch 'Fix
memory leak warnings by Valgrind/LSAN'
(b00c84574fc730eeeabb57df1f17b54855218193).
Test-information: Unit tests pass ok.
Change-Id: If47dca0f89822b0bf1da8dab1a3113a969f1c396
|
|
As per swiften patch of the same name
(37aafcb4d693a0b4f5944a52e0c070e5aa384245) changes behaviour of VCard
cache slightly, and updates test accordingly.
Test-information: Unit tests pass.
Change-Id: I933c8000b4cb73b43db28db94887a768d0272dd2
|
|
As per swiften patch 'Fix notification logic for signals in BlockListImpl'
(4455c20085834098f6d9aa872db3115d466e7004). Fix the logic in the BlockListImpl
class and add a unit test for it.
Test-information: Unit tests pass ok.
Change-Id: I739d1febb2cf728ff00c132a00adb2f7f144b739
|
|
Add the Whiteboard classes to stroke.
Test-information:
Unit tests all pass.
Change-Id: Id409c09d0fc1f82864e5d706c413b9d984a7db82
|
|
Add missing methods and classes in the TLS and Base packages where
possible. In the case of TLSContextFactory the methods could not be
implemented in java so added a not saying they are not supported in
java.
Test-information:
Unit tests still build and run ok.
Change-Id: I9be2035f092875fcdc02644a3c0082739f26949a
|
|
Add the BOSHSessionStream class to stroke.
Also tidy up PortingProgress.txt there were some files it was saying had not
been imported when they had.
Test-information:
Code inspection as there are no unit tests for the new code.
Sanity test all existing unit tests pass.
Change-Id: Ia049a008f0d2c39c23f5752aa7740b10f48aa397
|
|
As per PortingProgress.txt finsh porting all the classes I can from the network
package. This involved some updates as the tests and code had changed since
they existing classes had been imported.
I have added notes for the classes I did not port in PortingProgress explaining
why they were not ported.
Test-information:
All unit tests pass.
Change-Id: Ibb52ae409f1da9b72a4c1e590cd22835a1be95eb
|
|
Add the sortResult static method to the DomainNameServiceQuery class. This
required adding a few equivalances for C++ std library methods to the class. And
add a test for the new method too.
Test-information:
All unit tests pass ok.
Change-Id: Idee0888f7ea140d35a971414fc2fd3cbcdfc337f
|
|
Add the missing Bosh classes to the network packages (BoshConnection
and BoshConnectionPool), plus tests for the classes and any other
classes required by the new classes.
Test-information:
Units tests all pass ok.
Change-Id: I5c2e05bae9e678ac10d2601c7fdbdccd68d66b71
|
|
Add the missing FileTransfer tests to stroke. When porting the tests
I found some of them were failing and required changes to the classes
being tested to fix. Had to add a DummyNetworkEnvironment as well for
the OutgoingJingleFileTransferTest.
Test-information:
All unit tests pass.
Change-Id: Id511a556ef3a5d66e0e107f36f736db3bbb3a437
|
|
Finish porting S5BTransportSession to Stroke (previously a lot of it had been commented out). To
do so had to introduce a heirachy to the SOCKS5BytestreamSession classes (which were being used as
type parameters for the Transport Session) and refactor some of the onByteSent signals to insure
they were all of the same type (Integer).
Also update PortingProgress.txt to update to give status of some of the porting files.
Test-information:
Ran unit tests they all still pass.
Change-Id: I4295b3a8829c208e65f5a46d19c35090f8c55865
|
|
Adds the CombinedAvatarProviderTest class.
When I was adding the test I noticed that
testProviderUpdateWithAvatarDisappearingTriggersChange kept failing
due to a bug in the CombinedAvatarProvider class and
testRemoveProviderDisconnectsUpdates could not be implemented as the
class was incomplete.
I had to make some changes to CombinedAvatarProvider to fix these
issues.
Test-information:
Ran unit tests they all pass.
Change-Id: I0bfb68dd2b15df0f220f36c136aceadaf6545893
|
|
Add BlockParser and BlockSerializer for the block payload classes.
This required slightly different approach to the Swiften code as C++ templates
are different to Java generics. In short needed to add a type hierachy to the
Block payload classes and to the Parsers and Serilaizers associated with them.
Test-information:
Ran unit tests everything passed ok.
Change-Id: I3ea2d66afd7cb3b5c4c3515be3a1ef99d7dbb566
|
|
Updates the FullPayloadSerializerCollection and
FullPayloadParserSerializerCollection to bring it inline with the Swiften
classes. This included reordering the elements so they are in the same order as
the Swiften class (so its easier to see classes that are missing), and adding
ones that were missing. For ones where no Java implemenation exits yet the line
is added but commented out.
Test-information:
Sanity test, ran unit tests all test still pass.
Change-Id: I318c8da577f638f4d799fabdfc09a3afa7fcb608
|
|
Adds a S5BProxyRequestParser and a S5BProxyRequestSerializer to stroke based on the Swiften classes of the same
name. These has been missed out previous stroke patches for some reason.
Test-information:
Code inspection against the Swifen classes.
Sanity test ran the unit tests for stroke they still all pass (note I could not
find any unit tests for this class to transfer from Swiften).
Change-Id: Ic5463169ada33c72127e87a416d42a650aad6399
|
|
There has been some changes to the file transfer clases in Swiften since Tarun's
patch was written. This patch updates the java classes to bring them in line
with the swiften one.
In details
IBBSendSession - added code to clean up onResponse connection when not needed.
In Swiften this was done by keeping reference to current session using boost
bindings to remove binding. In java we have to keep a reference to the current
onResponse connection and disconnect it when not neeeded.
IncomingFileTransferManager - Remove redundant IQRouter field.
LocalJingeTransportCandidateGenerator - Do not advertise link-local IPv6
addresses in FT candidates
OutgoingSIFileTransfer - File deleted
SOCKS5BytestreamProxiesManager and SOCKS5BytestreamProxyFinder - Search for all
proxies instead of just one.
Test-information:
Ran make and make test to check everything built ok and that the unit tests
still passed.
Change-Id: I696444e5074fe20625243693a44c836306b3a41e
|
|
Some fixes that were required for the File Transfer Patch (see patch notes
on Gerrit).
Test-information:
By code inspection.
Ran against MLC (after modification so it works for stroke interface changes
introduces in a previous patch) it still runs correctly.
Ran unit tests they still all pass.
Change-Id: Ib49d9f9160f5e6b6b578f16695f8e8bc0f96a412
|
|
S5BTransport Session still needs generic T.
FileTransfer, OutgoingFileTransfer and IncomingFileTransfer are made an interface due to the need of multiple inheritance in
IncomingJingleFileTransfer and OutgoingJingleFileTransfer. Corresponding documentation has been updated.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
None.
Change-Id: If44cf387767865c37492d871c12d623f94ebaa3a
|
|
Some fixes to the Jingle classes for the previous patch.
Test-information:
By code inspection.
Ran Unit Tests there were no failures.
Change-Id: I61210dd1ec2c7e0dd11d67a45a0ced63952804c7
|
|
Adds Listenable, JingleSession, JingleContentID, FakeJingleSession, JingleSessionListener,
JingleSessionManager, JingleResponder.
NotifyListeners are not in line with Swiften and have to be corrected.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
None.
Change-Id: I6533b2be02a0843277a63ca115348ff6138a0fc0
|
|
Small changes to PubSubManagerImpl and StanzaAckRequester making them equivalent with Swiften.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Added tests for StanzaAckResponder and StanzaAckRequester, which passes.
Change-Id: I99878fc6552ed18e353848a0cea6584c26b2ba0c
|
|
Some more changes to the Networks classes. Based on comments on the last
patch.
Test-information:
No longer see crash I was seeing when I ran the updated Stroke against MLC.
Ran unit tests.
Change-Id: Id577e5322bab0ec48f0353907f82e72bc93b848a
|
|
Adds ProxyProviders, DomainNameResolvers and DummyConnection.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Tests added for ChainedConnector, Connector and HostAddress.
Test also added for ComponentConnector, which needed bits of Network.
Five assertions are commented in ConnectorTest, which fails and will be updated after review.
Change-Id: I8a62841eb2f9c109bc3a94865b7a003b33493e11
|
|
Remove calls to TimeZone.setDefault().
Whatever problem the changes that introduced these calls were supposed
to solve, overriding the system default timezone is not the right
solution.
Change-Id: I626419a1c00fe9d68df0c63472d4433e12502acb
|
|
If a JavaConnection is supplied with a JavaConnection.ActivityWatcher at
creation time, then each of its Worker threads will signal when they
become active and when they potentially go to sleep (on select()).
This allows clients to manage a device's power state or any other
suitable subsystem.
Change-Id: I3c83cb8ce5a087dd6fc5d402c75f830f5deca282
|
|
Given that doRead() ends up populating a SafeByteArray as part of the
result is is more efficient to pass an empty SafeByteArray to doRead()
and push each chunk of data read directly to the it rather than use an
intermediate ByteArrayOutputStream. SafeByteArray.getData() will do any
concatenation necessary.
It is unnecessarily inefficient to use a class instance to return the
connection status from doRead. Remove JavaConnection.ReadResult.
Change-Id: I6c8dc000d9030d3929c71444eb5b489df93f1987
|
|
Refactor JavaConnection to make it fully event-driven via select for
both reads and writes. Remove the 100ms spin when there are pending
writes.
Encapslate all the management of the select mask and the write queue
within Worker and protect via a common lock.
Change-Id: I1a709f9b12a949448923f51c2d434746c9190c9d
|
Swift