Skip to content

Commit

Permalink
DeteKt fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandr7035 committed Jun 16, 2024
1 parent e8696bc commit dafe7fd
Show file tree
Hide file tree
Showing 30 changed files with 47 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package by.alexandr7035.votekt.data.cache
import androidx.room.Embedded
import androidx.room.Relation
import by.alexandr7035.votekt.domain.core.BlockchainActionStatus
import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus
import by.alexandr7035.votekt.domain.model.proposal.VoteType
import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus

data class ProposalWithTransactions(
@Embedded val proposal: ProposalEntity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import by.alexandr7035.votekt.data.cache.PrefKeys
import by.alexandr7035.votekt.data.security.BiometricsManager
import by.alexandr7035.votekt.data.security.CryptoUtils
import by.alexandr7035.votekt.data.security.model.BiometricEncryptedPinWrapper
import by.alexandr7035.votekt.domain.repository.AppLockRepository
import by.alexandr7035.votekt.domain.model.security.AuthenticationResult
import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability
import by.alexandr7035.votekt.domain.model.security.EncryptedPinCode
import by.alexandr7035.votekt.domain.model.security.PinCode
import by.alexandr7035.votekt.domain.repository.AppLockRepository
import com.cioccarellia.ksprefs.KsPrefs
import com.squareup.moshi.Moshi
import javax.crypto.Cipher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package by.alexandr7035.votekt.data.repository

import android.util.Log
import by.alexandr7035.votekt.BuildConfig
import by.alexandr7035.votekt.domain.repository.MnemonicRepository
import by.alexandr7035.votekt.domain.model.account.MnemonicWord
import by.alexandr7035.votekt.domain.model.account.MnemonicWordConfirm
import by.alexandr7035.votekt.domain.core.AppError
import by.alexandr7035.votekt.domain.core.ErrorType
import by.alexandr7035.votekt.domain.model.account.MnemonicWord
import by.alexandr7035.votekt.domain.model.account.MnemonicWordConfirm
import by.alexandr7035.votekt.domain.repository.MnemonicRepository
import cash.z.ecc.android.bip39.Mnemonics
import java.security.SecureRandom
import java.util.Random
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ import by.alexandr7035.ethereum.model.Wei
import by.alexandr7035.votekt.BuildConfig
import by.alexandr7035.votekt.data.cache.PrefKeys
import by.alexandr7035.votekt.data.cache.ProposalsDao
import by.alexandr7035.votekt.domain.repository.AccountRepository
import by.alexandr7035.votekt.domain.model.transactions.PrepareTransactionData
import by.alexandr7035.votekt.domain.model.transactions.ReviewTransactionData
import by.alexandr7035.votekt.domain.repository.SendTransactionRepository
import by.alexandr7035.votekt.domain.model.transactions.TransactionEstimationError
import by.alexandr7035.votekt.domain.model.transactions.TransactionHash
import by.alexandr7035.votekt.domain.repository.TransactionRepository
import by.alexandr7035.votekt.domain.model.transactions.TransactionType
import by.alexandr7035.votekt.domain.repository.AccountRepository
import by.alexandr7035.votekt.domain.repository.SendTransactionRepository
import by.alexandr7035.votekt.domain.repository.TransactionRepository
import com.cioccarellia.ksprefs.KsPrefs
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ import by.alexandr7035.votekt.data.cache.ProposalsDao
import by.alexandr7035.votekt.data.cache.mapDeployStatus
import by.alexandr7035.votekt.data.cache.mapSelfVote
import by.alexandr7035.votekt.data.cache.mapVoteStatus
import by.alexandr7035.votekt.domain.repository.AccountRepository
import by.alexandr7035.votekt.domain.core.BlockchainActionStatus
import by.alexandr7035.votekt.domain.core.OperationResult
import by.alexandr7035.votekt.domain.core.Uuid
import by.alexandr7035.votekt.domain.model.contract.ContractConfiguration
import by.alexandr7035.votekt.domain.model.contract.ContractState
import by.alexandr7035.votekt.domain.model.contract.CreateDraftProposal
import by.alexandr7035.votekt.domain.model.transactions.PrepareTransactionData
import by.alexandr7035.votekt.domain.repository.SendTransactionRepository
import by.alexandr7035.votekt.domain.model.proposal.Proposal
import by.alexandr7035.votekt.domain.model.proposal.VoteType
import by.alexandr7035.votekt.domain.repository.VotingContractRepository
import by.alexandr7035.votekt.domain.model.proposal.VotingData
import by.alexandr7035.votekt.domain.model.transactions.PrepareTransactionData
import by.alexandr7035.votekt.domain.repository.AccountRepository
import by.alexandr7035.votekt.domain.repository.SendTransactionRepository
import by.alexandr7035.votekt.domain.repository.VotingContractRepository
import com.cioccarellia.ksprefs.KsPrefs
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.delay
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import android.util.Log
import by.alexandr7035.ethereum.core.EthereumEventListener
import by.alexandr7035.ethereum.model.events.EthereumEvent
import by.alexandr7035.votekt.domain.core.OperationResult
import by.alexandr7035.votekt.domain.repository.WebsocketManager
import by.alexandr7035.votekt.domain.repository.VotingContractRepository
import by.alexandr7035.votekt.domain.repository.WebsocketManager
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package by.alexandr7035.votekt.domain.repository

import by.alexandr7035.ethereum.model.EthTransactionReceipt
import by.alexandr7035.ethereum.model.Wei
import by.alexandr7035.votekt.domain.core.OperationResult
import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain
import by.alexandr7035.votekt.domain.model.transactions.TransactionHash
import by.alexandr7035.votekt.domain.model.transactions.TransactionType
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package by.alexandr7035.votekt.domain.usecase.account

import by.alexandr7035.votekt.domain.repository.AccountRepository
import by.alexandr7035.votekt.domain.model.account.MnemonicWord
import by.alexandr7035.votekt.domain.repository.AccountRepository

class AddAccountUseCase(
private val accountRepository: AccountRepository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ class CheckAccountCreatedUseCase(
suspend fun invoke(): Boolean {
return accountRepository.isAccountPresent()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ class ConfirmNewAccountUseCase(
) {
return mnemonicRepository.confirmPhrase(mnemonic, proposedWordsToConfirm, confirmationData)
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package by.alexandr7035.votekt.domain.usecase.account

import by.alexandr7035.votekt.domain.repository.MnemonicRepository
import by.alexandr7035.votekt.domain.model.account.MnemonicWord
import by.alexandr7035.votekt.domain.repository.MnemonicRepository

class GenerateAccountUseCase(
private val mnemonicRepository: MnemonicRepository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ class GetAccountConfirmationData(
fun invoke(mnemonic: List<MnemonicWord>): List<MnemonicWordConfirm> {
return mnemonicRepository.getRandomMnemonicWords(mnemonic)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ class GetSelfAccountUseCase(
suspend fun invoke(): Address {
return accountRepository.getSelfAddress()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ class ObserveBalanceUseCase(
fun invoke(): Flow<Wei> {
return accountRepository.observeAccountBalance()
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package by.alexandr7035.votekt.domain.usecase.debug

import by.alexandr7035.votekt.domain.repository.MnemonicRepository
import by.alexandr7035.votekt.domain.model.account.MnemonicWord
import by.alexandr7035.votekt.domain.repository.MnemonicRepository

class GetTestMnemonicUseCase(
private val mnemonicRepository: MnemonicRepository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ class DeployDraftProposalUseCase(
suspend fun invoke(proposalUuid: Uuid): OperationResult<Unit> {
return votingContractRepository.deployDraftProposal(proposalUuid)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ class CancelOutgoingTransactionUseCase(
suspend fun invoke() {
return sendTransactionRepository.cancelCurrentTransaction()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ class ClearTransactionsUseCase(
suspend fun invoke() {
return transactionRepository.clearTransactions()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ class ConfirmOutgoingTransactionUseCase(
suspend fun invoke() {
return sendTransactionRepository.confirmCurrentTransaction()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ class ObserveOutgoingTransactionUseCase(
fun invoke(): StateFlow<ReviewTransactionData?> {
return sendTransactionRepository.state
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class ObserveTransactionsUseCase(
private val transactionRepository: TransactionRepository
) {
fun invoke() = transactionRepository.observeTransactions()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package by.alexandr7035.votekt.ui.components.preview
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import by.alexandr7035.ethereum.model.Wei
import by.alexandr7035.votekt.domain.core.BlockchainActionStatus
import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain
import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus
import by.alexandr7035.votekt.domain.model.transactions.TransactionType
import by.alexandr7035.votekt.domain.model.proposal.Proposal
import by.alexandr7035.votekt.domain.model.proposal.VoteType
import by.alexandr7035.votekt.domain.model.proposal.VotingData
import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain
import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus
import by.alexandr7035.votekt.domain.model.transactions.TransactionType
import org.kethereum.model.Address
import java.math.BigInteger
import kotlin.time.Duration.Companion.days
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package by.alexandr7035.votekt.ui.components.preview
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import by.alexandr7035.ethereum.model.Wei
import by.alexandr7035.votekt.domain.core.BlockchainActionStatus
import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain
import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus
import by.alexandr7035.votekt.domain.model.transactions.TransactionType
import by.alexandr7035.votekt.domain.model.proposal.Proposal
import by.alexandr7035.votekt.domain.model.proposal.VoteType
import by.alexandr7035.votekt.domain.model.proposal.VotingData
import by.alexandr7035.votekt.domain.model.transactions.TransactionDomain
import by.alexandr7035.votekt.domain.model.transactions.TransactionStatus
import by.alexandr7035.votekt.domain.model.transactions.TransactionType
import org.kethereum.model.Address
import java.math.BigInteger
import kotlin.time.Duration.Companion.days
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import by.alexandr7035.ethereum.model.events.EthEventsSubscriptionState
import by.alexandr7035.votekt.R
import by.alexandr7035.votekt.domain.core.OperationResult
import by.alexandr7035.votekt.domain.model.explorer.ExploreType
import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockUseCase
import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockedWithBiometricsUseCase
import by.alexandr7035.votekt.domain.model.transactions.ReviewTransactionData
import by.alexandr7035.votekt.domain.usecase.account.CheckAccountCreatedUseCase
import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockUseCase
import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockedWithBiometricsUseCase
import by.alexandr7035.votekt.domain.usecase.explorer.GetBlockchainExplorerUrlUseCase
import by.alexandr7035.votekt.domain.usecase.node.ConnectToNodeUseCase
import by.alexandr7035.votekt.domain.usecase.transactions.ConfirmOutgoingTransactionUseCase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package by.alexandr7035.votekt.ui.feature.account.create
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import by.alexandr7035.votekt.domain.model.account.MnemonicWord
import by.alexandr7035.votekt.domain.core.ErrorType
import by.alexandr7035.votekt.domain.core.OperationResult
import by.alexandr7035.votekt.domain.model.account.MnemonicWord
import by.alexandr7035.votekt.domain.usecase.account.AddAccountUseCase
import by.alexandr7035.votekt.domain.usecase.account.ConfirmNewAccountUseCase
import by.alexandr7035.votekt.domain.usecase.account.GetAccountConfirmationData
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package by.alexandr7035.votekt.ui.feature.account.restore

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import by.alexandr7035.votekt.domain.model.account.MnemonicWord
import by.alexandr7035.votekt.domain.core.OperationResult
import by.alexandr7035.votekt.domain.model.account.MnemonicWord
import by.alexandr7035.votekt.domain.usecase.account.AddAccountUseCase
import by.alexandr7035.votekt.domain.usecase.account.VerifyMnemonicPhraseUseCase
import by.alexandr7035.votekt.domain.usecase.debug.GetTestMnemonicUseCase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import by.alexandr7035.votekt.R
import by.alexandr7035.votekt.domain.core.OperationResult
import by.alexandr7035.votekt.domain.model.security.AuthenticationResult
import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability
import by.alexandr7035.votekt.domain.model.security.PinCode
import by.alexandr7035.votekt.domain.usecase.account.LogoutUseCase
import by.alexandr7035.votekt.domain.usecase.applock.AuthenticateWithPinUseCase
import by.alexandr7035.votekt.domain.usecase.applock.CheckAppLockedWithBiometricsUseCase
import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase
import by.alexandr7035.votekt.domain.usecase.applock.DecryptPinWithBiometricsUseCase
import by.alexandr7035.votekt.domain.usecase.applock.GetBiometricDecryptionCipherUseCase
import by.alexandr7035.votekt.domain.usecase.applock.GetBiometricEncryptedPinUseCase
import by.alexandr7035.votekt.domain.model.security.AuthenticationResult
import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability
import by.alexandr7035.votekt.domain.model.security.PinCode
import by.alexandr7035.votekt.domain.usecase.account.LogoutUseCase
import by.alexandr7035.votekt.ui.core.resources.UiText
import by.alexandr7035.votekt.ui.feature.applock.core.AppLockUiState
import by.alexandr7035.votekt.ui.feature.applock.core.BiometricAuthResult
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import by.alexandr7035.votekt.R
import by.alexandr7035.votekt.domain.core.OperationResult
import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase
import by.alexandr7035.votekt.domain.usecase.applock.SetupAppLockedWithBiometricsUseCase
import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability
import by.alexandr7035.votekt.domain.model.security.PinCode
import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase
import by.alexandr7035.votekt.domain.usecase.applock.SetupAppLockedWithBiometricsUseCase
import by.alexandr7035.votekt.ui.core.resources.UiText
import by.alexandr7035.votekt.ui.feature.applock.core.BiometricAuthResult
import by.alexandr7035.votekt.ui.feature.applock.core.BiometricsPromptUi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package by.alexandr7035.votekt.ui.feature.applock.setup.pincode
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import by.alexandr7035.votekt.R
import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase
import by.alexandr7035.votekt.domain.usecase.applock.SetupAppLockUseCase
import by.alexandr7035.votekt.domain.model.security.BiometricsAvailability
import by.alexandr7035.votekt.domain.model.security.PinCode
import by.alexandr7035.votekt.domain.usecase.applock.CheckIfBiometricsAvailableUseCase
import by.alexandr7035.votekt.domain.usecase.applock.SetupAppLockUseCase
import by.alexandr7035.votekt.ui.core.resources.UiText
import by.alexandr7035.votekt.ui.feature.applock.core.AppLockUiState
import de.palm.composestateevents.consumed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import androidx.lifecycle.viewModelScope
import by.alexandr7035.votekt.domain.core.ErrorType
import by.alexandr7035.votekt.domain.core.OperationResult
import by.alexandr7035.votekt.domain.core.Uuid
import by.alexandr7035.votekt.domain.model.proposal.VoteType
import by.alexandr7035.votekt.domain.usecase.contract.GetContractConfigurationUseCase
import by.alexandr7035.votekt.domain.usecase.proposal.DeleteDraftProposalUseCase
import by.alexandr7035.votekt.domain.usecase.proposal.DeployDraftProposalUseCase
import by.alexandr7035.votekt.domain.usecase.proposal.ObserveProposalUseCase
import by.alexandr7035.votekt.domain.usecase.proposal.VoteOnProposalUseCase
import by.alexandr7035.votekt.domain.model.proposal.VoteType
import by.alexandr7035.votekt.domain.usecase.proposal.DeployDraftProposalUseCase
import by.alexandr7035.votekt.ui.uiError
import de.palm.composestateevents.consumed
import de.palm.composestateevents.triggered
Expand Down

0 comments on commit dafe7fd

Please sign in to comment.