Upgrade to Monero v0.17.1.1

WooKeyWallet · Oct 23, 2020 · 71e1578 · 71e1578
1 parent 5f18146
commit 71e1578
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,19 +5,19 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlinx-serialization'
 
 static def computeVersionCode() {
-    111
+    112
 }
 
 static def computeVersionName() {
-    return "2.0.0"
+    return "2.1.0"
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "io.wookey.wallet.monero"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode computeVersionCode()
         versionName computeVersionName()
 //        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/app/src/main/java/io/wookey/wallet/feature/asset/AssetFragment.kt b/app/src/main/java/io/wookey/wallet/feature/asset/AssetFragment.kt
@@ -80,7 +80,7 @@ class AssetFragment : BaseFragment() {
         viewModel.openAssetDetail.observe(this, Observer { value ->
             value?.let {
                 startActivity(it.apply {
-                    setClass(context, AssetDetailActivity::class.java)
+                    setClass(context!!, AssetDetailActivity::class.java)
                 })
             }
         })

diff --git a/app/src/main/java/io/wookey/wallet/feature/setting/MarketActivity.kt b/app/src/main/java/io/wookey/wallet/feature/setting/MarketActivity.kt
@@ -71,7 +71,7 @@ class MarketActivity : BaseTitleSecondActivity() {
         "zar"
     )
 
-    private var currentCurrency = sharedPreferences().getString("currentCurrency", CURRENCY_LIST[0])
+    private var currentCurrency = sharedPreferences().getString("currentCurrency", CURRENCY_LIST[0])?:CURRENCY_LIST[0]
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/app/src/main/java/io/wookey/wallet/support/extensions/Extensions.kt b/app/src/main/java/io/wookey/wallet/support/extensions/Extensions.kt
@@ -70,7 +70,7 @@ fun AppCompatActivity.copy(value: String?) {
     }
     val cmb = getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
     if (cmb != null) {
-        cmb.primaryClip = ClipData.newPlainText(null, value)
+        cmb.setPrimaryClip(ClipData.newPlainText(null, value))
         toast(R.string.copy_success)
     }
 }
@@ -95,7 +95,7 @@ fun androidx.fragment.app.Fragment.copy(value: String?) {
     }
     val cmb = context!!.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
     if (cmb != null) {
-        cmb.primaryClip = ClipData.newPlainText(null, value)
+        cmb.setPrimaryClip(ClipData.newPlainText(null, value))
         toast(R.string.copy_success)
     }
 }

diff --git a/monero/build.gradle b/monero/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 

diff --git a/monero/src/main/java/io/wookey/monero/util/RestoreHeight.java b/monero/src/main/java/io/wookey/monero/util/RestoreHeight.java
@@ -113,6 +113,10 @@ static public RestoreHeight getInstance() {
         blockheight.put("2020-04-01", 2066806L);
         blockheight.put("2020-05-01", 2088411L);
         blockheight.put("2020-06-01", 2110702L);
+        blockheight.put("2020-07-01", 2132318L);
+        blockheight.put("2020-08-01", 2154590L);
+        blockheight.put("2020-09-01", 2176790L);
+        blockheight.put("2020-10-01", 2198370L);
     }
 
     public long getHeight(String date) {