From 565cd84761c8717010fcb8a0556bcf872ce1eca5 Mon Sep 17 00:00:00 2001
From: fekt <fekt.null@protonmail.com>
Date: Wed, 15 Feb 2023 22:46:56 -0500
Subject: [PATCH] QR code fix for hush:

---
 .../main/java/cash/z/ecc/android/di/DependenciesHolder.kt   | 4 ----
 .../main/java/cash/z/ecc/android/ui/scan/ScanViewModel.kt   | 4 +++-
 .../cash/z/ecc/android/ui/setup/WalletSetupViewModel.kt     | 6 ++++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/cash/z/ecc/android/di/DependenciesHolder.kt b/app/src/main/java/cash/z/ecc/android/di/DependenciesHolder.kt
index 5dcfce4..da1f057 100644
--- a/app/src/main/java/cash/z/ecc/android/di/DependenciesHolder.kt
+++ b/app/src/main/java/cash/z/ecc/android/di/DependenciesHolder.kt
@@ -36,9 +36,5 @@ object DependenciesHolder {
         }
     }
 
-    val feedbackFile by lazy { FeedbackFile() }
-
-    val feedbackConsole by lazy { FeedbackConsole() }
-
     val mnemonics by lazy { Mnemonics() }
 }
diff --git a/app/src/main/java/cash/z/ecc/android/ui/scan/ScanViewModel.kt b/app/src/main/java/cash/z/ecc/android/ui/scan/ScanViewModel.kt
index 1ceef91..3000ace 100644
--- a/app/src/main/java/cash/z/ecc/android/ui/scan/ScanViewModel.kt
+++ b/app/src/main/java/cash/z/ecc/android/ui/scan/ScanViewModel.kt
@@ -1,5 +1,6 @@
 package cash.z.ecc.android.ui.scan
 
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import cash.z.ecc.android.di.DependenciesHolder
 import cash.z.ecc.android.sdk.Synchronizer
@@ -15,10 +16,11 @@ class ScanViewModel : ViewModel() {
         // temporary parse code to allow both plain addresses and those that start with hush:
         // TODO: replace with more robust ZIP-321 handling of QR codes
         val address = if (qrCode.startsWith("hush:")) {
-            qrCode.substring(6, qrCode.indexOf("?").takeUnless { it == -1 } ?: qrCode.length)
+            qrCode.substring(5, qrCode.indexOf("?").takeUnless { it == -1 } ?: qrCode.length)
         } else {
             qrCode
         }
+        Log.d("SilentDragon", "address: $address")
         return if (synchronizer.validateAddress(address).isNotValid) null else address
     }
 
diff --git a/app/src/main/java/cash/z/ecc/android/ui/setup/WalletSetupViewModel.kt b/app/src/main/java/cash/z/ecc/android/ui/setup/WalletSetupViewModel.kt
index aae3768..4351529 100644
--- a/app/src/main/java/cash/z/ecc/android/ui/setup/WalletSetupViewModel.kt
+++ b/app/src/main/java/cash/z/ecc/android/ui/setup/WalletSetupViewModel.kt
@@ -1,6 +1,7 @@
 package cash.z.ecc.android.ui.setup
 
 import android.content.Context
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import cash.z.ecc.android.ZcashWalletApp
 import cash.z.ecc.android.di.DependenciesHolder
@@ -91,6 +92,7 @@ class WalletSetupViewModel : ViewModel() {
      * known by this point.
      */
     private suspend fun loadConfig(): Initializer.Config {
+
         twig("Loading config variables")
         var overwriteVks = false
         val network = ZcashWalletApp.instance.defaultNetwork
@@ -100,6 +102,10 @@ class WalletSetupViewModel : ViewModel() {
         val host = prefs[Const.Pref.SERVER_HOST] ?: Const.Default.Server.HOST
         val port = prefs[Const.Pref.SERVER_PORT] ?: Const.Default.Server.PORT
 
+        Log.d("SilentDragon", "host: $host")
+
+        // TODO: Maybe check server availability here
+
         twig("Done loading config variables")
         return Initializer.Config {
             it.importWallet(vk, birthdayHeight, network, LightWalletEndpoint(host, port, true))