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

Merge branch 'master' of https://github.com/Agorise/crystal-wallet-android

Browse source
This commit is contained in:
Javier Varona 2018-01-04 20:16:41 -04:00
commit bdfd078b57
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/cy/agorise/crystalwallet/apigenerator/GrapheneApiGenerator.java
View file

@ -57,10 +57,11 @@ public abstract class GrapheneApiGenerator {
//TODO network connections //TODO network connections
//TODO make to work with all Graphene type, not only bitshares //TODO make to work with all Graphene type, not only bitshares
//public static String url = "http://128.0.69.157:8090"; public static String url = "http://185.208.208.147:11012";
//private static String equivalentUrl = "http://128.0.69.157:8090"; public static String faucetUrl = "http://185.208.208.147:5010";
public static String url = "wss://bitshares.openledger.info/ws"; private static String equivalentUrl = "http://185.208.208.147:8090";
private static String equivalentUrl = "wss://bitshares.openledger.info/ws"; //public static String url = "wss://bitshares.openledger.info/ws";
//private static String equivalentUrl = "wss://bitshares.openledger.info/ws";
// The message broker for bitshares // The message broker for bitshares

2
app/src/main/java/cy/agorise/crystalwallet/manager/BitsharesAccountManager.java
View file

@ -59,7 +59,7 @@ public class BitsharesAccountManager implements CryptoAccountManager, CryptoNetI
String btsIdAccount = BitsharesFaucetApiGenerator.registerBitsharesAccount(grapheneAccount.getName(), String btsIdAccount = BitsharesFaucetApiGenerator.registerBitsharesAccount(grapheneAccount.getName(),
new Address(grapheneAccount.getOwnerKey(context),"BTS").toString(), new Address(grapheneAccount.getOwnerKey(context),"BTS").toString(),
new Address(grapheneAccount.getActiveKey(context),"BTS").toString(), new Address(grapheneAccount.getActiveKey(context),"BTS").toString(),
new Address(grapheneAccount.getMemoKey(context),"BTS").toString(),GrapheneApiGenerator.url); new Address(grapheneAccount.getMemoKey(context),"BTS").toString(),GrapheneApiGenerator.faucetUrl);
if(btsIdAccount !=null) { if(btsIdAccount !=null) {
grapheneAccount.setAccountId(btsIdAccount); grapheneAccount.setAccountId(btsIdAccount);