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

Fixed an issue with the callback implementation

Browse source 
- We're now passing the parsed response, whenever possible
- The SparseArray was replaced by a HashMap
This commit is contained in:
Nelson R. Pérez 2019-11-21 16:28:51 -05:00
parent b9f4ac7bea
commit 4a1bb69ee0
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,7 @@ public class NetworkService {
private CompositeDisposable mCompositeDisposable; private CompositeDisposable mCompositeDisposable;
private SparseArray<ApiCallback> mCallbackMap = new SparseArray<ApiCallback>(); private HashMap<Long, ApiCallback> mCallbackMap = new HashMap<Long, ApiCallback>();
private Gson gson = new GsonBuilder() private Gson gson = new GsonBuilder()
.registerTypeAdapter(Transaction.class, new Transaction.TransactionDeserializer()) .registerTypeAdapter(Transaction.class, new Transaction.TransactionDeserializer())
@ -237,7 +237,7 @@ public class NetworkService {
long id = this.sendMessage(apiCallable, requiredApi); long id = this.sendMessage(apiCallable, requiredApi);
if(callback != null){ if(callback != null){
if(id != -1){ if(id != -1){
mCallbackMap.put((int) id, callback); mCallbackMap.put(id, callback);
}else{ }else{
callback.onFailure(new Exception("Message could not be sent"), null); callback.onFailure(new Exception("Message could not be sent"), null);
} }
@ -360,10 +360,11 @@ public class NetworkService {
* @param response * @param response
*/ */
private void resetCallbacks(Throwable throwable, Response response){ private void resetCallbacks(Throwable throwable, Response response){
for(int i = 0; i < mCallbackMap.size(); i++){ for(ApiCallback callback : mCallbackMap.values()) {
ApiCallback callback = mCallbackMap.get(i); if(callback != null) {
callback.onFailure(throwable, response); callback.onFailure(throwable, response);
mCallbackMap.remove(i); mCallbackMap.remove(callback);
}
} }
} }
@ -482,13 +483,6 @@ public class NetworkService {
private void handleJsonRpcResponse(JsonRpcResponse response, String text){ private void handleJsonRpcResponse(JsonRpcResponse response, String text){
JsonRpcResponse parsedResponse = null; JsonRpcResponse parsedResponse = null;
// Executing callback, if present
if(mCallbackMap.indexOfKey((int) response.id) > 0){
ApiCallback callback = (ApiCallback) mCallbackMap.get((int)response.id);
callback.onResponse(response, text);
mCallbackMap.remove((int)response.id);
}
Class requestClass = mRequestClassMap.get(response.id); Class requestClass = mRequestClassMap.get(response.id);
if(requestClass != null){ if(requestClass != null){
// Removing the class entry in the map // Removing the class entry in the map
@ -567,6 +561,14 @@ public class NetworkService {
if(parsedResponse == null){ if(parsedResponse == null){
parsedResponse = response; parsedResponse = response;
} }
// Executing callback, if present with the parsed response
if(mCallbackMap.containsKey(response.id)){
ApiCallback callback = mCallbackMap.get(response.id);
callback.onResponse(parsedResponse, text);
mCallbackMap.remove(response.id);
}
// Broadcasting the parsed response to all interested listeners // Broadcasting the parsed response to all interested listeners
RxBus.getBusInstance().send(parsedResponse); RxBus.getBusInstance().send(parsedResponse);
} }