Index: remoting/android/java/src/org/chromium/chromoting/SessionConnector.java |
diff --git a/remoting/android/java/src/org/chromium/chromoting/SessionConnector.java b/remoting/android/java/src/org/chromium/chromoting/SessionConnector.java |
index 4fa95229a7825e64217707f1d10c3fbfbbab5c9c..38e4634fa1a8004d068a3fd55abca8737658733a 100644 |
--- a/remoting/android/java/src/org/chromium/chromoting/SessionConnector.java |
+++ b/remoting/android/java/src/org/chromium/chromoting/SessionConnector.java |
@@ -4,15 +4,15 @@ |
package org.chromium.chromoting; |
+import org.chromium.chromoting.jni.Client; |
import org.chromium.chromoting.jni.ConnectionListener; |
-import org.chromium.chromoting.jni.JniInterface; |
/** |
* This class manages making a connection to a host, with logic for reloading the host list and |
* retrying the connection in the case of a stale host JID. |
*/ |
-public class SessionConnector implements ConnectionListener, |
- HostListLoader.Callback { |
+public class SessionConnector implements ConnectionListener, HostListLoader.Callback { |
+ private Client mClient; |
private ConnectionListener mConnectionListener; |
private HostListLoader.Callback mHostListCallback; |
private HostListLoader mHostListLoader; |
@@ -38,8 +38,9 @@ public class SessionConnector implements ConnectionListener, |
* @param hostListCallback Object to be notified whenever the host list is reloaded. |
* @param hostListLoader The object used for reloading the host list. |
*/ |
- public SessionConnector(ConnectionListener connectionListener, |
+ public SessionConnector(Client client, ConnectionListener connectionListener, |
HostListLoader.Callback hostListCallback, HostListLoader hostListLoader) { |
+ mClient = client; |
mConnectionListener = connectionListener; |
mHostListCallback = hostListCallback; |
mHostListLoader = hostListLoader; |
@@ -65,7 +66,7 @@ public class SessionConnector implements ConnectionListener, |
} |
private void doConnect() { |
- JniInterface.connectToHost(mAccountName, mAuthToken, mHost.jabberId, mHost.id, |
+ mClient.connectToHost(mAccountName, mAuthToken, mHost.jabberId, mHost.id, |
mHost.publicKey, mAuthenticator, mFlags, this); |
} |