Build: #1552 was successful Changes by Florian Schmaus <flo@geekplace.eu>
Code commits
Smack (master)
-
Florian Schmaus <flo@geekplace.eu> 76a6b9f2a1b35aa78e37af7eded3733a83bd95c2
Merge tag '4.2.2'
Smack 4.2.2 -
Florian Schmaus <flo@geekplace.eu> 0fcacf3d9af9661ade25dea4bd00669006b351b0 m
Smack 4.2.2
-
Florian Schmaus <flo@geekplace.eu> 2edbc64957cb419c5de9b6d089768ab95bbe06c2 m
Refactor reconnection callbacks into an extra class
Fixes SMACK-775- smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-core/src/main/java/org/jivesoftware/smack/AbstractConnectionListener.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-core/src/main/java/org/jivesoftware/smack/ReconnectionListener.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingConnectionListener.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
- smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java (version 2edbc64957cb419c5de9b6d089768ab95bbe06c2) (diffs)
-
Florian Schmaus <flo@geekplace.eu> d804d4ed6d9ef7d2a66e318bf9200c6c93f25b43 m
Do not abort if we could not get a KeyManagerFactory
using the default algorithm. Instead continue with 'null' as value of
the KeyManager[] array (kms). This makes the SSLContext.init() methods
to search the default security providers for implementations, which is
also OK.
This change is needed because it appears that on Android
KeyManagerFactory.getDefaultAlgorithm returns 'SunX509', which
subsequently results in
W/AbstractXMPPConnection: Connection XMPPTCPConnection[not-authenticated] (0) closed with error
java.security.NoSuchAlgorithmException: KeyManagerFactory SunX509 implementation not found
at org.apache.harmony.security.fortress.Engine.notFound(Engine.java:190)
at org.apache.harmony.security.fortress.Engine.getInstance(Engine.java:139)
at javax.net.ssl.KeyManagerFactory.getInstance(KeyManagerFactory.java:77)
at org.jivesoftware.smack.tcp.XMPPTCPConnection.proceedTLSReceived(XMPPTCPConnection.java:747)
at org.jivesoftware.smack.tcp.XMPPTCPConnection.access$1200(XMPPTCPConnection.java:149)
at org.jivesoftware.smack.tcp.XMPPTCPConnection$PacketReader.parsePackets(XMPPTCPConnection.java:1053)
at org.jivesoftware.smack.tcp.XMPPTCPConnection$PacketReader.access$300(XMPPTCPConnection.java:980)
at org.jivesoftware.smack.tcp.XMPPTCPConnection$PacketReader$1.run(XMPPTCPConnection.java:996)
at java.lang.Thread.run(Thread.java:818)
Note that this is possibly because the Secuurity Provider was
not (yet) intialized. -
Florian Schmaus <flo@geekplace.eu> 573358b459bc6402a6eca6f3daf075df3c3f0bf3 m
Limit the scope of local variables in proceedTLSReceived()
-
Florian Schmaus <flo@geekplace.eu> 32f681c6e5bf14ecf6138edee3f24748f69cd152 m
Initialize keytsoreType with KeyStore.getDefaultType()