Update block timestamp for estimating block height. Check purchases in PurchaseActivity. v0.1.9

Author: nickjvandyke

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.vandyke.sia"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 108
-        versionName "0.1.8"
+        versionCode 109
+        versionName "0.1.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         /* lets us not shrink debug builds, for faster build times. Not necessary for release builds, since we shrink those */
         multiDexEnabled true

app/src/main/java/com/vandyke/sia/data/models/wallet/WalletData.kt

@@ -8,10 +8,12 @@ import android.arch.persistence.room.Entity
 import android.arch.persistence.room.PrimaryKey
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 import java.math.BigDecimal
 
 @Entity(tableName = "wallet")
+@JsonIgnoreProperties(ignoreUnknown = true)
 data class WalletData @JsonCreator constructor(
         @JsonProperty(value = "encrypted")
         val encrypted: Boolean = false,

app/src/main/java/com/vandyke/sia/ui/main/MainActivity.kt

@@ -76,6 +76,7 @@ class MainActivity : AppCompatActivity() {
                     val purchased = client.queryPurchases(BillingClient.SkuType.SUBS)
                             .purchasesList
                             .find { it.sku == PurchaseActivity.overall_sub_sku } != null
+                    client.endConnection()
                     Prefs.cachedPurchased = purchased
                     if (!purchased) {
                         finish()

app/src/main/java/com/vandyke/sia/ui/onboarding/PurchaseActivity.kt

@@ -27,8 +27,15 @@ class PurchaseActivity : AppCompatActivity(), PurchasesUpdatedListener {
         client = BillingClient.newBuilder(this).setListener(this).build()
         client.startConnection(object : BillingClientStateListener {
             override fun onBillingSetupFinished(responseCode: Int) {
-                if (pending)
+                val purchased = client.queryPurchases(BillingClient.SkuType.SUBS)
+                        .purchasesList
+                        .find { it.sku == overall_sub_sku } != null
+                Prefs.cachedPurchased = purchased
+                if (purchased) {
+                    goToMainActivity()
+                } else if (pending) {
                     launchSubscriptionPurchase()
+                }
             }
 
             override fun onBillingServiceDisconnected() {
@@ -50,8 +57,7 @@ class PurchaseActivity : AppCompatActivity(), PurchasesUpdatedListener {
                 || purchases?.find { it.sku == overall_sub_sku } != null
                 || client.queryPurchases(BillingClient.SkuType.SUBS).purchasesList.find { it.sku == overall_sub_sku } != null) {
             Prefs.cachedPurchased = true
-            finish()
-            startActivity(Intent(this, MainActivity::class.java))
+            goToMainActivity()
         }
     }
 
@@ -72,6 +78,11 @@ class PurchaseActivity : AppCompatActivity(), PurchasesUpdatedListener {
         }
     }
 
+    private fun goToMainActivity() {
+        finish()
+        startActivity(Intent(this, MainActivity::class.java))
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         client.endConnection()

app/src/main/java/com/vandyke/sia/util/SCUtil.kt

@@ -10,7 +10,7 @@ import java.text.NumberFormat
 
 val HASTINGS_PER_SC = BigDecimal("1000000000000000000000000")
 
-val BLOCK_100k_TIMESTAMP = 1492126789
+const val BLOCK_139949_TIMESTAMP = 1517519551
 
 val UNCONFIRMED_TX_TIMESTAMP = BigDecimal("18446744073709551615")
 
@@ -33,14 +33,14 @@ fun BigDecimal.format(): String {
 object SCUtil {
     fun estimatedBlockHeightAt(time: Long): Long {
         val blockTime = 9 // overestimate
-        val diff = time - BLOCK_100k_TIMESTAMP
-        return (100000 + diff / 60 / blockTime.toLong())
+        val diff = time - BLOCK_139949_TIMESTAMP
+        return (139949 + diff / 60 / blockTime.toLong())
     }
 
     fun estimatedTimeAtBlock(height: Long): Long {
         val blockTime = 10
         val heightDiff = height - 100000
         val timeDiff = heightDiff * blockTime
-        return (BLOCK_100k_TIMESTAMP + timeDiff * 60)
+        return (BLOCK_139949_TIMESTAMP + timeDiff * 60)
     }
 }