Bump to v0.3.0. Fix error when entering decimal SC values. Change filesize conversion to use proper sizes for values (1000 instead of 1024). Other small things

nickjvandyke · nickjvandyke · commit c570800042ce · 2018-04-13T14:19:42.000-05:00
diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@ This app serves as an Android client for the decentralized cloud storage platfor
 This app can:
 * Run a Sia node on your device
 * Interact with all wallet functionalities of the running node - create, send, receive, etc.
-* Coming soon: upload to and download from the Sia cloud storage network (in-progress on the develop branch)
-* Coming later: SPV functionality (a.k.a. "lite wallet") once Sia implements this feature
+* Interact with the renter module, including uploading to and downloading from the Sia network
+* Coming later: Function without entire blockchain, once Sia implements this feature
 
 This app is developed independently by me. It is not an official Nebulous Labs product.
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.vandyke.sia"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 2010
-        versionName "0.2.10"
+        versionCode 3000
+        versionName "0.3.0"
         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
diff --git a/app/src/main/java/com/vandyke/sia/dagger/ApiModule.kt b/app/src/main/java/com/vandyke/sia/dagger/ApiModule.kt
@@ -27,7 +27,7 @@ class ApiModule {
     @Singleton
     fun provideSiaApi(): SiaApi {
         /* always return the actual api if it's a release build, so I don't accidentally release an update that uses the mock api */
-        return if (!BuildConfig.DEBUG || false) {
+        return if (!BuildConfig.DEBUG || true) {
             val clientBuilder = OkHttpClient.Builder()
 //                .addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
                     /* no read timeout because some Sia API calls can take a long time to return/respond */
diff --git a/app/src/main/java/com/vandyke/sia/data/remote/MockSiaApi.kt b/app/src/main/java/com/vandyke/sia/data/remote/MockSiaApi.kt
@@ -85,22 +85,30 @@ class MockSiaApi : SiaApi {
 
     private var renterData = RenterData(
             RenterSettingsData(RenterSettingsAllowanceData(
-                    BigDecimal("3629").toHastings(),
+                    BigDecimal("1769").toHastings(),
                     50,
                     12000,
                     4000
             )),
             RenterFinancialMetricsData(
                     System.currentTimeMillis(),
-                    BigDecimal("167").toHastings(),
-                    BigDecimal("154").toHastings(),
-                    BigDecimal("690").toHastings(),
-                    BigDecimal("274").toHastings(),
-                    BigDecimal("1085").toHastings()
+                    BigDecimal("16").toHastings(),
+                    BigDecimal("15").toHastings(),
+                    BigDecimal("673").toHastings(),
+                    BigDecimal("30").toHastings(),
+                    BigDecimal("1000").toHastings()
             ),
             139000
     )
 
+    private var renterPrices = PricesData(
+                System.currentTimeMillis(),
+                BigDecimal("26").toHastings(),
+                BigDecimal("82").toHastings(),
+                BigDecimal("140").toHastings(),
+                BigDecimal("75").toHastings()
+    )
+
     private val contracts = listOf(
             ContractData("dkvjsadkljfoweinfskjdnf", BigDecimal("143").toHastings(), BigDecimal("100").toHastings(), BigDecimal("156").toHastings(), BigDecimal("463").toHastings(),
                     BigDecimal("56").toHastings(), BigDecimal("673").toHastings(), 130000, 200000,
@@ -212,7 +220,7 @@ class MockSiaApi : SiaApi {
 
     override fun getScPrice(url: String): Single<ScValueData> {
         return Single.just(ScValueData(System.currentTimeMillis(),
-                BigDecimal("0.01"), BigDecimal("0.02"), BigDecimal("0.03"),
+                BigDecimal("0.012645"), BigDecimal("0.02"), BigDecimal("0.03"),
                 BigDecimal("0.04"), BigDecimal("0.05"), BigDecimal("0.06"),
                 BigDecimal("0.07"), BigDecimal("0.08"), BigDecimal("0.09"),
                 BigDecimal("0.10")
@@ -244,12 +252,7 @@ class MockSiaApi : SiaApi {
     }
 
     override fun renterPrices(): Single<PricesData> {
-        return Single.just(PricesData(
-                System.currentTimeMillis(),
-                BigDecimal("26").toHastings(),
-                BigDecimal("100").toHastings(),
-                BigDecimal("200").toHastings(),
-                BigDecimal("75").toHastings()))
+        return Single.just(renterPrices)
     }
 
     override fun renterRename(siapath: String, newSiaPath: String) = Completable.fromAction {
diff --git a/app/src/main/java/com/vandyke/sia/data/remote/SiaException.kt b/app/src/main/java/com/vandyke/sia/data/remote/SiaException.kt
@@ -26,7 +26,7 @@ sealed class SiaException(msg: String) : Throwable(msg) {
                 msg.contains("wallet has already been unlocked") -> WalletAlreadyUnlocked()
                 msg.contains("wallet must be unlocked before it can be used") -> WalletLocked()
                 msg.contains("provided encryption key is incorrect") -> WalletPasswordIncorrect()
-                msg.contains("could not read 'amount'") -> CouldNotReadAmount()
+                msg.contains("could not read amount") -> CouldNotReadAmount()
                 msg.contains("a password must be provided to newpassword") -> NewPasswordRequired()
                 msg.contains("could not read address") -> CouldNotReadAddress()
                 msg.contains("transaction cannot have an output or payout that has zero value") -> ZeroAmount()
diff --git a/app/src/main/java/com/vandyke/sia/ui/main/MainActivity.kt b/app/src/main/java/com/vandyke/sia/ui/main/MainActivity.kt
@@ -320,7 +320,7 @@ class MainActivity : AppCompatActivity() {
         AlertDialog.Builder(this)
                 .setTitle("Notice")
                 .setMessage("This is your first time loading the renter module, which will" +
-                        " take a significant amount of time; possibly over an hour. This is normal, and" +
+                        " take a significant amount of time. This is normal, and" +
                         " subsequent starts of the renter module will be much, much quicker. You are free" +
                         " to keep Sia in the background while it loads. Thanks for your patience!")
                 .setPositiveButton(android.R.string.ok) { _, _ -> Prefs.viewedFirstTimeLoadingRenter = true }
diff --git a/app/src/main/java/com/vandyke/sia/ui/node/NodeStatusFragment.kt b/app/src/main/java/com/vandyke/sia/ui/node/NodeStatusFragment.kt
@@ -1,5 +1,6 @@
 package com.vandyke.sia.ui.node
 
+import android.content.Intent
 import android.graphics.Typeface
 import android.os.Bundle
 import android.text.SpannableString
@@ -8,6 +9,7 @@ import android.text.style.StyleSpan
 import android.view.View
 import com.vandyke.sia.R
 import com.vandyke.sia.data.local.Prefs
+import com.vandyke.sia.data.siad.SiadService
 import com.vandyke.sia.data.siad.SiadSource
 import com.vandyke.sia.data.siad.SiadStatus
 import com.vandyke.sia.data.siad.SiadStatus.State.*
@@ -43,6 +45,8 @@ class NodeStatusFragment : BaseFragment() {
 
         sia_button.setOnClickListener {
             Prefs.siaManuallyStopped = !Prefs.siaManuallyStopped
+            if (!Prefs.siaManuallyStopped)
+                context!!.startService(Intent(context, SiadService::class.java))
         }
 
         siadStatus.state.observe(this) {
diff --git a/app/src/main/java/com/vandyke/sia/ui/renter/allowance/AllowanceFragment.kt b/app/src/main/java/com/vandyke/sia/ui/renter/allowance/AllowanceFragment.kt
@@ -135,15 +135,15 @@ class AllowanceFragment : BaseFragment() {
 
                         // all the conversion logic below should probably be in a method called on the VM instead
                         vm.setAllowance(funds = when (units) {
-                            "SC" -> text.toBigDecimal().toHastings()
+                            "SC" -> text.toBigDecimal().toHastings().stripDecimals()
 
                             Prefs.fiatCurrency -> {
                                 val rate = vm.scValue.value?.get(Prefs.fiatCurrency) ?: run {
                                     Light.error(allowance_swiperefresh, "Error converting ${Prefs.fiatCurrency} to SC", Snackbar.LENGTH_SHORT).show()
                                     return@editTextSpinnerDialog
                                 }
                                 val sc = text.toBigDecimal() / rate
-                                sc.toHastings()
+                                sc.toHastings().stripDecimals()
                             }
 
                         /* GB accounts for uploading once, downloading once, and storing over the current period the entered amount,
@@ -159,9 +159,9 @@ class AllowanceFragment : BaseFragment() {
                                     return@editTextSpinnerDialog
                                 }
                                 val periodLengthMonths = SiaUtil.blocksToDays(allowance.period) / 30
-                                val desiredTb = text.toBigDecimal() / BigDecimal("1024")
+                                val desiredTb = text.toBigDecimal() / BigDecimal("1000")
                                 val totalPricePerTb = prices.downloadOneTerabyte + prices.uploadOneTerabyte + (prices.storageOneTerabyteMonth * periodLengthMonths.toBigDecimal())
-                                desiredTb * totalPricePerTb + (prices.formOneContract * allowance.hosts.toBigDecimal())
+                                (desiredTb * totalPricePerTb + (prices.formOneContract * allowance.hosts.toBigDecimal())).stripDecimals()
                             }
 
                             else -> throw IllegalStateException()
diff --git a/app/src/main/java/com/vandyke/sia/ui/renter/allowance/AllowanceViewModel.kt b/app/src/main/java/com/vandyke/sia/ui/renter/allowance/AllowanceViewModel.kt
@@ -102,7 +102,6 @@ class AllowanceViewModel
                 consensusRepository.updateConsensus())
                 .io()
                 .main()
-                .track(activeTasks)
                 .track(refreshing)
                 .subscribe({}, ::onError)
 
diff --git a/app/src/main/java/com/vandyke/sia/ui/renter/files/view/fileupload/FileUploadDialog.kt b/app/src/main/java/com/vandyke/sia/ui/renter/files/view/fileupload/FileUploadDialog.kt
@@ -41,7 +41,7 @@ class FileUploadDialog : DialogFragment() {
             val path = FileUtils.getPath(context!!, it)
             if (path != null) {
                 val size = File(path).length()
-                totalSize += size.coerceAtLeast(1024 * 1024 * 40) // Sia's 40MB minimum filesize
+                totalSize += size.coerceAtLeast(1000 * 1000 * 40) // Sia's 40MB minimum filesize
                 FileUpload(path, size)
             } else {
                 FileUpload(it.toString(), 0L)
diff --git a/app/src/main/java/com/vandyke/sia/ui/renter/files/viewmodel/FilesViewModel.kt b/app/src/main/java/com/vandyke/sia/ui/renter/files/viewmodel/FilesViewModel.kt
@@ -77,7 +77,6 @@ class FilesViewModel
         filesRepository.updateFilesAndDirs()
                 .io()
                 .main()
-                .track(activeTasks)
                 .track(refreshing)
                 .subscribe({}, ::onError)
         // TODO: check that current directory is still valid
diff --git a/app/src/main/java/com/vandyke/sia/ui/wallet/view/childfragments/WalletSendFragment.kt b/app/src/main/java/com/vandyke/sia/ui/wallet/view/childfragments/WalletSendFragment.kt
@@ -12,6 +12,7 @@ import android.view.View
 import com.vandyke.sia.R
 import com.vandyke.sia.ui.wallet.view.ScannerActivity
 import com.vandyke.sia.util.KeyboardUtil
+import com.vandyke.sia.util.stripDecimals
 import com.vandyke.sia.util.toHastings
 import io.github.tonnyl.light.Light
 import kotlinx.android.synthetic.main.fragment_wallet_send.*
@@ -39,7 +40,7 @@ class WalletSendFragment : BaseWalletFragment() {
     }
 
     override fun onCheckPressed(): Boolean {
-        val sendAmount = sendAmount.text.toString().toHastings().toPlainString()
+        val sendAmount = sendAmount.text.toString().toHastings().stripDecimals().toPlainString()
         vm.send(sendAmount, sendRecipient.text.toString())
         return true
     }
diff --git a/app/src/main/java/com/vandyke/sia/ui/wallet/viewmodel/WalletViewModel.kt b/app/src/main/java/com/vandyke/sia/ui/wallet/viewmodel/WalletViewModel.kt
@@ -82,7 +82,6 @@ class WalletViewModel
                         .toCompletable())
                 .io()
                 .main()
-                .track(activeTasks)
                 .track(refreshing)
                 .subscribe({}, ::onError)
 
@@ -97,7 +96,7 @@ class WalletViewModel
         walletRepository.updateAll()
                 .io()
                 .main()
-                .track(activeTasks)
+                .track(refreshing)
                 .subscribe({}, ::onError)
     }
 
diff --git a/app/src/main/java/com/vandyke/sia/util/SiaUtil.kt b/app/src/main/java/com/vandyke/sia/util/SiaUtil.kt
@@ -24,6 +24,10 @@ fun BigDecimal.toHastings(): BigDecimal = this.multiply(HASTINGS_PER_SC)
 
 fun String.toHastings(): BigDecimal = if (this.isBlank()) BigDecimal.ZERO else BigDecimal(this).multiply(HASTINGS_PER_SC)
 
+/* need to call after toHastings() if the result is going to be sent to the Sia node, because if it
+ * receives a hastings value with decimals in it (even zeros) it will return an error */
+fun BigDecimal.stripDecimals() = this.toBigInteger().toBigDecimal()
+
 object SiaUtil {
     /** @param time timestamp, in seconds */
     fun estimatedBlockHeightAt(time: Long): Long {
diff --git a/app/src/main/java/com/vandyke/sia/util/StorageUtil.kt b/app/src/main/java/com/vandyke/sia/util/StorageUtil.kt
@@ -15,7 +15,7 @@ object StorageUtil {
     fun readableFilesizeString(filesize: Long): String {
         var size = filesize.toDouble()
         var i = 0
-        val kilo = 1024
+        val kilo = 1000
         while (size > kilo && i < 6) {
             size /= kilo
             i++
diff --git a/app/src/main/res/layout/dialog_file_upload.xml b/app/src/main/res/layout/dialog_file_upload.xml
@@ -12,10 +12,10 @@
         android:id="@+id/uploading_files_list"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:paddingTop="8dp"
         android:clipToPadding="false"
         android:maxHeight="256dp"
+        android:paddingBottom="8dp"
+        android:paddingTop="8dp"
         app:layoutManager="android.support.v7.widget.LinearLayoutManager"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -47,8 +47,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ems="2"
-        android:inputType="numberDecimal"
         android:focusable="false"
+        android:inputType="numberDecimal"
         android:maxLength="3"
         android:textAlignment="textEnd"
         android:textColor="?android:attr/textColorPrimary"
