diff --git a/graphenej/src/main/java/cy/agorise/graphenej/RPC.java b/graphenej/src/main/java/cy/agorise/graphenej/RPC.java index c5c68d4..7e2e306 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/RPC.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/RPC.java @@ -24,6 +24,7 @@ public class RPC { public static final String CALL_GET_ACCOUNT_HISTORY_BY_OPERATIONS = "get_account_history_by_operations"; public static final String CALL_LOOKUP_ACCOUNTS = "lookup_accounts"; public static final String CALL_LIST_ASSETS = "list_assets"; + public static final String CALL_GET_ASSETS = "get_assets"; public static final String CALL_GET_OBJECTS = "get_objects"; public static final String CALL_GET_ACCOUNT_BALANCES = "get_account_balances"; public static final String CALL_LOOKUP_ASSET_SYMBOLS = "lookup_asset_symbols"; diff --git a/graphenej/src/main/java/cy/agorise/graphenej/api/android/DeserializationMap.java b/graphenej/src/main/java/cy/agorise/graphenej/api/android/DeserializationMap.java index 8d704ee..a7a6b21 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/api/android/DeserializationMap.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/api/android/DeserializationMap.java @@ -23,6 +23,7 @@ import cy.agorise.graphenej.api.calls.GetAccountBalances; import cy.agorise.graphenej.api.calls.GetAccountByName; import cy.agorise.graphenej.api.calls.GetAccountHistoryByOperations; import cy.agorise.graphenej.api.calls.GetAccounts; +import cy.agorise.graphenej.api.calls.GetAssets; import cy.agorise.graphenej.api.calls.GetBlock; import cy.agorise.graphenej.api.calls.GetBlockHeader; import cy.agorise.graphenej.api.calls.GetDynamicGlobalProperties; @@ -193,6 +194,13 @@ public class DeserializationMap { .registerTypeAdapter(AssetAmount.class, new AssetAmount.AssetAmountDeserializer()) .create(); mGsonMap.put(GetAccountBalances.class, getAccountBalancesGson); + + // GetAssets + mClassMap.put(GetAssets.class, List.class); + Gson getAssetsGson = new GsonBuilder() + .registerTypeAdapter(Asset.class, new Asset.AssetDeserializer()) + .create(); + mGsonMap.put(GetAssets.class, getAssetsGson); } public Class getReceivedClass(Class _class){ diff --git a/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java b/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java index cb44c48..afb32fb 100644 --- a/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java +++ b/graphenej/src/main/java/cy/agorise/graphenej/api/android/NetworkService.java @@ -34,6 +34,7 @@ import cy.agorise.graphenej.api.ConnectionStatusUpdate; import cy.agorise.graphenej.api.calls.ApiCallable; import cy.agorise.graphenej.api.calls.GetAccountBalances; import cy.agorise.graphenej.api.calls.GetAccounts; +import cy.agorise.graphenej.api.calls.GetAssets; import cy.agorise.graphenej.api.calls.GetFullAccounts; import cy.agorise.graphenej.api.calls.GetKeyReferences; import cy.agorise.graphenej.api.calls.GetLimitOrders; @@ -580,6 +581,9 @@ public class NetworkService extends Service { } else if(requestClass == GetAccountBalances.class){ Type GetAccountBalancesResponse = new TypeToken>>(){}.getType(); parsedResponse = gson.fromJson(text, GetAccountBalancesResponse); + } else if(requestClass == GetAssets.class){ + Type GetAssetsResponse = new TypeToken>>(){}.getType(); + parsedResponse = gson.fromJson(text, GetAssetsResponse); }else { Log.w(TAG,"Unknown request class"); } diff --git a/graphenej/src/main/java/cy/agorise/graphenej/api/calls/GetAssets.java b/graphenej/src/main/java/cy/agorise/graphenej/api/calls/GetAssets.java new file mode 100644 index 0000000..91ca709 --- /dev/null +++ b/graphenej/src/main/java/cy/agorise/graphenej/api/calls/GetAssets.java @@ -0,0 +1,54 @@ +package cy.agorise.graphenej.api.calls; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import cy.agorise.graphenej.Asset; +import cy.agorise.graphenej.RPC; +import cy.agorise.graphenej.api.ApiAccess; +import cy.agorise.graphenej.models.ApiCall; + +public class GetAssets implements ApiCallable { + public static final int REQUIRED_API = ApiAccess.API_NONE; + + private List assetList = new ArrayList<>(); + + /** + * Constructor that will receive a List of Asset instances. + * + * @param assets List of Asset instances. + */ + public GetAssets(List assets){ + assetList.addAll(assets); + } + + /** + * Constructor that will accept a string containing the asset id. + * + * @param id String containing the asset id of the desired asset. + */ + public GetAssets(String id){ + assetList.add(new Asset(id)); + } + + /** + * Constructor that accepts an {@link Asset} object instance. + * + * @param asset Asset class instance. + */ + public GetAssets(Asset asset){ + assetList.add(asset); + } + + @Override + public ApiCall toApiCall(int apiId, long sequenceId) { + ArrayList params = new ArrayList<>(); + ArrayList assetIds = new ArrayList<>(); + for(Asset asset : assetList){ + assetIds.add(asset.getObjectId()); + } + params.add(assetIds); + return new ApiCall(apiId, RPC.CALL_GET_ASSETS, params, RPC.VERSION, sequenceId); + } +} diff --git a/sample/src/main/java/cy/agorise/labs/sample/CallsActivity.java b/sample/src/main/java/cy/agorise/labs/sample/CallsActivity.java index 0066bfb..c9899c8 100644 --- a/sample/src/main/java/cy/agorise/labs/sample/CallsActivity.java +++ b/sample/src/main/java/cy/agorise/labs/sample/CallsActivity.java @@ -70,6 +70,7 @@ public class CallsActivity extends AppCompatActivity { RPC.CALL_GET_REQUIRED_FEES, RPC.CALL_LOOKUP_ASSET_SYMBOLS, RPC.CALL_LIST_ASSETS, + RPC.CALL_GET_ASSETS, RPC.CALL_GET_ACCOUNT_BY_NAME, RPC.CALL_GET_LIMIT_ORDERS, RPC.CALL_GET_ACCOUNT_HISTORY_BY_OPERATIONS, diff --git a/sample/src/main/java/cy/agorise/labs/sample/PerformCallActivity.java b/sample/src/main/java/cy/agorise/labs/sample/PerformCallActivity.java index 651a4a0..650d761 100644 --- a/sample/src/main/java/cy/agorise/labs/sample/PerformCallActivity.java +++ b/sample/src/main/java/cy/agorise/labs/sample/PerformCallActivity.java @@ -45,6 +45,7 @@ import cy.agorise.graphenej.api.calls.GetAccountBalances; import cy.agorise.graphenej.api.calls.GetAccountByName; import cy.agorise.graphenej.api.calls.GetAccountHistoryByOperations; import cy.agorise.graphenej.api.calls.GetAccounts; +import cy.agorise.graphenej.api.calls.GetAssets; import cy.agorise.graphenej.api.calls.GetBlock; import cy.agorise.graphenej.api.calls.GetDynamicGlobalProperties; import cy.agorise.graphenej.api.calls.GetFullAccounts; @@ -143,6 +144,9 @@ public class PerformCallActivity extends ConnectedActivity { case RPC.CALL_LIST_ASSETS: setupListAssets(); break; + case RPC.CALL_GET_ASSETS: + setupGetAssets(); + break; case RPC.CALL_GET_ACCOUNT_BY_NAME: setupAccountByName(); break; @@ -240,12 +244,16 @@ public class PerformCallActivity extends ConnectedActivity { private void setupListAssets(){ requiredInput(2); - Resources resources = getResources(); - mParam1View.setHint(resources.getString(R.string.list_assets_arg1)); - mParam2View.setHint(resources.getString(R.string.list_assets_arg2)); + mParam1View.setHint(getString(R.string.list_assets_arg1)); + mParam2View.setHint(getString(R.string.list_assets_arg2)); param2.setInputType(InputType.TYPE_CLASS_NUMBER); } + private void setupGetAssets(){ + requiredInput(1); + mParam1View.setHint(getString(R.string.get_assets_arg)); + } + private void setupAccountByName(){ requiredInput(1); Resources resources = getResources(); @@ -361,6 +369,9 @@ public class PerformCallActivity extends ConnectedActivity { case RPC.CALL_LIST_ASSETS: sendListAssets(); break; + case RPC.CALL_GET_ASSETS: + sendGetAssets(); + break; case RPC.CALL_GET_ACCOUNT_BY_NAME: getAccountByName(); break; @@ -436,6 +447,16 @@ public class PerformCallActivity extends ConnectedActivity { } } + private void sendGetAssets(){ + String assetIds = param1.getText().toString(); + ArrayList assetList = new ArrayList<>(); + for(String id :assetIds.split(",")){ + assetList.add(new Asset(id)); + } + long id = mNetworkService.sendMessage(new GetAssets(assetList), GetAssets.REQUIRED_API); + responseMap.put(id, mRPC); + } + private void getAccountByName(){ String accountName = param1.getText().toString(); long id = mNetworkService.sendMessage(new GetAccountByName(accountName), GetAccountByName.REQUIRED_API); @@ -552,6 +573,7 @@ public class PerformCallActivity extends ConnectedActivity { case RPC.CALL_GET_REQUIRED_FEES: case RPC.CALL_LOOKUP_ASSET_SYMBOLS: case RPC.CALL_LIST_ASSETS: + case RPC.CALL_GET_ASSETS: case RPC.CALL_GET_ACCOUNT_BY_NAME: case RPC.CALL_GET_LIMIT_ORDERS: case RPC.CALL_GET_ACCOUNT_HISTORY_BY_OPERATIONS: diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml index 73d4a6d..63865d5 100644 --- a/sample/src/main/res/values/strings.xml +++ b/sample/src/main/res/values/strings.xml @@ -41,6 +41,9 @@ Lower bound of symbol names to retrieve Maximum number of assets to fetch (must not exceed 100) + + List of asset ids separated by commas + Account name