Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
xabber-android
Commits
1f993e82
Commit
1f993e82
authored
Jul 07, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Smack connection: keystore path and security mode set. #502
parent
4b75dcbe
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
ConnectionThread.java
.../com/xabber/android/data/connection/ConnectionThread.java
+3
-6
No files found.
app/src/main/java/com/xabber/android/data/connection/ConnectionThread.java
View file @
1f993e82
...
...
@@ -320,11 +320,8 @@ public class ConnectionThread implements
}
private
void
onReady
(
XMPPTCPConnectionConfiguration
.
Builder
builder
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
14
)
{
// connectionConfiguration.setTruststoreType("AndroidCAStore");
// connectionConfiguration.setTruststorePassword(null);
// connectionConfiguration.setTruststorePath(null);
}
builder
.
setKeystoreType
(
"AndroidCAStore"
);
// Disable smack`s reconnection.
// connectionConfiguration.setReconnectionAllowed(false);
// We will send custom presence.
...
...
@@ -348,7 +345,7 @@ public class ConnectionThread implements
}
// connectionConfiguration.setSASLAuthenticationEnabled(saslEnabled);
// connectionConfiguration
.setSecurityMode(tlsMode.getSecurityMode());
builder
.
setSecurityMode
(
tlsMode
.
getSecurityMode
());
builder
.
setCompressionEnabled
(
compression
);
xmppConnection
=
new
XMPPTCPConnection
(
builder
.
build
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment