agorise
/
crystal-wallet-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Correct OnErrorWebSocker to OnErrorWebSocket

master
dtvv 2018-08-18 12:48:37 -05:00
parent d2d17bb6b4
commit 17f74b4774
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/cy/agorise/crystalwallet/apigenerator/GrapheneApiGenerator.java
View File

@ -93,7 +93,7 @@ public abstract class GrapheneApiGenerator {
* *
* Interface to catch only errors in connection with sockets * Interface to catch only errors in connection with sockets
* */ * */
private static GrapheneApiGenerator.OnErrorWebSocker onErrorWebSocker; private static OnErrorWebSocket onErrorWebSocket;
/* /*
* *
@ -247,7 +247,7 @@ public abstract class GrapheneApiGenerator {
} }
}), CryptoNetManager.getURL(CryptoNet.BITSHARES)); }), CryptoNetManager.getURL(CryptoNet.BITSHARES));
thread.setActivity(activity); //To catch websocket errors to user interface thread.setActivity(activity); //To catch websocket errors to user interface
thread.setOnErrorWebSocker(onErrorWebSocker); //To deliver websocket errors to user interface thread.setOnErrorWebSocker(onErrorWebSocket); //To deliver websocket errors to user interface
thread.start(); thread.start();
} }
@ -740,15 +740,15 @@ public abstract class GrapheneApiGenerator {
GrapheneApiGenerator.onResponsesWebSocker = onResponsesWebSocker; GrapheneApiGenerator.onResponsesWebSocker = onResponsesWebSocker;
} }
public static void setOnErrorWebSocker(OnErrorWebSocker onErrorWebSocker) { public static void setOnErrorWebSocket(OnErrorWebSocket onErrorWebSocket) {
GrapheneApiGenerator.onErrorWebSocker = onErrorWebSocker; GrapheneApiGenerator.onErrorWebSocket = onErrorWebSocket;
} }
/* /*
* *
* Interface to catch errors in connection with sockets * Interface to catch errors in connection with sockets
* */ * */
public interface OnErrorWebSocker{ public interface OnErrorWebSocket {
void onError(Exception exception); void onError(Exception exception);
} }

6
app/src/main/java/cy/agorise/crystalwallet/network/CryptoNetManager.java
View File

@ -2,11 +2,9 @@ package cy.agorise.crystalwallet.network;
import android.app.Activity; import android.app.Activity;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -70,7 +68,7 @@ public abstract class CryptoNetManager {
public static void addCryptoNetURL(CryptoNet crypto, public static void addCryptoNetURL(CryptoNet crypto,
String[] urls, String[] urls,
final Activity activity, final Activity activity,
final GrapheneApiGenerator.OnErrorWebSocker onErrorWebSocker, final GrapheneApiGenerator.OnErrorWebSocket onErrorWebSocker,
final boolean showNormalError){ final boolean showNormalError){
addCryptoNetURL(crypto,urls,activity,onErrorWebSocker,null,showNormalError); addCryptoNetURL(crypto,urls,activity,onErrorWebSocker,null,showNormalError);
} }
@ -95,7 +93,7 @@ public abstract class CryptoNetManager {
public static void addCryptoNetURL(CryptoNet crypto, public static void addCryptoNetURL(CryptoNet crypto,
String[] urls, String[] urls,
final Activity activity, final Activity activity,
final GrapheneApiGenerator.OnErrorWebSocker onErrorWebSocker, final GrapheneApiGenerator.OnErrorWebSocket onErrorWebSocker,
final GrapheneApiGenerator.OnResponsesWebSocket onResponsesWebSocket, final GrapheneApiGenerator.OnResponsesWebSocket onResponsesWebSocket,
final boolean showNormalError) { final boolean showNormalError) {

6
app/src/main/java/cy/agorise/crystalwallet/network/WebSocketThread.java
View File

@ -5,7 +5,6 @@ import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import com.neovisionaries.ws.client.WebSocket; import com.neovisionaries.ws.client.WebSocket;
import com.neovisionaries.ws.client.WebSocketException;
import com.neovisionaries.ws.client.WebSocketFactory; import com.neovisionaries.ws.client.WebSocketFactory;
import com.neovisionaries.ws.client.WebSocketListener; import com.neovisionaries.ws.client.WebSocketListener;
@ -14,7 +13,6 @@ import java.util.HashMap;
import cy.agorise.crystalwallet.activities.LoadingActivity; import cy.agorise.crystalwallet.activities.LoadingActivity;
import cy.agorise.crystalwallet.apigenerator.GrapheneApiGenerator; import cy.agorise.crystalwallet.apigenerator.GrapheneApiGenerator;
import cy.agorise.crystalwallet.dialogs.material.DialogMaterial;
/** /**
* Created by henry on 8/10/2017. * Created by henry on 8/10/2017.
@ -43,7 +41,7 @@ public class WebSocketThread extends Thread {
* *
* Interface to catch only errors in connection with sockets * Interface to catch only errors in connection with sockets
* */ * */
private GrapheneApiGenerator.OnErrorWebSocker onErrorWebSocker; private GrapheneApiGenerator.OnErrorWebSocket onErrorWebSocker;
/* /*
* *
@ -239,7 +237,7 @@ public class WebSocketThread extends Thread {
} }
public void setOnErrorWebSocker(GrapheneApiGenerator.OnErrorWebSocker onErrorWebSocker) { public void setOnErrorWebSocker(GrapheneApiGenerator.OnErrorWebSocket onErrorWebSocker) {
this.onErrorWebSocker = onErrorWebSocker; this.onErrorWebSocker = onErrorWebSocker;
} }