Created methods to request and add the BlockData to the transaction to upgrade the current account to LTM, that information is necessary. And created a different identifier to identify when a request for Dynamic Global Properties is for the nodes dialog or for the Upgrade to LTM transaction.
This commit is contained in:
parent
b1a1abf231
commit
0330588885
2 changed files with 34 additions and 17 deletions
|
@ -66,7 +66,7 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
|
||||||
|
|
||||||
// Constants used to organize NetworkService requests
|
// Constants used to organize NetworkService requests
|
||||||
private const val RESPONSE_GET_ACCOUNT_BY_NAME = 1
|
private const val RESPONSE_GET_ACCOUNT_BY_NAME = 1
|
||||||
private const val RESPONSE_GET_DYNAMIC_GLOBAL_PARAMETERS = 2
|
private const val RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES = 2
|
||||||
private const val RESPONSE_GET_REQUIRED_FEES = 3
|
private const val RESPONSE_GET_REQUIRED_FEES = 3
|
||||||
private const val RESPONSE_BROADCAST_TRANSACTION = 4
|
private const val RESPONSE_BROADCAST_TRANSACTION = 4
|
||||||
|
|
||||||
|
@ -239,7 +239,7 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
|
||||||
val responseType = responseMap[response.id]
|
val responseType = responseMap[response.id]
|
||||||
when (responseType) {
|
when (responseType) {
|
||||||
RESPONSE_GET_ACCOUNT_BY_NAME -> handleAccountProperties(response.result)
|
RESPONSE_GET_ACCOUNT_BY_NAME -> handleAccountProperties(response.result)
|
||||||
RESPONSE_GET_DYNAMIC_GLOBAL_PARAMETERS -> handleDynamicGlobalProperties(response.result)
|
RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES -> handleDynamicGlobalProperties(response.result)
|
||||||
RESPONSE_GET_REQUIRED_FEES -> handleRequiredFees(response.result)
|
RESPONSE_GET_REQUIRED_FEES -> handleRequiredFees(response.result)
|
||||||
RESPONSE_BROADCAST_TRANSACTION -> handleBroadcastTransaction(response)
|
RESPONSE_BROADCAST_TRANSACTION -> handleBroadcastTransaction(response)
|
||||||
}
|
}
|
||||||
|
@ -548,7 +548,7 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
|
||||||
// Start the send transaction procedure which includes a series of calls
|
// Start the send transaction procedure which includes a series of calls
|
||||||
val id = mNetworkService?.sendMessage(GetDynamicGlobalProperties(),
|
val id = mNetworkService?.sendMessage(GetDynamicGlobalProperties(),
|
||||||
GetDynamicGlobalProperties.REQUIRED_API)
|
GetDynamicGlobalProperties.REQUIRED_API)
|
||||||
if (id != null ) responseMap[id] = RESPONSE_GET_DYNAMIC_GLOBAL_PARAMETERS
|
if (id != null ) responseMap[id] = RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES
|
||||||
} else
|
} else
|
||||||
Log.d(TAG, "Network Service is not connected")
|
Log.d(TAG, "Network Service is not connected")
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import android.util.Log
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import android.widget.Toast
|
||||||
import androidx.lifecycle.ViewModelProviders
|
import androidx.lifecycle.ViewModelProviders
|
||||||
import com.afollestad.materialdialogs.MaterialDialog
|
import com.afollestad.materialdialogs.MaterialDialog
|
||||||
import com.afollestad.materialdialogs.callbacks.onDismiss
|
import com.afollestad.materialdialogs.callbacks.onDismiss
|
||||||
|
@ -23,6 +24,7 @@ import cy.agorise.bitsybitshareswallet.adapters.FullNodesAdapter
|
||||||
import cy.agorise.bitsybitshareswallet.repositories.AuthorityRepository
|
import cy.agorise.bitsybitshareswallet.repositories.AuthorityRepository
|
||||||
import cy.agorise.bitsybitshareswallet.utils.Constants
|
import cy.agorise.bitsybitshareswallet.utils.Constants
|
||||||
import cy.agorise.bitsybitshareswallet.utils.CryptoUtils
|
import cy.agorise.bitsybitshareswallet.utils.CryptoUtils
|
||||||
|
import cy.agorise.bitsybitshareswallet.utils.toast
|
||||||
import cy.agorise.bitsybitshareswallet.viewmodels.SettingsFragmentViewModel
|
import cy.agorise.bitsybitshareswallet.viewmodels.SettingsFragmentViewModel
|
||||||
import cy.agorise.graphenej.*
|
import cy.agorise.graphenej.*
|
||||||
import cy.agorise.graphenej.api.ConnectionStatusUpdate
|
import cy.agorise.graphenej.api.ConnectionStatusUpdate
|
||||||
|
@ -52,8 +54,9 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
|
||||||
private const val ACTION_SHOW_BRAINKEY = 2
|
private const val ACTION_SHOW_BRAINKEY = 2
|
||||||
|
|
||||||
// Constants used to organize NetworkService requests
|
// Constants used to organize NetworkService requests
|
||||||
private const val RESPONSE_GET_DYNAMIC_GLOBAL_PARAMETERS = 1
|
private const val RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES_NODES = 1
|
||||||
private const val RESPONSE_BROADCAST_TRANSACTION = 2
|
private const val RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES_LTM = 2
|
||||||
|
private const val RESPONSE_BROADCAST_TRANSACTION = 3
|
||||||
}
|
}
|
||||||
|
|
||||||
private lateinit var mViewModel: SettingsFragmentViewModel
|
private lateinit var mViewModel: SettingsFragmentViewModel
|
||||||
|
@ -71,6 +74,9 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
|
||||||
// Map used to keep track of request and response id pairs
|
// Map used to keep track of request and response id pairs
|
||||||
private val responseMap = HashMap<Long, Int>()
|
private val responseMap = HashMap<Long, Int>()
|
||||||
|
|
||||||
|
/** Transaction to upgrade to LTM */
|
||||||
|
private var ltmTransaction: Transaction? = null
|
||||||
|
|
||||||
private val mHandler = Handler()
|
private val mHandler = Handler()
|
||||||
|
|
||||||
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
|
||||||
|
@ -182,7 +188,8 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
|
||||||
if (responseMap.containsKey(response.id)) {
|
if (responseMap.containsKey(response.id)) {
|
||||||
val responseType = responseMap[response.id]
|
val responseType = responseMap[response.id]
|
||||||
when (responseType) {
|
when (responseType) {
|
||||||
RESPONSE_GET_DYNAMIC_GLOBAL_PARAMETERS -> handleDynamicGlobalProperties(response.result)
|
RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES_NODES -> handleDynamicGlobalPropertiesNodes(response.result)
|
||||||
|
RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES_LTM -> handleDynamicGlobalPropertiesLTM(response.result)
|
||||||
RESPONSE_BROADCAST_TRANSACTION -> handleBroadcastTransaction(response)
|
RESPONSE_BROADCAST_TRANSACTION -> handleBroadcastTransaction(response)
|
||||||
}
|
}
|
||||||
responseMap.remove(response.id)
|
responseMap.remove(response.id)
|
||||||
|
@ -193,7 +200,7 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
|
||||||
|
|
||||||
/** Handles the result of the [GetDynamicGlobalProperties] api call to obtain the current block number and update
|
/** Handles the result of the [GetDynamicGlobalProperties] api call to obtain the current block number and update
|
||||||
* it in the Nodes Dialog */
|
* it in the Nodes Dialog */
|
||||||
private fun handleDynamicGlobalProperties(result: Any?) {
|
private fun handleDynamicGlobalPropertiesNodes(result: Any?) {
|
||||||
if (result is DynamicGlobalProperties) {
|
if (result is DynamicGlobalProperties) {
|
||||||
if (mNodesDialog != null && mNodesDialog?.isShowing == true) {
|
if (mNodesDialog != null && mNodesDialog?.isShowing == true) {
|
||||||
val blockNumber = NumberFormat.getInstance().format(result.head_block_number)
|
val blockNumber = NumberFormat.getInstance().format(result.head_block_number)
|
||||||
|
@ -202,16 +209,26 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun handleDynamicGlobalPropertiesLTM(result: Any?) {
|
||||||
|
if (result is DynamicGlobalProperties) {
|
||||||
|
val expirationTime = (result.time.time / 1000) + Transaction.DEFAULT_EXPIRATION_TIME
|
||||||
|
val headBlockId = result.head_block_id
|
||||||
|
val headBlockNumber = result.head_block_number
|
||||||
|
|
||||||
|
ltmTransaction?.blockData = BlockData(headBlockNumber, headBlockId, expirationTime)
|
||||||
|
|
||||||
|
val id = mNetworkService?.sendMessage(BroadcastTransaction(ltmTransaction), BroadcastTransaction.REQUIRED_API)
|
||||||
|
if (id != null) responseMap[id] = RESPONSE_BROADCAST_TRANSACTION
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Handles the result of the [BroadcastTransaction] api call to find out if the Transaction was sent successfully
|
/** Handles the result of the [BroadcastTransaction] api call to find out if the Transaction was sent successfully
|
||||||
* or not and acts accordingly */
|
* or not and acts accordingly */
|
||||||
private fun handleBroadcastTransaction(message: JsonRpcResponse<*>) {
|
private fun handleBroadcastTransaction(message: JsonRpcResponse<*>) {
|
||||||
if (message.result == null && message.error == null) {
|
if (message.result == null && message.error == null) {
|
||||||
// context?.toast(getString(R.string.text__transaction_sent))
|
// TODO test on the testnet the actual LTM upgrade
|
||||||
//
|
|
||||||
// // Return to the main screen
|
|
||||||
// findNavController().navigateUp()
|
|
||||||
} else if (message.error != null) {
|
} else if (message.error != null) {
|
||||||
// context?.toast(message.error.message, Toast.LENGTH_LONG)
|
context?.toast(message.error.message, Toast.LENGTH_LONG)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -221,7 +238,7 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
|
||||||
private val mRequestDynamicGlobalPropertiesTask = object : Runnable {
|
private val mRequestDynamicGlobalPropertiesTask = object : Runnable {
|
||||||
override fun run() {
|
override fun run() {
|
||||||
val id = mNetworkService?.sendMessage(GetDynamicGlobalProperties(), GetDynamicGlobalProperties.REQUIRED_API)
|
val id = mNetworkService?.sendMessage(GetDynamicGlobalProperties(), GetDynamicGlobalProperties.REQUIRED_API)
|
||||||
if (id != null) responseMap[id] = RESPONSE_GET_DYNAMIC_GLOBAL_PARAMETERS
|
if (id != null) responseMap[id] = RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES_NODES
|
||||||
|
|
||||||
mHandler.postDelayed(this, Constants.BLOCK_PERIOD)
|
mHandler.postDelayed(this, Constants.BLOCK_PERIOD)
|
||||||
}
|
}
|
||||||
|
@ -439,10 +456,10 @@ class SettingsFragment : ConnectedFragment(), BaseSecurityLockDialog.OnPINPatter
|
||||||
|
|
||||||
val currentPrivateKey = ECKey.fromPrivate(
|
val currentPrivateKey = ECKey.fromPrivate(
|
||||||
DumpedPrivateKey.fromBase58(null, privateKey).key.privKeyBytes)
|
DumpedPrivateKey.fromBase58(null, privateKey).key.privKeyBytes)
|
||||||
val transaction = Transaction(currentPrivateKey, null, operations)
|
ltmTransaction = Transaction(currentPrivateKey, null, operations)
|
||||||
|
|
||||||
val id = mNetworkService?.sendMessage(BroadcastTransaction(transaction), BroadcastTransaction.REQUIRED_API)
|
val id = mNetworkService?.sendMessage(GetDynamicGlobalProperties(), GetDynamicGlobalProperties.REQUIRED_API)
|
||||||
if (id != null) responseMap[id] = RESPONSE_BROADCAST_TRANSACTION
|
if (id != null) responseMap[id] = RESPONSE_GET_DYNAMIC_GLOBAL_PROPERTIES_LTM
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue