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

- Added a bitcoin parse request to read bitcoin alike URIs

Browse source 
- Now the receive fragment generates bitcoin alike URIs
- Added commented code to read QR code URIs in the send fragment
This commit is contained in:
Javier Varona 2018-11-13 21:38:05 -04:00
parent 719d6769fc
commit 193f426739
3 changed files with 191 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
app/src/main/java/cy/agorise/crystalwallet/fragments/ReceiveTransactionFragment.java
View file

@ -29,6 +29,7 @@ import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.MultiFormatWriter; import com.google.zxing.MultiFormatWriter;
@ -38,6 +39,10 @@ import com.google.zxing.common.BitMatrix;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.enums.CryptoCoin; import cy.agorise.crystalwallet.enums.CryptoCoin;
import cy.agorise.crystalwallet.enums.CryptoNet; import cy.agorise.crystalwallet.enums.CryptoNet;
import cy.agorise.crystalwallet.requestmanagers.CalculateBitcoinUriRequest;
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequestListener;
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests;
import cy.agorise.crystalwallet.requestmanagers.NextBitcoinAccountAddressRequest;
import cy.agorise.crystalwallet.util.CircularImageView; import cy.agorise.crystalwallet.util.CircularImageView;
import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountListViewModel; import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountListViewModel;
import cy.agorise.crystalwallet.views.CryptoNetAccountAdapter; import cy.agorise.crystalwallet.views.CryptoNetAccountAdapter;
@ -341,52 +346,104 @@ public class ReceiveTransactionFragment extends DialogFragment implements UIVali
CryptoNetAccount toAccountSelected = (CryptoNetAccount) spTo.getSelectedItem(); CryptoNetAccount toAccountSelected = (CryptoNetAccount) spTo.getSelectedItem();
/* if (this.cryptoNetAccount.getCryptoNet() == CryptoNet.BITSHARES) {
* this is only for graphene accounts. /*
* * this is only for graphene accounts.
**/ *
GrapheneAccount grapheneAccountSelected = new GrapheneAccount(toAccountSelected); **/
grapheneAccountSelected.loadInfo(db.grapheneAccountInfoDao().getByAccountId(toAccountSelected.getId())); GrapheneAccount grapheneAccountSelected = new GrapheneAccount(toAccountSelected);
grapheneAccountSelected.loadInfo(db.grapheneAccountInfoDao().getByAccountId(toAccountSelected.getId()));
this.invoiceItems.clear(); this.invoiceItems.clear();
this.invoiceItems.add( this.invoiceItems.add(
new LineItem("transfer", 1, amount) new LineItem("transfer", 1, amount)
); );
LineItem items[] = new LineItem[this.invoiceItems.size()]; LineItem items[] = new LineItem[this.invoiceItems.size()];
items = this.invoiceItems.toArray(items); items = this.invoiceItems.toArray(items);
this.invoice.setLineItems(items); this.invoice.setLineItems(items);
this.invoice.setTo(grapheneAccountSelected.getName()); this.invoice.setTo(grapheneAccountSelected.getName());
this.invoice.setCurrency(this.cryptoCurrency.getName()); this.invoice.setCurrency(this.cryptoCurrency.getName());
if (this.qrCodeTask != null){ if (this.qrCodeTask != null) {
this.qrCodeTask.cancel(true); this.qrCodeTask.cancel(true);
} }
this.qrCodeTask = new AsyncTask<Object, Void, Void>(){ this.qrCodeTask = new AsyncTask<Object, Void, Void>() {
@Override @Override
protected Void doInBackground(Object... voids) { protected Void doInBackground(Object... voids) {
try { try {
final Bitmap bitmap = textToImageEncode(Invoice.toQrCode(invoice)); final Bitmap bitmap = textToImageEncode(Invoice.toQrCode(invoice));
if (!this.isCancelled()) { if (!this.isCancelled()) {
ReceiveTransactionFragment.this.getActivity().runOnUiThread(new Runnable() { ReceiveTransactionFragment.this.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
ivQrCode.setImageBitmap(bitmap);
}
});
}
} catch (WriterException e) {
Log.e("ReceiveFragment", "Error creating QrCode");
}
return null;
}
};
this.qrCodeTask.execute(null, null, null);
} else {
final CryptoCoin cryptoCoin = CryptoCoin.getByCryptoNet(this.cryptoNetAccount.getCryptoNet()).get(0);
//final NextBitcoinAccountAddressRequest addressRequest = new NextBitcoinAccountAddressRequest(this.cryptoNetAccount, cryptoCoin, getContext());
//addressRequest.setListener(new CryptoNetInfoRequestListener() {
// @Override
// public void onCarryOut() {
// if (addressRequest.getStatus() == NextBitcoinAccountAddressRequest.StatusCode.SUCCEEDED){
final CalculateBitcoinUriRequest uriRequest = new CalculateBitcoinUriRequest(cryptoCoin, cryptoNetAccount, getContext());
uriRequest.setListener(new CryptoNetInfoRequestListener(){
@Override @Override
public void run() { public void onCarryOut(){
ivQrCode.setImageBitmap(bitmap); if (uriRequest.getUri() != null){
qrCodeTask = new AsyncTask<Object, Void, Void>() {
@Override
protected Void doInBackground(Object... voids) {
try {
final Bitmap bitmap = textToImageEncode(uriRequest.getUri());
if (!this.isCancelled()) {
ReceiveTransactionFragment.this.getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
ivQrCode.setImageBitmap(bitmap);
}
});
}
} catch (WriterException e) {
Log.e("ReceiveFragment", "Error creating QrCode");
}
return null;
}
};
qrCodeTask.execute(null, null, null);
} else {
Log.e("ReceiveFragment", "Error obtaining the uri");
}
} }
}); });
}
} catch (WriterException e) {
Log.e("ReceiveFragment", "Error creating QrCode");
}
return null;
}
};
this.qrCodeTask.execute(null,null,null); CryptoNetInfoRequests.getInstance().addRequest(uriRequest);
// } else {
// Toast.makeText(getContext(),"Error creating address",Toast.LENGTH_SHORT);
// }
// }
//});
}
} }
Bitmap textToImageEncode(String Value) throws WriterException { Bitmap textToImageEncode(String Value) throws WriterException {

23
app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java
View file

@ -803,8 +803,31 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
df.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.ENGLISH)); df.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.ENGLISH));
etAmount.setText(df.format(amount)); etAmount.setText(df.format(amount));
Log.i("SendFragment", result.getText()); Log.i("SendFragment", result.getText());
return;
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
} }
//Is not a bitshares QR
/*BitcoinUriParseRequest bitcoinUriParseRequest = new BitcoinUriParseRequest(result.getText());
bitcoinUriParseRequest.setListener(new CryptoNetInfoRequestListener() {
@Override
public void onCarryOut() {
if (bitcoinUriParseRequest.getAddress() != null) {
try {
crystalDialog.dismiss();
thisFragment.dismiss();
//thisFragment.finalize();
} catch (Throwable throwable) {
throwable.printStackTrace();
}
} else {
Toast.makeText(getContext(), "Not a valid QR info", Toast.LENGTH_LONG);
}
}
});
CryptoNetInfoRequests.getInstance().addRequest(bitcoinUriParseRequest);*/
} }
} }

76
app/src/main/java/cy/agorise/crystalwallet/requestmanagers/BitcoinUriParseRequest.java Normal file
View file

@ -0,0 +1,76 @@
package cy.agorise.crystalwallet.requestmanagers;
import android.content.Context;
import cy.agorise.crystalwallet.enums.CryptoCoin;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.GrapheneAccount;
/**
* Class used to make a bitcoin uri parse request.
*
* Created by henry on 11/13/2018.
*/
public class BitcoinUriParseRequest extends CryptoNetInfoRequest {
/**
* The status code of this request
*/
public enum StatusCode{
NOT_STARTED,
VALID,
NOT_VALID
}
private String address;
private Double amount;
private String memo;
private StatusCode status = StatusCode.NOT_STARTED;
public BitcoinUriParseRequest(String uri) {
super(CryptoCoin.BITCOIN);
this.address = "";
this.amount = -1.0;
this.memo = "";
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public Double getAmount() {
return amount;
}
public void setAmount(Double amount) {
this.amount = amount;
}
public String getMemo() {
return memo;
}
public void setMemo(String memo) {
this.memo = memo;
}
public void validate(){
if ((this.status != StatusCode.NOT_STARTED)){
this._fireOnCarryOutEvent();
}
}
public void setStatus(StatusCode code){
this.status = code;
this._fireOnCarryOutEvent();
}
public StatusCode getStatus() {
return status;
}
}