change libboost url

.forgejo/workflows/build-apks.yaml

@@ -65,7 +65,7 @@ jobs:
           export BOOST_VERSION_DOT=1.70.0
           export BOOST_HASH=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
           set -x \
-            && curl -L -o  boost_${BOOST_VERSION}.tar.bz2 https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+            && curl -L -o boost_${BOOST_VERSION}.tar.bz2 https://archives.boost.io/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
             && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
             && tar -xf boost_${BOOST_VERSION}.tar.bz2 \
             && rm -f boost_${BOOST_VERSION}.tar.bz2 \

app/src/main/java/net/mynero/wallet/EnotesActivity.kt

@@ -111,7 +111,7 @@ class EnotesActivity : MoneroActivity() {
         }
     }
 
-    override fun onWalletServiceBound(walletService: WalletService) {
+    override fun onWalletServiceConnected(walletService: WalletService) {
         walletService.getWallet()?.let { wallet ->
             updateState(wallet)
         }

app/src/main/java/net/mynero/wallet/HomeActivity.kt

@@ -15,6 +15,7 @@ import androidx.lifecycle.ViewModel
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import net.mynero.wallet.adapter.TransactionInfoAdapter
+import net.mynero.wallet.livedata.combineLiveDatas
 import net.mynero.wallet.model.Balance
 import net.mynero.wallet.model.TransactionInfo
 import net.mynero.wallet.model.Wallet
@@ -22,6 +23,7 @@ import net.mynero.wallet.service.wallet.WalletService
 import net.mynero.wallet.util.Constants
 import net.mynero.wallet.util.PreferenceUtils
 import net.mynero.wallet.util.acitivity.MoneroActivity
+import timber.log.Timber
 
 class HomeActivity : MoneroActivity() {
 
@@ -40,7 +42,13 @@ class HomeActivity : MoneroActivity() {
     private lateinit var frozenBalanceTextView: TextView
     private lateinit var lockedBalanceTextView: TextView
 
-    private lateinit var transactionInfoAdapter: TransactionInfoAdapter
+    private val transactionInfoAdapter: TransactionInfoAdapter = TransactionInfoAdapter(false, object : TransactionInfoAdapter.Listener {
+        override fun onClickTransaction(txInfo: TransactionInfo) {
+            val intent = Intent(this@HomeActivity, TransactionActivity::class.java)
+            intent.putExtra(Constants.NAV_ARG_TXINFO, txInfo.hash)
+            startActivity(intent)
+        }
+    })
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -59,18 +67,22 @@ class HomeActivity : MoneroActivity() {
         progressBar = findViewById(R.id.sync_progress_bar)
         progressBarText = findViewById(R.id.sync_progress_text)
 
-        val streetMode = PreferenceUtils.isStreetMode(this)
-        transactionInfoAdapter = TransactionInfoAdapter(streetMode, object : TransactionInfoAdapter.TxInfoAdapterListener {
-            override fun onClickTransaction(txInfo: TransactionInfo) {
-                val intent = Intent(this@HomeActivity, TransactionActivity::class.java)
-                intent.putExtra(Constants.NAV_ARG_TXINFO, txInfo.hash)
-                startActivity(intent)
-            }
-        })
-
         txHistoryRecyclerView.layoutManager = LinearLayoutManager(this)
         txHistoryRecyclerView.adapter = transactionInfoAdapter
 
+        bindListeners()
+        bindObservers()
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                Timber.d("Back pressed")
+                stopService(Intent(this@HomeActivity, WalletService::class.java))
+                stop()
+            }
+        })
+    }
+
+    private fun bindListeners() {
         settingsImageView.setOnClickListener {
             startActivity(Intent(this, SettingsActivity::class.java))
         }
@@ -80,40 +92,129 @@ class HomeActivity : MoneroActivity() {
         receiveButton.setOnClickListener {
             startActivity(Intent(this, ReceiveActivity::class.java))
         }
+    }
 
-        viewModel.balance.observe(this) { balance ->
-            updateBalances(balance)
-        }
-
-        viewModel.transactions.observe(this) { history ->
-            updateTransactionHistory(history)
-        }
-
-        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                stop()
+    private fun bindObservers() {
+        viewModel.showWalletLabel.observe(this) { isShowWalletLabel ->
+            if (isShowWalletLabel) {
+                val wallet = walletService!!.getWalletOrThrow()
+                walletAndAccountTextView.visibility = View.VISIBLE
+                walletAndAccountTextView.text = "${wallet.name} / ${wallet.getAccountIndex()}"
+            } else {
+                walletAndAccountTextView.visibility = View.GONE
             }
-        })
+        }
+
+        viewModel.syncProgress.observe(this) { (walletConnected, heights) ->
+            if (walletConnected) {
+                val (walletBeginSyncHeight, walletHeight, daemonHeight) = heights
+                val diff = daemonHeight - walletHeight
+                val synchronized = daemonHeight > 0 && diff == 0L
+                val walletDisplayHeight = (walletHeight - 1).toString()
+                val daemonDisplayHeight = if (daemonHeight > 0) (daemonHeight - 1).toString() else "???"
+                progressBarText.visibility = View.VISIBLE
+                if (synchronized) {
+                    progressBar.visibility = View.INVISIBLE
+                    progressBarText.text = "Synchronized at $walletDisplayHeight"
+                } else {
+                    progressBar.isIndeterminate = false
+                    // Google employs the very rare kind of engineers to work on Android - engineers with negative fucking IQ
+                    // try switching the order of setting max and min here to see their brilliance and true ingenuity
+                    // and after you do that, try to find an explanation (or even a mention) of this behaviour in the docs:
+                    // https://developer.android.com/reference/android/widget/ProgressBar.html
+                    progressBar.max = daemonHeight.toInt()
+                    progressBar.min = walletBeginSyncHeight.toInt()
+                    progressBar.setProgress(walletHeight.toInt(), true)
+                    progressBar.visibility = View.VISIBLE
+                    if (walletHeight > walletBeginSyncHeight) {
+                        progressBarText.text = "Synchronizing: $walletDisplayHeight / $daemonDisplayHeight ($diff blocks remaining)"
+                    } else {
+                        progressBarText.text = "Starting wallet synchronization..."
+                    }
+                }
+            }
+        }
+
+        viewModel.balance.observe(this) { (balance, streetMode) ->
+            if (balance != null) {
+                unlockedBalanceTextView.text = if (!streetMode) Wallet.getDisplayAmount(balance.unlocked) else Constants.STREET_MODE_BALANCE
+                if (balance.frozen != 0L) {
+                    val textFrozenBalance = if (!streetMode) Wallet.getDisplayAmount(balance.frozen) else Constants.STREET_MODE_BALANCE
+                    val formattedFrozenBalance = if (balance.frozen < 0) "- $textFrozenBalance" else "+ $textFrozenBalance"
+                    frozenBalanceTextView.text = "$formattedFrozenBalance frozen"
+                    frozenBalanceTextView.visibility = View.VISIBLE
+                } else {
+                    frozenBalanceTextView.visibility = View.GONE
+                }
+                if (balance.pending != 0L) {
+                    val textUnconfirmedBalance = if (!streetMode) Wallet.getDisplayAmount(balance.pending) else Constants.STREET_MODE_BALANCE
+                    val formattedUnconfirmedBalance = if (balance.pending < 0) "- $textUnconfirmedBalance" else "+ $textUnconfirmedBalance"
+                    lockedBalanceTextView.text = "$formattedUnconfirmedBalance unconfirmed"
+                    lockedBalanceTextView.visibility = View.VISIBLE
+                } else {
+                    lockedBalanceTextView.visibility = View.GONE
+                }
+            }
+        }
+
+        viewModel.transactions.observe(this) { transactions ->
+            if (transactions.isNullOrEmpty()) {
+                val wallet = walletService?.getWallet()
+                val textResId: Int = if (wallet != null) {
+                    R.string.no_history_nget_some_monero_in_here
+                } else {
+                    R.string.no_history_loading
+                }
+                txHistoryRecyclerView.visibility = View.GONE
+                displayEmptyHistory(true, this, textResId)
+            } else {
+                // POPULATED WALLET HISTORY
+                val sortedHistory = transactions.sortedByDescending { it.timestamp }
+                if (sortedHistory.size > 100) {
+                    transactionInfoAdapter.submitList(sortedHistory.subList(0, 99))
+                } else {
+                    transactionInfoAdapter.submitList(sortedHistory)
+                }
+                txHistoryRecyclerView.visibility = View.VISIBLE
+                displayEmptyHistory(
+                    false,
+                    this,
+                    R.string.no_history_nget_some_monero_in_here,
+                )
+            }
+        }
+        viewModel.streetMode.observe(this) { streetMode ->
+            transactionInfoAdapter.submitStreetMode(streetMode)
+        }
     }
 
     override fun onResume() {
         super.onResume()
-        // label, balances and transaction history must be updated here because street mode may have been changed by another activity
-        updateWalletAndAccountLabel(walletService?.getWallet())
-        updateBalances(viewModel.balance.value)
-        updateTransactionHistory(viewModel.transactions.value)
+
+        val isMultiWalletMode = PreferenceUtils.isMultiWalletMode(this)
+        val isMultiAccountMode = PreferenceUtils.isMultiAccountMode(this)
+        val isStreetModeMode = PreferenceUtils.isStreetMode(this)
+
+        viewModel.setMultiWalletMode(isMultiWalletMode)
+        viewModel.setMultiAccountMode(isMultiAccountMode)
+        viewModel.setStreetMode(isStreetModeMode)
     }
 
-    override fun onWalletServiceBound(walletService: WalletService) {
+    override fun onWalletServiceConnected(walletService: WalletService) {
         updateState(walletService, walletService.getWallet())
     }
 
+    override fun onWalletServiceDisconnected() {
+        stop()
+    }
+
     override fun onWalletServiceNotFound() {
         stop()
     }
 
     private fun stop() {
-        walletService?.closeWallet() // TODO: just stop the service instead?
+        Timber.d("Stopping")
+        walletService?.closeWallet()
         finish()
         if (PreferenceUtils.isMultiAccountMode(this@HomeActivity)) {
             startActivity(Intent(this@HomeActivity, WalletActivity::class.java))
@@ -134,15 +235,6 @@ class HomeActivity : MoneroActivity() {
         textView.setText(textResId)
     }
 
-    private fun updateState(walletService: WalletService, wallet: Wallet?) {
-        wallet?.let {
-            updateWalletAndAccountLabel(wallet)
-        }
-        updateSynchronizationProgress(walletService, wallet)
-        updateBalances(wallet?.getBalance())
-        updateTransactionHistory(wallet?.getHistory())
-    }
-
     override fun onWalletUpdated(wallet: Wallet) {
         runOnUiThread {
             updateState(walletService!!, wallet)
@@ -151,118 +243,87 @@ class HomeActivity : MoneroActivity() {
 
     override fun onBlockchainHeightFetched(height: Long) {
         val walletService = walletService!!
-        runOnUiThread {
-            updateSynchronizationProgress(walletService, walletService.getWallet())
-        }
+        updateHeights(walletService, walletService.getWallet())
     }
 
-    private fun updateWalletAndAccountLabel(wallet: Wallet?) {
-        val isMultiWalletMode = PreferenceUtils.isMultiWalletMode(this)
-        val isMultiAccountMode = PreferenceUtils.isMultiAccountMode(this)
-        if (wallet != null && (isMultiWalletMode || isMultiAccountMode)) {
-            walletAndAccountTextView.visibility = View.VISIBLE
-            walletAndAccountTextView.text = "${wallet.name} / ${wallet.getAccountIndex()}"
-        } else {
-            walletAndAccountTextView.visibility = View.GONE
-        }
+    private fun updateState(walletService: WalletService, wallet: Wallet?) {
+        viewModel.setWalletConnected(wallet != null)
+        updateHeights(walletService, wallet)
+        viewModel.setBalance(wallet?.getBalance())
+        viewModel.setTransactions(wallet?.getHistory())
     }
 
-    private fun updateBalances(balance: Balance?) {
-        if (balance != null) {
-            val streetMode = PreferenceUtils.isStreetMode(applicationContext)
-            unlockedBalanceTextView.text = if (!streetMode) Wallet.getDisplayAmount(balance.unlocked) else Constants.STREET_MODE_BALANCE
-            if (balance.frozen != 0L) {
-                val textFrozenBalance = if (!streetMode) Wallet.getDisplayAmount(balance.frozen) else Constants.STREET_MODE_BALANCE
-                val formattedFrozenBalance = if (balance.frozen < 0) "- $textFrozenBalance" else "+ $textFrozenBalance"
-                frozenBalanceTextView.text = "$formattedFrozenBalance frozen"
-                frozenBalanceTextView.visibility = View.VISIBLE
-            } else {
-                frozenBalanceTextView.visibility = View.GONE
-            }
-            if (balance.pending != 0L) {
-                val textUnconfirmedBalance = if (!streetMode) Wallet.getDisplayAmount(balance.pending) else Constants.STREET_MODE_BALANCE
-                val formattedUnconfirmedBalance = if (balance.pending < 0) "- $textUnconfirmedBalance" else "+ $textUnconfirmedBalance"
-                lockedBalanceTextView.text = "$formattedUnconfirmedBalance unconfirmed"
-                lockedBalanceTextView.visibility = View.VISIBLE
-            } else {
-                lockedBalanceTextView.visibility = View.GONE
-            }
-        }
-    }
-
-    private fun updateTransactionHistory(history: List<TransactionInfo>?) {
-        if (history.isNullOrEmpty()) {
-            val wallet = walletService?.getWallet()
-            val textResId: Int = if (wallet != null) {
-                R.string.no_history_nget_some_monero_in_here
-            } else {
-                R.string.no_history_loading
-            }
-            txHistoryRecyclerView.visibility = View.GONE
-            displayEmptyHistory(true, this, textResId)
-        } else {
-            // POPULATED WALLET HISTORY
-            val sortedHistory = history.sortedByDescending { it.timestamp }
-            if (sortedHistory.size > 100) {
-                transactionInfoAdapter.submitList(sortedHistory.subList(0, 99))
-            } else {
-                transactionInfoAdapter.submitList(sortedHistory)
-            }
-            transactionInfoAdapter.submitStreetMode(PreferenceUtils.isStreetMode(applicationContext))
-            txHistoryRecyclerView.visibility = View.VISIBLE
-            displayEmptyHistory(
-                false,
-                this,
-                R.string.no_history_nget_some_monero_in_here,
-            )
-        }
-    }
-
-    private fun updateSynchronizationProgress(walletService: WalletService, wallet: Wallet?) {
-        wallet?.let {
-            val walletBeginSyncHeight = walletService.getWalletBeginSyncHeight()
-            val walletHeight = wallet.getBlockChainHeightJ()
-            val daemonHeight = walletService.getDaemonHeight()
-            val diff = daemonHeight - walletHeight
-            val synchronized = daemonHeight > 0 && diff == 0L
-            val walletDisplayHeight = (walletHeight - 1).toString()
-            val daemonDisplayHeight = if (daemonHeight > 0) (daemonHeight - 1).toString() else "???"
-            progressBarText.visibility = View.VISIBLE
-            if (synchronized) {
-                progressBar.visibility = View.INVISIBLE
-                progressBarText.text = "Synchronized at $walletDisplayHeight"
-            } else {
-                progressBar.isIndeterminate = false
-                // Google employs the very rare kind of engineers to work on Android - engineers with negative fucking IQ
-                // try switching the order of setting max and min here to see their brilliance and true ingenuity
-                // and after you do that, try to find an explanation (or even a mention) of this behaviour in the docs:
-                // https://developer.android.com/reference/android/widget/ProgressBar.html
-                progressBar.max = daemonHeight.toInt()
-                progressBar.min = walletBeginSyncHeight.toInt()
-                progressBar.setProgress(walletHeight.toInt(), true)
-                progressBar.visibility = View.VISIBLE
-                if (walletHeight > walletBeginSyncHeight) {
-                    progressBarText.text = "Synchronizing: $walletDisplayHeight / $daemonDisplayHeight ($diff blocks remaining)"
-                } else {
-                    progressBarText.text = "Starting wallet synchronization..."
-                }
-            }
-        }
+    private fun updateHeights(walletService: WalletService, wallet: Wallet?) {
+        viewModel.setHeights(Heights(walletService.getWalletBeginSyncHeight(), wallet?.getBlockChainHeightJ() ?: 0, walletService.getDaemonHeight()))
     }
 }
 
 internal class HomeActivityViewModel : ViewModel() {
-    private val _transactions = MutableLiveData<List<TransactionInfo>>()
-    val transactions: LiveData<List<TransactionInfo>> = _transactions
+    private val _walletConnected = MutableLiveData(false)
 
-    private val _balance: MutableLiveData<Balance> = MutableLiveData()
-    val balance: LiveData<Balance> = _balance
+    private val _multiWalletMode = MutableLiveData(false)
 
-    fun updateTransactions(newTransactions: List<TransactionInfo>) {
-        _transactions.postValue(newTransactions)
+    private val _multiAccountMode = MutableLiveData(false)
+
+    private val _streetMode = MutableLiveData(false)
+    val streetMode: LiveData<Boolean> = _streetMode
+
+    private val _heights = MutableLiveData(Heights(0L, 0L, 0L))
+
+    private val _balance: MutableLiveData<Balance?> = MutableLiveData(null)
+
+    private val _transactions = MutableLiveData<List<TransactionInfo>?>(null)
+    val transactions: LiveData<List<TransactionInfo>?> = _transactions
+
+    val showWalletLabel = combineLiveDatas(
+        _walletConnected,
+        _multiWalletMode,
+        _multiAccountMode,
+    ) { walletConnected, multiWalletMode, multiAccountMode ->
+        return@combineLiveDatas walletConnected!! && (multiWalletMode!! || multiAccountMode!!)
     }
 
-    fun updateBalance(newBalance: Balance) {
+    val syncProgress = combineLiveDatas(
+        _walletConnected,
+        _heights,
+    ) { walletConnected, heights ->
+        Pair(walletConnected!!, heights!!)
+    }
+
+    val balance = combineLiveDatas(
+        _balance,
+        _streetMode,
+    ) { balance, streetMode ->
+        Pair(balance, streetMode!!)
+    }
+
+    fun setWalletConnected(walletConnected: Boolean) {
+        _walletConnected.postValue(walletConnected)
+    }
+
+    fun setMultiWalletMode(multiWalletMode: Boolean) {
+        _multiWalletMode.postValue(multiWalletMode)
+    }
+
+    fun setMultiAccountMode(multiAccountMode: Boolean) {
+        _multiAccountMode.postValue(multiAccountMode)
+    }
+
+    fun setStreetMode(streetMode: Boolean) {
+        _streetMode.postValue(streetMode)
+    }
+
+    fun setHeights(heights: Heights) {
+        _heights.postValue(heights)
+    }
+
+    fun setBalance(newBalance: Balance?) {
         _balance.postValue(newBalance)
     }
+
+    fun setTransactions(newTransactions: List<TransactionInfo>?) {
+        _transactions.postValue(newTransactions)
+    }
 }
+
+internal data class Heights(val walletBeginSyncHeight: Long, val walletHeight: Long, val daemonHeight: Long)

app/src/main/java/net/mynero/wallet/ReceiveActivity.kt

@@ -1,11 +1,7 @@
 package net.mynero.wallet
 
-import android.content.ComponentName
-import android.content.Intent
-import android.content.ServiceConnection
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.os.IBinder
 import android.view.View
 import android.widget.ImageButton
 import android.widget.ImageView
@@ -28,6 +24,7 @@ import net.mynero.wallet.adapter.SubaddressAdapter
 import net.mynero.wallet.adapter.SubaddressAdapter.SubaddressAdapterListener
 import net.mynero.wallet.data.Subaddress
 import net.mynero.wallet.fragment.dialog.EditAddressLabelBottomSheetDialog
+import net.mynero.wallet.model.Wallet
 import net.mynero.wallet.service.wallet.WalletService
 import net.mynero.wallet.util.Helper.clipBoardCopy
 import net.mynero.wallet.util.PreferenceUtils
@@ -103,14 +100,14 @@ class ReceiveActivity : MoneroActivity() {
         }
     }
 
-    override fun onWalletServiceBound(walletService: WalletService) {
-        viewModel.refreshSubaddresses(walletService, qrCodeBackgroundColor())
+    override fun onWalletServiceConnected(walletService: WalletService) {
+        walletService.getWallet()?.let { wallet ->
+            viewModel.refreshSubaddresses(wallet, qrCodeBackgroundColor())
+        }
     }
 
-    override fun onSubaddressesUpdated() {
-        walletService?.let { walletService ->
-            viewModel.refreshSubaddresses(walletService, qrCodeBackgroundColor())
-        }
+    override fun onWalletUpdated(wallet: Wallet) {
+        viewModel.refreshSubaddresses(wallet, qrCodeBackgroundColor())
     }
 
     private fun qrCodeBackgroundColor(): Int = ContextCompat.getColor(this, R.color.oled_colorBackground)
@@ -160,9 +157,7 @@ class ReceiveViewModel : ViewModel() {
     private val _qrCode = MutableLiveData<Bitmap?>()
     val qrCode: LiveData<Bitmap?> = _qrCode
 
-    fun refreshSubaddresses(walletService: WalletService, backgroundColor: Int) {
-        val wallet = walletService.getWalletOrThrow()
-
+    fun refreshSubaddresses(wallet: Wallet, backgroundColor: Int) {
         val newSubaddresses = (0 until wallet.numSubaddresses).map { wallet.getSubaddressObject(it) }
         _subaddresses.postValue(newSubaddresses)
 

app/src/main/java/net/mynero/wallet/SendActivity.kt

@@ -203,7 +203,7 @@ class SendActivity : MoneroActivity() {
         viewModel.setEnotes(enotes)
     }
 
-    override fun onWalletServiceBound(walletService: WalletService) {
+    override fun onWalletServiceConnected(walletService: WalletService) {
         updateEnotesLabel()
     }
 
@@ -304,7 +304,7 @@ class SendActivity : MoneroActivity() {
     private fun addOutput(initial: Boolean, address: String? = null, amount: String? = null) {
         val index = destCount
         val entryView =
-            layoutInflater.inflate(R.layout.transaction_output_item, null) as ConstraintLayout
+            layoutInflater.inflate(R.layout.recycler_view_item_destination, null) as ConstraintLayout
         val removeOutputImageButton =
             entryView.findViewById<ImageButton>(R.id.remove_output_imagebutton)
         val addressField = entryView.findViewById<EditText>(R.id.address_edittext)

app/src/main/java/net/mynero/wallet/SettingsActivity.kt

@@ -192,7 +192,7 @@ class SettingsActivity : MoneroActivity() {
         }
     }
 
-    override fun onWalletServiceBound(walletService: WalletService) {
+    override fun onWalletServiceConnected(walletService: WalletService) {
         updateAccountAdapter()
     }
 

app/src/main/java/net/mynero/wallet/TransactionActivity.kt

@@ -143,7 +143,7 @@ class TransactionActivity : MoneroActivity() {
         }
     }
 
-    override fun onWalletServiceBound(walletService: WalletService) {
+    override fun onWalletServiceConnected(walletService: WalletService) {
         walletService.getWallet()?.let { wallet ->
             updateState(wallet)
         }

app/src/main/java/net/mynero/wallet/adapter/AccountAdapter.kt

@@ -27,7 +27,7 @@ class AccountAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.account_item, parent, false)
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.recycler_view_item_account, parent, false)
         return ViewHolder(listener, view, streetMode)
     }
 

app/src/main/java/net/mynero/wallet/adapter/EnotesAdapter.kt

@@ -65,7 +65,7 @@ class EnotesAdapter(
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(viewGroup.context)
-            .inflate(R.layout.enote_selection_item, viewGroup, false)
+            .inflate(R.layout.recycler_view_item_enote, viewGroup, false)
         return ViewHolder(listener, view, streetMode)
     }
 

app/src/main/java/net/mynero/wallet/adapter/NodeSelectionAdapter.kt

@@ -51,7 +51,7 @@ class NodeSelectionAdapter(
     }
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(viewGroup.context).inflate(R.layout.node_selection_item, viewGroup, false)
+        val view = LayoutInflater.from(viewGroup.context).inflate(R.layout.recycler_view_item_node, viewGroup, false)
         return ViewHolder(listener, view)
     }
 

app/src/main/java/net/mynero/wallet/adapter/SubaddressAdapter.kt

@@ -45,7 +45,7 @@ class SubaddressAdapter(
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(viewGroup.context)
-            .inflate(R.layout.address_item, viewGroup, false)
+            .inflate(R.layout.recycler_view_item_address, viewGroup, false)
         return ViewHolder(view, listener)
     }
 

app/src/main/java/net/mynero/wallet/adapter/TransactionInfoAdapter.kt

@@ -27,13 +27,12 @@ import net.mynero.wallet.util.Constants
 import net.mynero.wallet.util.DateHelper
 import net.mynero.wallet.util.Helper
 import net.mynero.wallet.util.ThemeHelper
-import timber.log.Timber
 import java.util.Calendar
 import java.util.Date
 
 class TransactionInfoAdapter(
     private var streetMode: Boolean,
-    private val listener: TxInfoAdapterListener,
+    private val listener: Listener,
 ) : RecyclerView.Adapter<TransactionInfoAdapter.ViewHolder>() {
 
     private var localDataSet: List<TransactionInfo> = emptyList()
@@ -54,7 +53,7 @@ class TransactionInfoAdapter(
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(viewGroup.context)
-            .inflate(R.layout.transaction_history_item, viewGroup, false)
+            .inflate(R.layout.recycler_view_item_transaction, viewGroup, false)
         return ViewHolder(listener, view)
     }
 
@@ -67,11 +66,11 @@ class TransactionInfoAdapter(
         return localDataSet.size
     }
 
-    interface TxInfoAdapterListener {
+    interface Listener {
         fun onClickTransaction(txInfo: TransactionInfo)
     }
 
-    class ViewHolder(val listener: TxInfoAdapterListener?, view: View) : RecyclerView.ViewHolder(view) {
+    class ViewHolder(val listener: Listener?, view: View) : RecyclerView.ViewHolder(view) {
 
         private val outboundColour: Int = ThemeHelper.getThemedColor(view.context, R.attr.negativeColor)
         private val inboundColour: Int = ThemeHelper.getThemedColor(view.context, R.attr.positiveColor)

app/src/main/java/net/mynero/wallet/adapter/WalletAdapter.kt

@@ -13,7 +13,7 @@ class WalletAdapter(
 ) : RecyclerView.Adapter<WalletAdapter.ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.wallet_item, parent, false)
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.recycler_view_item_wallet, parent, false)
         return ViewHolder(listener, view)
     }
 

app/src/main/java/net/mynero/wallet/fragment/dialog/AddNodeBottomSheetDialog.kt

@@ -32,7 +32,7 @@ class AddNodeBottomSheetDialog(val listener: AddNodeListener) : BottomSheetDialo
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.add_node_bottom_sheet_dialog, null)
+        return inflater.inflate(R.layout.bottom_sheet_dialog_add_node, null)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/net/mynero/wallet/fragment/dialog/EditNodeBottomSheetDialog.kt

@@ -33,7 +33,7 @@ class EditNodeBottomSheetDialog(val listener: EditNodeListener, val node: Node)
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.edit_node_bottom_sheet_dialog, null)
+        return inflater.inflate(R.layout.bottom_sheet_dialog_edit_node, null)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/net/mynero/wallet/fragment/dialog/NodeSelectionBottomSheetDialog.kt

@@ -28,7 +28,7 @@ class NodeSelectionBottomSheetDialog(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.node_selection_bottom_sheet_dialog, null)
+        return inflater.inflate(R.layout.bottom_sheet_dialog_node_selection, null)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/net/mynero/wallet/fragment/dialog/WalletKeysBottomSheetDialog.kt

@@ -36,7 +36,7 @@ class WalletKeysBottomSheetDialog(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.wallet_keys_bottom_sheet_dialog, container)
+        return inflater.inflate(R.layout.bottom_sheet_dialog_wallet_secrets, container)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/net/mynero/wallet/livedata/CombinedLiveDatas.kt

@@ -3,6 +3,63 @@ package net.mynero.wallet.livedata
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 
+fun <T1, T2, S> combineLiveDatas(
+    source1: LiveData<T1>,
+    source2: LiveData<T2>,
+    func: (T1?, T2?) -> S?
+): LiveData<S> {
+    val result = MediatorLiveData<S>()
+    result.addSource(source1) {
+        func(
+            source1.value,
+            source2.value,
+        )?.run { result.value = this }
+    }
+
+    result.addSource(source2) {
+        func(
+            source1.value,
+            source2.value,
+        )?.run { result.value = this }
+    }
+
+    return result
+}
+
+fun <T1, T2, T3, S> combineLiveDatas(
+    source1: LiveData<T1>,
+    source2: LiveData<T2>,
+    source3: LiveData<T3>,
+    func: (T1?, T2?, T3?) -> S?
+): LiveData<S> {
+    val result = MediatorLiveData<S>()
+    result.addSource(source1) {
+        func(
+            source1.value,
+            source2.value,
+            source3.value,
+        )?.run { result.value = this }
+    }
+
+    result.addSource(source2) {
+        func(
+            source1.value,
+            source2.value,
+            source3.value,
+        )?.run { result.value = this }
+    }
+
+    result.addSource(source3) {
+        func(
+            source1.value,
+            source2.value,
+            source3.value,
+        )?.run { result.value = this }
+    }
+
+    return result
+}
+
 fun <T1, T2, T3, T4, T5, T6, S> combineLiveDatas(
     source1: LiveData<T1>,
     source2: LiveData<T2>,

app/src/main/java/net/mynero/wallet/service/wallet/WalletService.kt

@@ -227,8 +227,9 @@ class WalletService : Service(), WalletListener, DefaultLifecycleObserver {
         }
 
         private fun handleSetSubaddressLabel(index: Int, label: String) {
-            walletRef.get()!!.setSubaddressLabel(index, label)
-            walletRef.get()!!.store()
+            val wallet = getWalletOrThrow()
+            wallet.setSubaddressLabel(index, label)
+            wallet.store()
             forEachObserver {
                 it.onSubaddressesUpdated()
             }

app/src/main/java/net/mynero/wallet/util/Constants.kt

@@ -9,7 +9,6 @@ object Constants {
     const val MNEMONIC_LANGUAGE = "English"
     const val STREET_MODE_BALANCE = "#.############"
 
-    const val PREF_USES_PROXY = "pref_uses_tor"
     const val PREF_USE_PROXY = "pref_use_proxy"
     const val PREF_PROXY = "pref_proxy"
     const val PREF_NODE = "pref_node"
@@ -25,8 +24,6 @@ object Constants {
     const val NAV_ARG_TXINFO = "nav_arg_txinfo"
 
     const val EXTRA_PREVENT_GOING_BACK = "prevent_going_back"
-    const val EXTRA_WALLET_PATH = "wallet_name"
-    const val EXTRA_WALLET_PASSWORD = "wallet_password"
     const val EXTRA_SEND_ADDRESS = "send_address"
     const val EXTRA_SEND_AMOUNT = "send_amount"
     const val EXTRA_SEND_MAX = "send_max"

app/src/main/java/net/mynero/wallet/util/acitivity/MoneroActivity.kt

@@ -19,11 +19,12 @@ abstract class MoneroActivity : LoggingActivity(), WalletServiceObserver {
             val walletService = (service as WalletService.WalletServiceBinder).service
             this@MoneroActivity.walletService = walletService
             walletService.addObserver(this@MoneroActivity)
-            onWalletServiceBound(walletService)
+            onWalletServiceConnected(walletService)
         }
 
         override fun onServiceDisconnected(className: ComponentName) {
-            Timber.i("Wallet Service disconnected for activity ${this@MoneroActivity.javaClass.simpleName}")
+            Timber.d("Wallet Service disconnected for activity ${this@MoneroActivity.javaClass.simpleName}")
+            onWalletServiceDisconnected()
             walletService = null
         }
     }
@@ -31,16 +32,22 @@ abstract class MoneroActivity : LoggingActivity(), WalletServiceObserver {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (!WalletService.RUNNING.get()) {
+            Timber.d("Wallet Service not found for activity ${this@MoneroActivity.javaClass.simpleName}")
             onWalletServiceNotFound()
         } else {
             bindService(Intent(applicationContext, WalletService::class.java), connection, 0)
         }
     }
 
-    open fun onWalletServiceBound(walletService: WalletService) {}
+    open fun onWalletServiceConnected(walletService: WalletService) {}
 
     open fun onWalletServiceNotFound() {
-        Timber.i("Finishing activity because wallet service is not running yet")
+        Timber.d("Finishing activity ${this@MoneroActivity.javaClass.simpleName} because wallet service is not found")
+        finish()
+    }
+
+    open fun onWalletServiceDisconnected() {
+        Timber.d("Finishing activity ${this@MoneroActivity.javaClass.simpleName} because wallet service disconnected")
         finish()
     }
 }

external-libs/android32.Containerfile

@@ -50,7 +50,7 @@ ARG BOOST_VERSION=1_70_0
 ARG BOOST_VERSION_DOT=1.70.0
 ARG BOOST_HASH=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
 RUN set -x \
-    && curl -L -o  boost_${BOOST_VERSION}.tar.bz2 https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+    && curl -L -o boost_${BOOST_VERSION}.tar.bz2 https://archives.boost.io/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
     && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
     && tar -xvf boost_${BOOST_VERSION}.tar.bz2 \
     && rm -f boost_${BOOST_VERSION}.tar.bz2 \

external-libs/android32_x86.Containerfile

@@ -50,7 +50,7 @@ ARG BOOST_VERSION=1_70_0
 ARG BOOST_VERSION_DOT=1.70.0
 ARG BOOST_HASH=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
 RUN set -x \
-    && curl -L -o  boost_${BOOST_VERSION}.tar.bz2 https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+    && curl -L -o boost_${BOOST_VERSION}.tar.bz2 https://archives.boost.io/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
     && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
     && tar -xvf boost_${BOOST_VERSION}.tar.bz2 \
     && rm -f boost_${BOOST_VERSION}.tar.bz2 \

external-libs/android64.Containerfile

@@ -50,7 +50,7 @@ ARG BOOST_VERSION=1_70_0
 ARG BOOST_VERSION_DOT=1.70.0
 ARG BOOST_HASH=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
 RUN set -x \
-    && curl -L -o  boost_${BOOST_VERSION}.tar.bz2 https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+    && curl -L -o boost_${BOOST_VERSION}.tar.bz2 https://archives.boost.io/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
     && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
     && tar -xvf boost_${BOOST_VERSION}.tar.bz2 \
     && rm -f boost_${BOOST_VERSION}.tar.bz2 \

external-libs/android64_x86.Containerfile

@@ -50,7 +50,7 @@ ARG BOOST_VERSION=1_70_0
 ARG BOOST_VERSION_DOT=1.70.0
 ARG BOOST_HASH=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778
 RUN set -x \
-    && curl -L -o  boost_${BOOST_VERSION}.tar.bz2 https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+    && curl -L -o boost_${BOOST_VERSION}.tar.bz2 https://archives.boost.io/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
     && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
     && tar -xvf boost_${BOOST_VERSION}.tar.bz2 \
     && rm -f boost_${BOOST_VERSION}.tar.bz2 \