agorise/graphenej
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:Agorise/graphenej into develop

Browse source
This commit is contained in:
Nelson R. Perez 2018-10-18 18:00:19 -05:00
commit a5f0ba1345
2 changed files with 38 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java
View file

@ -2,6 +2,7 @@ package cy.agorise.graphenej.api.android;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
import java.util.concurrent.TimeUnit;
import android.os.Binder; import android.os.Binder;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@ -210,7 +211,10 @@ public class NetworkService extends Service {
* Actually establishes a connection from this Service to one of the full nodes. * Actually establishes a connection from this Service to one of the full nodes.
*/ */
public void connect(){ public void connect(){
OkHttpClient client = new OkHttpClient(); OkHttpClient client = new OkHttpClient
.Builder()
.connectTimeout(2, TimeUnit.SECONDS)
.build();
mSelectedNode = nodeProvider.getBestNode(); mSelectedNode = nodeProvider.getBestNode();
Log.v(TAG,"connect.url: "+ mSelectedNode.getUrl()); Log.v(TAG,"connect.url: "+ mSelectedNode.getUrl());
Request request = new Request.Builder().url(mSelectedNode.getUrl()).build(); Request request = new Request.Builder().url(mSelectedNode.getUrl()).build();

11
graphenej/src/main/java/cy/agorise/graphenej/network/NodeLatencyVerifier.java
View file

@ -102,11 +102,10 @@ public class NodeLatencyVerifier {
} }
String normalURL = fullNode.getUrl().replace("wss://", "https://"); String normalURL = fullNode.getUrl().replace("wss://", "https://");
if(!nodeURLMap.containsKey(fullNode.getUrl().replace("wss://", "https://"))){
HttpUrl key = HttpUrl.parse(normalURL); HttpUrl key = HttpUrl.parse(normalURL);
if(!nodeURLMap.containsKey(key)){
nodeURLMap.put(key, fullNode); nodeURLMap.put(key, fullNode);
} }
client.newWebSocket(request, mWebSocketListener); client.newWebSocket(request, mWebSocketListener);
} }
mHandler.postDelayed(this, verificationPeriod); mHandler.postDelayed(this, verificationPeriod);
@ -133,10 +132,11 @@ public class NodeLatencyVerifier {
* Method used to handle the node's first response. The idea here is to obtain * Method used to handle the node's first response. The idea here is to obtain
* the RTT (Round Trip Time) measurement and publish it using the PublishSubject. * the RTT (Round Trip Time) measurement and publish it using the PublishSubject.
* *
* @param webSocket Websocket instance * @param webSocket WebSocket instance
* @param response Response instance * @param response Response instance
*/ */
private void handleResponse(WebSocket webSocket, Response response){ private void handleResponse(WebSocket webSocket, Response response){
synchronized (this){
// Obtaining the HttpUrl instance that was previously used as a key // Obtaining the HttpUrl instance that was previously used as a key
HttpUrl url = webSocket.request().url(); HttpUrl url = webSocket.request().url();
if(nodeURLMap.containsKey(url)){ if(nodeURLMap.containsKey(url)){
@ -152,8 +152,12 @@ public class NodeLatencyVerifier {
long before = timestamps.get(fullNode); long before = timestamps.get(fullNode);
delay = after - before; delay = after - before;
} }
if(fullNode != null){
fullNode.addLatencyValue(delay); fullNode.addLatencyValue(delay);
subject.onNext(fullNode); subject.onNext(fullNode);
}else{
Log.w(TAG,"Could not extract FullNode instance from the map");
}
}else{ }else{
// We cannot properly handle a response to a request whose // We cannot properly handle a response to a request whose
// URL was not registered at the nodeURLMap. This is because without this, // URL was not registered at the nodeURLMap. This is because without this,
@ -165,6 +169,7 @@ public class NodeLatencyVerifier {
} }
webSocket.close(NetworkService.NORMAL_CLOSURE_STATUS, null); webSocket.close(NetworkService.NORMAL_CLOSURE_STATUS, null);
} }
}
}; };
/** /**