Skip to content

* Upgraded to 0.2.5 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

* Upgraded to 0.2.5 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
493c424
* Upgraded to 0.2.5
SanchayPahalwani Feb 24, 2020
ced6a4c
Merge branch 'master' of github.com:cruxprotocol/android-sdk into upg…
SanchayPahalwani Feb 24, 2020
bba2c40
Committing Project.xml
SanchayPahalwani Feb 24, 2020
278aedd
Removing old version cruxpay file
SanchayPahalwani Feb 24, 2020
584c1e3
Not suppressing JSONException in toJavaString anymore
SanchayPahalwani Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 50 additions & 6 deletions app/src/main/java/com/example/liquid_test_2/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@

import com.crux.sdk.CruxClient;
import com.crux.sdk.model.*;
//import com.crux.sdk.model.CruxAddress;
//import com.crux.sdk.model.CruxClientError;
//import com.crux.sdk.model.CruxClientInitConfig;
//import com.crux.sdk.model.CruxClientResponseHandler;
//import com.crux.sdk.model.CruxIDState;
//import com.crux.sdk.model.CruxPutAddressMapSuccess;

import java.io.IOException;
import java.util.HashMap;
Expand Down Expand Up @@ -111,6 +105,35 @@ public void onErrorResponse(CruxClientError failureResponse) {
}
});

client.getEnabledAssetGroups(new CruxClientResponseHandler<String[]>() {
@Override
public void onResponse(String[] successResponse) {
System.out.println("--------getEnabledAssetGroups-------");
System.out.println(successResponse);
}

@Override
public void onErrorResponse(CruxClientError failureResponse) {
System.err.println(failureResponse.errorCode);
System.err.println(failureResponse.errorMessage);
}
});

final String[] assetGroups = {"ERC20_eth"};
client.putEnabledAssetGroups(assetGroups, new CruxClientResponseHandler<String[]>() {
@Override
public void onResponse(String[] successResponse) {
System.out.println("--------putEnabledAssetGroups-------");
System.out.println(successResponse);
}

@Override
public void onErrorResponse(CruxClientError failureResponse) {
System.err.println(failureResponse.errorCode);
System.err.println(failureResponse.errorMessage);
}
});

final String testResolveAddressCruxId = "mascot6699@cruxdev.crux";
client.resolveCurrencyAddressForCruxID(testResolveAddressCruxId, "xrp", new CruxClientResponseHandler<CruxAddress>() {
@Override
Expand All @@ -125,6 +148,20 @@ public void onErrorResponse(CruxClientError failureResponse) {
}
});

HashMap<String, String> assetMatcher = getAssetMatcher();
client.resolveAssetAddressForCruxID(testResolveAddressCruxId, assetMatcher, new CruxClientResponseHandler<CruxAddress>() {
@Override
public void onResponse(CruxAddress successResponse) {
System.out.println("--------resolveAssetAddressForCruxID-------");
System.out.println(successResponse);
}

@Override
public void onErrorResponse(CruxClientError failureResponse) {
System.out.println(failureResponse);
}
});

HashMap<String, CruxAddress> newAddressMap = getCurrencyMap();

client.putAddressMap(newAddressMap, new CruxClientResponseHandler<CruxPutAddressMapSuccess>() {
Expand Down Expand Up @@ -154,4 +191,11 @@ private HashMap<String, CruxAddress> getCurrencyMap() {
return currencyMap;
}

private HashMap<String, String> getAssetMatcher() {
HashMap<String, String> assetMatcher = new HashMap<>();
assetMatcher.put("assetGroup", "ERC20_ETH");
// assetMatcher.put("assetIdentifierValue", "0xE41d2489571d322189246DaFA5ebDe1F4699F498")
return assetMatcher;
}

}
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {

}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:3.6.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

// NOTE: Do not place your application dependencies here; they belong
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Oct 28 19:14:23 IST 2019
#Wed Feb 26 13:35:41 IST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
Loading