Merge branch 'develop' of github.com:Agorise/crystal-wallet-android into develop
This commit is contained in:
commit
a32f7c9eb0
2 changed files with 3 additions and 3 deletions
|
@ -309,7 +309,7 @@ public class GeneralAccountManager implements CryptoAccountManager, CryptoNetInf
|
||||||
btTransaction.setCryptoCoinTransactionId(ccId);
|
btTransaction.setCryptoCoinTransactionId(ccId);
|
||||||
long btId = db.bitcoinTransactionDao().insertBitcoinTransaction(btTransaction)[0];
|
long btId = db.bitcoinTransactionDao().insertBitcoinTransaction(btTransaction)[0];
|
||||||
for (BitcoinTransactionGTxIO gtxio : gtxios) {
|
for (BitcoinTransactionGTxIO gtxio : gtxios) {
|
||||||
gtxio.setBitcoinTransactionId(btId);
|
gtxio.setBitcoinTransactionId(ccId);
|
||||||
db.bitcoinTransactionDao().insertBitcoinTransactionGTxIO(gtxio);
|
db.bitcoinTransactionDao().insertBitcoinTransactionGTxIO(gtxio);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,8 @@ import android.arch.persistence.room.ForeignKey;
|
||||||
primaryKeys = {"bitcoin_transaction_id", "io_index", "is_output"},
|
primaryKeys = {"bitcoin_transaction_id", "io_index", "is_output"},
|
||||||
foreignKeys = {
|
foreignKeys = {
|
||||||
@ForeignKey(
|
@ForeignKey(
|
||||||
entity = BitcoinTransaction.class,
|
entity = CryptoCoinTransaction.class,
|
||||||
parentColumns = "crypto_coin_transaction_id",
|
parentColumns = "id",
|
||||||
childColumns = "bitcoin_transaction_id",
|
childColumns = "bitcoin_transaction_id",
|
||||||
onDelete = ForeignKey.CASCADE
|
onDelete = ForeignKey.CASCADE
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue