Skip to content

Commit

Permalink
Morelo changes WooKeyWallet#7
Browse files Browse the repository at this point in the history
  • Loading branch information
MrKris7100 committed Jan 21, 2024
1 parent 06a7919 commit fe3512b
Show file tree
Hide file tree
Showing 103 changed files with 495 additions and 495 deletions.
12 changes: 6 additions & 6 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -231,17 +231,17 @@

-keepattributes *Annotation*, InnerClasses
-dontnote kotlinx.serialization.SerializationKt
-keep,includedescriptorclasses class io.wookey.wallet.**$$serializer { *; } # <-- change package name to your app's
-keepclassmembers class io.wookey.wallet.** { # <-- change package name to your app's
-keep,includedescriptorclasses class io.morelonetwork.wallet.**$$serializer { *; } # <-- change package name to your app's
-keepclassmembers class io.morelonetwork.wallet.** { # <-- change package name to your app's
*** Companion;
}
-keepclasseswithmembers class io.wookey.wallet.** { # <-- change package name to your app's
-keepclasseswithmembers class io.morelonetwork.wallet.** { # <-- change package name to your app's
kotlinx.serialization.KSerializer serializer(...);
}

-dontwarn io.wookey.monero.**
-keep class io.wookey.monero.** { *; }
-keep interface io.wookey.monero.** { *; }
-dontwarn io.morelonetwork.monero.**
-keep class io.morelonetwork.monero.** { *; }
-keep interface io.morelonetwork.monero.** { *; }

-assumenosideeffects class android.util.Log {
public static *** v(...);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.wookey.wallet
package io.morelonetwork.wallet

import android.app.Activity

Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/io/morelonetwork/wallet/App.kt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package io.wookey.wallet
package io.morelonetwork.wallet

import android.app.Activity
import android.app.Application
import android.content.Context
import android.content.res.Configuration
import android.os.Bundle
import io.wookey.wallet.support.VersionManager
import io.wookey.wallet.support.extensions.getLocale
import io.wookey.wallet.support.extensions.getSystemDefaultLocale
import io.wookey.wallet.support.extensions.setLocale
import io.morelonetwork.wallet.support.VersionManager
import io.morelonetwork.wallet.support.extensions.getLocale
import io.morelonetwork.wallet.support.extensions.getSystemDefaultLocale
import io.morelonetwork.wallet.support.extensions.setLocale
import java.util.*

class App : Application() {
Expand Down
22 changes: 11 additions & 11 deletions app/src/main/java/io/morelonetwork/wallet/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package io.wookey.wallet
package io.morelonetwork.wallet

import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import io.wookey.wallet.base.BaseActivity
import io.wookey.wallet.core.XMRWalletController
import io.wookey.wallet.feature.asset.AssetFragment
import io.wookey.wallet.feature.setting.LanguageActivity
import io.wookey.wallet.feature.setting.SettingFragment
import io.wookey.wallet.feature.swap.SwapFragment
import io.wookey.wallet.support.BackgroundHelper
import io.wookey.wallet.support.extensions.dp2px
import io.wookey.wallet.support.utils.StatusBarHelper
import io.wookey.wallet.widget.IOSDialog
import io.morelonetwork.wallet.base.BaseActivity
import io.morelonetwork.wallet.core.XMRWalletController
import io.morelonetwork.wallet.feature.asset.AssetFragment
import io.morelonetwork.wallet.feature.setting.LanguageActivity
import io.morelonetwork.wallet.feature.setting.SettingFragment
import io.morelonetwork.wallet.feature.swap.SwapFragment
import io.morelonetwork.wallet.support.BackgroundHelper
import io.morelonetwork.wallet.support.extensions.dp2px
import io.morelonetwork.wallet.support.utils.StatusBarHelper
import io.morelonetwork.wallet.widget.IOSDialog
import kotlinx.android.synthetic.main.activity_main.*

class MainActivity : BaseActivity() {
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/java/io/morelonetwork/wallet/SplashActivity.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package io.wookey.wallet
package io.morelonetwork.wallet

import android.content.Intent
import android.os.Bundle
import android.util.Log
import io.wookey.wallet.base.BaseActivity
import io.wookey.wallet.data.AppDatabase
import io.wookey.wallet.dialog.PrivacyDialog
import io.wookey.wallet.feature.generate.WalletActivity
import io.wookey.wallet.feature.generate.create.BackupMnemonicActivity
import io.wookey.wallet.support.extensions.putBoolean
import io.wookey.wallet.support.extensions.sharedPreferences
import io.morelonetwork.wallet.base.BaseActivity
import io.morelonetwork.wallet.data.AppDatabase
import io.morelonetwork.wallet.dialog.PrivacyDialog
import io.morelonetwork.wallet.feature.generate.WalletActivity
import io.morelonetwork.wallet.feature.generate.create.BackupMnemonicActivity
import io.morelonetwork.wallet.support.extensions.putBoolean
import io.morelonetwork.wallet.support.extensions.sharedPreferences
import kotlinx.coroutines.*

class SplashActivity : BaseActivity() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ object XMRWalletController {
password: String,
mnemonic: String,
restoreHeight: Long
): io.wookey.wallet.data.entity.Wallet {
): io.morelonetwork.wallet.data.entity.Wallet {
val newWallet = WalletManager.getInstance()
.recoveryWallet(aFile, password, mnemonic, restoreHeight)
val success = newWallet.status == Wallet.Status.Status_Ok
Expand All @@ -60,7 +60,7 @@ object XMRWalletController {
address: String,
viewKey: String,
spendKey: String
): io.wookey.wallet.data.entity.Wallet {
): io.morelonetwork.wallet.data.entity.Wallet {
val newWallet = WalletManager.getInstance()
.createWalletWithKeys(
aFile,
Expand All @@ -75,13 +75,13 @@ object XMRWalletController {
return close(success, newWallet)
}

private fun close(success: Boolean, newWallet: Wallet): io.wookey.wallet.data.entity.Wallet {
private fun close(success: Boolean, newWallet: Wallet): io.morelonetwork.wallet.data.entity.Wallet {
try {
if (!success) {
throw RuntimeException(newWallet.errorString)
} else {
val sym = sharedPreferences().getString("symbol", "") ?: ""
return io.wookey.wallet.data.entity.Wallet().apply {
return io.morelonetwork.wallet.data.entity.Wallet().apply {
symbol = sym
name = newWallet.name
address = newWallet.address
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package io.morelonetwork.wallet.data.dao

import androidx.lifecycle.LiveData
import androidx.room.*
import io.wookey.wallet.data.entity.AddressBook
import io.wookey.wallet.data.entity.Asset
import io.morelonetwork.wallet.data.entity.AddressBook
import io.morelonetwork.wallet.data.entity.Asset

@Dao
interface AddressBookDao {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.morelonetwork.wallet.data.dao

import androidx.lifecycle.LiveData
import androidx.room.*
import io.wookey.wallet.data.entity.Asset
import io.morelonetwork.wallet.data.entity.Asset

@Dao
interface AssetDao {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.morelonetwork.wallet.data.dao

import androidx.lifecycle.LiveData
import androidx.room.*
import io.wookey.wallet.data.entity.Node
import io.morelonetwork.wallet.data.entity.Node

@Dao
interface NodeDao {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package io.wookey.wallet.feature.asset
package io.morelonetwork.wallet.feature.asset

import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
import android.content.Intent
import android.os.Bundle
import android.view.View
import io.wookey.wallet.R
import io.wookey.wallet.base.BaseTitleSecondActivity
import io.wookey.wallet.feature.wallet.AddressSettingActivity
import io.wookey.wallet.support.BackgroundHelper
import io.wookey.wallet.support.REQUEST_SELECT_SUB_ADDRESS
import io.wookey.wallet.support.extensions.afterTextChanged
import io.wookey.wallet.support.extensions.copy
import io.wookey.wallet.support.extensions.dp2px
import io.wookey.wallet.support.extensions.toast
import io.morelonetwork.wallet.R
import io.morelonetwork.wallet.base.BaseTitleSecondActivity
import io.morelonetwork.wallet.feature.wallet.AddressSettingActivity
import io.morelonetwork.wallet.support.BackgroundHelper
import io.morelonetwork.wallet.support.REQUEST_SELECT_SUB_ADDRESS
import io.morelonetwork.wallet.support.extensions.afterTextChanged
import io.morelonetwork.wallet.support.extensions.copy
import io.morelonetwork.wallet.support.extensions.dp2px
import io.morelonetwork.wallet.support.extensions.toast
import kotlinx.android.synthetic.main.activity_receive.*

class ReceiveActivity : BaseTitleSecondActivity() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package io.wookey.wallet.feature.asset
package io.morelonetwork.wallet.feature.asset

import android.app.Activity
import androidx.lifecycle.MutableLiveData
import android.content.Intent
import android.graphics.Bitmap
import cn.bingoogolapple.qrcode.zxing.QRCodeEncoder
import io.wookey.wallet.R
import io.wookey.wallet.base.BaseViewModel
import io.wookey.wallet.core.XMRWalletController
import io.wookey.wallet.data.AppDatabase
import io.wookey.wallet.data.entity.Asset
import io.wookey.wallet.data.entity.Wallet
import io.wookey.wallet.support.REQUEST_SELECT_SUB_ADDRESS
import io.wookey.wallet.support.extensions.dp2px
import io.wookey.wallet.support.viewmodel.SingleLiveEvent
import io.morelonetwork.wallet.R
import io.morelonetwork.wallet.base.BaseViewModel
import io.morelonetwork.wallet.core.XMRWalletController
import io.morelonetwork.wallet.data.AppDatabase
import io.morelonetwork.wallet.data.entity.Asset
import io.morelonetwork.wallet.data.entity.Wallet
import io.morelonetwork.wallet.support.REQUEST_SELECT_SUB_ADDRESS
import io.morelonetwork.wallet.support.extensions.dp2px
import io.morelonetwork.wallet.support.viewmodel.SingleLiveEvent
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package io.wookey.wallet.feature.asset
package io.morelonetwork.wallet.feature.asset

import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
import android.content.Intent
import android.os.Bundle
import android.view.View
import io.wookey.wallet.R
import io.wookey.wallet.base.BaseTitleSecondActivity
import io.wookey.wallet.data.AppDatabase
import io.wookey.wallet.feature.address.AddressBookActivity
import io.wookey.wallet.feature.address.ScanActivity
import io.wookey.wallet.support.BackgroundHelper
import io.wookey.wallet.support.REQUEST_SCAN_ADDRESS
import io.wookey.wallet.support.REQUEST_SELECT_ADDRESS
import io.wookey.wallet.support.extensions.afterTextChanged
import io.wookey.wallet.support.extensions.formatterAmountStrip
import io.wookey.wallet.support.extensions.setImage
import io.wookey.wallet.support.extensions.toast
import io.morelonetwork.wallet.R
import io.morelonetwork.wallet.base.BaseTitleSecondActivity
import io.morelonetwork.wallet.data.AppDatabase
import io.morelonetwork.wallet.feature.address.AddressBookActivity
import io.morelonetwork.wallet.feature.address.ScanActivity
import io.morelonetwork.wallet.support.BackgroundHelper
import io.morelonetwork.wallet.support.REQUEST_SCAN_ADDRESS
import io.morelonetwork.wallet.support.REQUEST_SELECT_ADDRESS
import io.morelonetwork.wallet.support.extensions.afterTextChanged
import io.morelonetwork.wallet.support.extensions.formatterAmountStrip
import io.morelonetwork.wallet.support.extensions.setImage
import io.morelonetwork.wallet.support.extensions.toast
import kotlinx.android.synthetic.main.activity_send.*

class SendActivity : BaseTitleSecondActivity() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package io.wookey.wallet.feature.asset
package io.morelonetwork.wallet.feature.asset

import android.app.Activity
import androidx.lifecycle.MediatorLiveData
import androidx.lifecycle.MutableLiveData
import android.content.Intent
import io.wookey.wallet.base.BaseViewModel
import io.wookey.wallet.core.XMRWalletController
import io.wookey.wallet.data.entity.Asset
import io.wookey.wallet.data.entity.Wallet
import io.wookey.wallet.support.REQUEST_SCAN_ADDRESS
import io.wookey.wallet.support.REQUEST_SELECT_ADDRESS
import io.wookey.wallet.support.extensions.formatterAmountStrip
import io.morelonetwork.wallet.base.BaseViewModel
import io.morelonetwork.wallet.core.XMRWalletController
import io.morelonetwork.wallet.data.entity.Asset
import io.morelonetwork.wallet.data.entity.Wallet
import io.morelonetwork.wallet.support.REQUEST_SCAN_ADDRESS
import io.morelonetwork.wallet.support.REQUEST_SELECT_ADDRESS
import io.morelonetwork.wallet.support.extensions.formatterAmountStrip
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package io.wookey.wallet.feature.asset
package io.morelonetwork.wallet.feature.asset

import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
import android.os.Bundle
import android.view.View
import io.wookey.wallet.R
import io.wookey.wallet.base.BaseTitleSecondActivity
import io.wookey.wallet.data.entity.TransactionInfo
import io.wookey.wallet.support.BackgroundHelper
import io.wookey.wallet.support.extensions.copy
import io.wookey.wallet.support.extensions.formatterAmountStrip
import io.wookey.wallet.support.extensions.formatterDate
import io.morelonetwork.wallet.R
import io.morelonetwork.wallet.base.BaseTitleSecondActivity
import io.morelonetwork.wallet.data.entity.TransactionInfo
import io.morelonetwork.wallet.support.BackgroundHelper
import io.morelonetwork.wallet.support.extensions.copy
import io.morelonetwork.wallet.support.extensions.formatterAmountStrip
import io.morelonetwork.wallet.support.extensions.formatterDate
import kotlinx.android.synthetic.main.activity_transaction_detail.*

class TransactionDetailActivity : BaseTitleSecondActivity() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.wookey.wallet.feature.asset
package io.morelonetwork.wallet.feature.asset

import androidx.lifecycle.MutableLiveData
import android.graphics.Bitmap
import cn.bingoogolapple.qrcode.zxing.QRCodeEncoder
import io.wookey.wallet.base.BaseViewModel
import io.wookey.wallet.support.extensions.dp2px
import io.morelonetwork.wallet.base.BaseViewModel
import io.morelonetwork.wallet.support.extensions.dp2px
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.wookey.wallet.feature.asset
package io.morelonetwork.wallet.feature.asset

import android.content.Intent
import android.os.Bundle
Expand All @@ -8,14 +8,14 @@ import androidx.recyclerview.widget.RecyclerView
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import io.wookey.wallet.R
import io.wookey.wallet.base.BaseFragment
import io.wookey.wallet.data.entity.TransactionInfo
import io.wookey.wallet.support.extensions.dp2px
import io.wookey.wallet.support.extensions.formatterAmountStrip
import io.wookey.wallet.support.extensions.formatterDate
import io.wookey.wallet.widget.DividerItemDecoration
import io.wookey.wallet.widget.StatusAdapterWrapper
import io.morelonetwork.wallet.R
import io.morelonetwork.wallet.base.BaseFragment
import io.morelonetwork.wallet.data.entity.TransactionInfo
import io.morelonetwork.wallet.support.extensions.dp2px
import io.morelonetwork.wallet.support.extensions.formatterAmountStrip
import io.morelonetwork.wallet.support.extensions.formatterDate
import io.morelonetwork.wallet.widget.DividerItemDecoration
import io.morelonetwork.wallet.widget.StatusAdapterWrapper
import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.main.fragment_transfet.*
import kotlinx.android.synthetic.main.item_transaction.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.wookey.wallet.feature.auth
package io.morelonetwork.wallet.feature.auth

import android.content.Intent
import android.os.Build
Expand All @@ -8,13 +8,13 @@ import androidx.biometric.BiometricPrompt
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import io.wookey.wallet.R
import io.wookey.wallet.base.BaseActivity
import io.wookey.wallet.data.entity.WalletRelease
import io.wookey.wallet.dialog.PasswordDialog
import io.wookey.wallet.support.REQUEST_PATTERN_CHECKING
import io.wookey.wallet.support.extensions.getCipher
import io.wookey.wallet.support.extensions.getSecretKey
import io.morelonetwork.wallet.R
import io.morelonetwork.wallet.base.BaseActivity
import io.morelonetwork.wallet.data.entity.WalletRelease
import io.morelonetwork.wallet.dialog.PasswordDialog
import io.morelonetwork.wallet.support.REQUEST_PATTERN_CHECKING
import io.morelonetwork.wallet.support.extensions.getCipher
import io.morelonetwork.wallet.support.extensions.getSecretKey
import javax.crypto.Cipher
import javax.crypto.spec.IvParameterSpec

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.wookey.wallet.feature.auth
package io.morelonetwork.wallet.feature.auth

import android.graphics.Canvas
import android.graphics.Paint
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.wookey.wallet.feature.auth
package io.morelonetwork.wallet.feature.auth

import android.graphics.Canvas
import com.github.ihsg.patternlocker.CellBean
Expand Down
Loading

0 comments on commit fe3512b

Please sign in to comment.