bug fix

app/build.gradle

@@ -3,34 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
-def computeVersionCode() {
-    def cmd = 'git rev-list HEAD --first-parent --count'
-    def trim = cmd.execute().text.trim()
-    if (trim == null || trim.length() == 0) {
-        trim = 1
-    }
-    trim.toInteger()
-    103
-}
-
-def gitVersionTag() {
-    def cmd = 'git describe --tags'
-    def version = cmd.execute().text.trim()
-
-    def pattern = "-(\\d+)-g"
-    def matcher = version =~ pattern
-
-    if (matcher) {
-        version = version.substring(0, matcher.start()) + "." + matcher[0][1]
-    } else {
-        version = version + ".0"
-    }
-
-    return version
+static def computeVersionCode() {
+    105
 }
 
-def computeVersionName() {
-    return "1.0.3"
+static def computeVersionName() {
+    return "1.0.5"
 }
 
 android {
@@ -70,7 +48,7 @@ android {
         variant.outputs.all { output ->
             def abiName = output.getFilter(com.android.build.OutputFile.ABI)
             if (abiName == null) abiName = "universal"
-            outputFileName = "wookey-${variant.versionName}-${variant.versionCode}-${abiName}.apk"
+            outputFileName = "monero-${variant.versionName}-${variant.versionCode}-${abiName}.apk"
         }
     }
 }

app/src/main/AndroidManifest.xml

@@ -12,7 +12,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">

app/src/main/java/io/wookey/wallet/App.kt

@@ -21,7 +21,7 @@ class App : Application() {
     companion object {
         var SYSTEM_DEFAULT_LOCALE: Locale by DelegatesExt.notNullSingleValue()
         var instance: App by DelegatesExt.notNullSingleValue()
-        var newVersion = true
+        var newVersion = false
     }
 
     override fun attachBaseContext(base: Context?) {

app/src/main/java/io/wookey/wallet/base/BaseActivity.kt

@@ -17,9 +17,13 @@ open class BaseActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         // 禁止截图
-        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+        if (hide()) {
+            window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+        }
     }
 
+    open fun hide(): Boolean = true
+
     var loadingDialog: LoadingDialog? = null
 
     open fun showLoading() {

app/src/main/java/io/wookey/wallet/feature/asset/AssetDetailViewModel.kt

@@ -146,6 +146,7 @@ class AssetDetailViewModel : BaseViewModel() {
     private fun refresh(firstBlock: Long): Long {
         var firstBlockHeight = firstBlock
         if (XMRWalletController.isSynchronized()) {
+            receiveEnabled.postValue(true)
             sendEnabled.postValue(true)
             synchronized.postValue(R.string.block_synchronized)
             synchronizeProgress.postValue(100)
@@ -167,6 +168,7 @@ class AssetDetailViewModel : BaseViewModel() {
                 synchronizeProgress.postValue(x)
                 synchronizing.postValue(n)
             } else {
+                receiveEnabled.postValue(true)
                 sendEnabled.postValue(true)
                 synchronized.postValue(R.string.block_synchronized)
                 synchronizeProgress.postValue(100)
@@ -215,7 +217,6 @@ class AssetDetailViewModel : BaseViewModel() {
 
     private fun switchNode(node: Node) {
 
-        val activeWallet = AppDatabase.getInstance().walletDao().getActiveWallet() ?: return
         val wallet = XMRWalletController.getWallet()
         // 异常处理
         if (wallet == null) {
@@ -234,6 +235,7 @@ class AssetDetailViewModel : BaseViewModel() {
             uiScope.launch {
                 try {
                     withContext(Dispatchers.IO) {
+                        val activeWallet = AppDatabase.getInstance().walletDao().getActiveWallet() ?: throw IllegalStateException()
                         XMRWalletController.stopRefresh()
                         indeterminate.postValue(null)
                         connecting.postValue(R.string.block_connecting)

app/src/main/java/io/wookey/wallet/feature/asset/AssetFragment.kt

@@ -97,6 +97,8 @@ class AssetFragment : BaseFragment() {
             adapter.notifyVisibilityChanged(false)
         })
 
+        viewModel.initVisible()
+
         AppDatabase.getInstance().walletDao().loadActiveWallet().observe(this, Observer { wallet ->
             wallet?.let {
                 centerTitle.text = it.symbol

app/src/main/java/io/wookey/wallet/feature/asset/AssetViewModel.kt

@@ -20,6 +20,15 @@ class AssetViewModel : BaseViewModel() {
 
     private var asset: Asset? = null
 
+    fun initVisible() {
+        val visible = sharedPreferences().getBoolean("assetVisible", true)
+        if (visible) {
+            assetVisible.call()
+        } else {
+            assetInvisible.call()
+        }
+    }
+
     fun onItemClick(value: Asset) {
         asset = value
         showPasswordDialog.call()

app/src/main/java/io/wookey/wallet/feature/asset/ReceiveActivity.kt

@@ -19,13 +19,14 @@ import kotlinx.android.synthetic.main.activity_receive.*
 class ReceiveActivity : BaseTitleSecondActivity() {
 
     lateinit var viewModel: ReceiveViewModel
+    var assetId: Int = -1
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_receive)
 
         val password = intent.getStringExtra("password")
-        val assetId = intent.getIntExtra("assetId", -1)
+        assetId = intent.getIntExtra("assetId", -1)
 
         if (password.isNullOrBlank()) {
             finish()
@@ -145,8 +146,12 @@ class ReceiveActivity : BaseTitleSecondActivity() {
         })
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        viewModel.handleResult(requestCode, resultCode, data)
+    override fun hide(): Boolean {
+        return false
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.setAssetId(assetId)
     }
 }

app/src/main/java/io/wookey/wallet/feature/generate/create/VerifyMnemonicActivity.kt

@@ -115,6 +115,9 @@ class VerifyMnemonicActivity : BaseTitleSecondActivity() {
             if (mnemonic1.text.isNullOrBlank()) {
                 return@setOnClickListener
             }
+            if (positionList.size != 1) {
+                return@setOnClickListener
+            }
             mnemonic1.text = ""
             positionList.removeAt(0)
             adapter.notifyDataSetChanged()
@@ -123,6 +126,9 @@ class VerifyMnemonicActivity : BaseTitleSecondActivity() {
             if (mnemonic2.text.isNullOrBlank()) {
                 return@setOnClickListener
             }
+            if (positionList.size != 2) {
+                return@setOnClickListener
+            }
             mnemonic2.text = ""
             positionList.removeAt(1)
             adapter.notifyDataSetChanged()
@@ -131,6 +137,9 @@ class VerifyMnemonicActivity : BaseTitleSecondActivity() {
             if (mnemonic3.text.isNullOrBlank()) {
                 return@setOnClickListener
             }
+            if (positionList.size != 3) {
+                return@setOnClickListener
+            }
             mnemonic3.text = ""
             positionList.removeAt(2)
             adapter.notifyDataSetChanged()

app/src/main/java/io/wookey/wallet/feature/wallet/AddressSettingActivity.kt

@@ -1,9 +1,7 @@
 package io.wookey.wallet.feature.wallet
 
-import android.app.Activity
 import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProviders
-import android.content.Intent
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
@@ -74,8 +72,6 @@ class AddressSettingActivity : BaseTitleSecondActivity() {
 
         viewModel.dataChanged.observe(this, Observer {
             adapter.notifyDataSetChanged()
-            setResult(Activity.RESULT_OK, Intent().apply { putExtra("subAddress", it) })
-            finish()
         })
 
         viewModel.showLoading.observe(this, Observer { showLoading() })

app/src/main/java/io/wookey/wallet/support/Constant.kt

@@ -42,10 +42,5 @@ val nodeArray = arrayOf(
             symbol = "XMR"
             url = "uwillrunanodesoon.moneroworld.com:18089"
             isSelected = false
-        },
-        Node().apply {
-            symbol = "XMR"
-            url = "124.160.224.28:18081"
-            isSelected = false
         }
 )

app/src/main/res/layout/activity_splash.xml

@@ -9,14 +9,6 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="204dp"
+        android:layout_marginTop="135dp"
         android:src="@drawable/icon_splash_wookey" />
-
-    <TextView
-        style="@style/text_13_93D6CF"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:includeFontPadding="false"
-        android:text="For Privacy"/>
 </LinearLayout>

app/src/main/res/layout/activity_wallet.xml

@@ -18,16 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:src="@drawable/icon_wallet" />
-
-    <TextView
-        android:id="@+id/slogan"
-        style="@style/text_12_004C6D"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="6dp"
-        android:text="@string/slogan" />
+        android:src="@drawable/icon_monero_wallet" />
 
     <Space
         android:layout_width="match_parent"

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">WooKey Wallet</string>
+    <string name="app_name">Monero Wallet</string>
 
     <string name="slogan">为 隐 私 而 生</string>
-    <string name="wallet_prompt">使用 WooKey Wallet 至少需要一个钱包，您可以选择创建钱包或导入已有的钱包</string>
+    <string name="wallet_prompt">使用 Monero Wallet 至少需要一个钱包，您可以选择创建钱包或导入已有的钱包</string>
     <string name="create_wallet">创建钱包</string>
     <string name="recovery_wallet">导入钱包</string>
 
@@ -33,7 +33,7 @@
     <string name="recovery_mnemonic">助记词导入</string>
     <string name="recovery_private_key">私钥导入</string>
     <string name="mnemonic_title">助记词</string>
-    <string name="mnemonic_prompt">输入助记词，用空格分割</string>
+    <string name="mnemonic_prompt">输入助记词，用空格分隔</string>
     <string name="block_height_prompt">* 为了极大提升区块同步速度，我们强烈建议您填写区块号或近期交易时间</string>
     <string name="block_height_optional">区块号（选填）</string>
     <string name="transaction_date">近期交易日期（选填）</string>

app/src/main/res/values/strings.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">WooKey Wallet</string>
+    <string name="app_name">Monero Wallet</string>
 
     <string name="slogan">For Privacy</string>
-    <string name="wallet_prompt">When using WooKey Wallet you must first create a new wallet or restore an existing one.</string>
+    <string name="wallet_prompt">When using Monero Wallet you must first create a new wallet or restore an existing one.</string>
     <string name="create_wallet">Create Wallet</string>
     <string name="recovery_wallet">Restore Wallet</string>
 

monero/src/main/java/io/wookey/monero/util/RestoreHeight.java

@@ -100,6 +100,7 @@ static public RestoreHeight getInstance() {
         blockheight.put("2019-03-01", 1781681L);
         blockheight.put("2019-04-01", 1803081L);
         blockheight.put("2019-05-01", 1824671L);
+        blockheight.put("2019-06-01", 1847005L);
     }
 
     public long getHeight(String date) {