z-address qr code scanner almost good to go

app/build.gradle

@@ -87,6 +87,7 @@ dependencies {
     implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0@aar'
+    //implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
     implementation 'com.google.zxing:core:3.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

app/src/main/java/org/myhush/silentdragon/QrReaderActivity.kt

@@ -169,15 +169,26 @@ class QrReaderActivity : AppCompatActivity() {
             Log.i(TAG, "It's a ws connection")
             //Toast.makeText(this, "YEAH: " + qrcodeInfo, Toast.LENGTH_SHORT).show();
 
-            val data = Intent()     // The data seems valid, so return it
+            // The data seems valid, so return it
+            val data = Intent()
+
+            data.data = Uri.parse(qrcodeInfo)
+            setResult(Activity.RESULT_OK, data)
+            finish()
+        } else if (qrcodeInfo.startsWith("zs1")) {
+            Log.i(TAG, "It's a HUSH z-address")
+            //Toast.makeText(this, "YEAH Z-ADDR: " + qrcodeInfo, Toast.LENGTH_SHORT).show();
+
+            // The data seems valid, so return it
+            val data = Intent()
+
             data.data = Uri.parse(qrcodeInfo)
             setResult(Activity.RESULT_OK, data)
             finish()
         } else {
-            Log.i(TAG, "Not a ws connection")
-            //Toast.makeText(this, "Not a ws connection", Toast.LENGTH_SHORT).show();
+            Log.i(TAG, "Not valid input")
+            Toast.makeText(this, "Not valid input", Toast.LENGTH_SHORT).show();
             setResult(Activity.RESULT_CANCELED)
-            finish()
         }
     }
 

app/src/main/java/org/myhush/silentdragon/ReceiveActivity.kt

@@ -43,8 +43,6 @@ class ReceiveActivity : AppCompatActivity() {
             override fun onTabSelected(p0: TabLayout.Tab?) {
                 if (p0?.text == "zAddr") {
                     setZAddr()
-                } else {
-                    setTAddr()
                 }
             }
 
@@ -94,12 +92,6 @@ class ReceiveActivity : AppCompatActivity() {
         }
     }
 
-    fun setTAddr() {
-        addr = DataModel.mainResponseData?.tAddress ?: ""
-        txtRcvAddrTitle.text = getString(R.string.your_hush_transparent_address)
-        setAddr()
-    }
-
     fun setZAddr() {
         addr = DataModel.mainResponseData?.saplingAddress ?: ""
         txtRcvAddrTitle.text = getString(R.string.your_hush_shielded_address)

app/src/main/java/org/myhush/silentdragon/SendActivity.kt

@@ -15,6 +15,7 @@ import android.text.Editable
 import android.text.InputType
 import android.text.SpannableStringBuilder
 import android.text.TextWatcher
+import android.util.Log
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
@@ -24,10 +25,10 @@ import kotlinx.android.synthetic.main.activity_send.*
 import kotlinx.android.synthetic.main.content_send.*
 import java.text.DecimalFormat
 
-
 class SendActivity : AppCompatActivity() {
 
     private val REQUEST_CONFIRM = 2
+    private val TAG = "SendActivity"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -51,7 +52,7 @@ class SendActivity : AppCompatActivity() {
         if (intent.getBooleanExtra("includeReplyTo", false))
             chkIncludeReplyTo.isChecked = true
 
-        imageButton.setOnClickListener { view ->
+        imageButton.setOnClickListener {
             val intent = Intent(this, QrReaderActivity::class.java)
             intent.putExtra("REQUEST_CODE",
                 QrReaderActivity.REQUEST_ADDRESS
@@ -264,6 +265,7 @@ class SendActivity : AppCompatActivity() {
         when (requestCode) {
             QrReaderActivity.REQUEST_ADDRESS -> {
                 if (resultCode == Activity.RESULT_OK) {
+                    Log.i(TAG, "Send Activity got result for QrCode: ${data?.dataString}")
                     if (data?.scheme == "hush") {
                         sendAddress.setText(data.data?.host ?: "", TextView.BufferType.EDITABLE)
 

buildSrc/src/main/java/org/myhush/silentdragon/Dependencies.kt

@@ -5,7 +5,7 @@ object Deps {
 
     const val compileSdkVersion = 29
     const val buildToolsVersion = "29.0.3"
-    const val minSdkVersion = 17
+    const val minSdkVersion = 19
     const val targetSdkVersion = 29
 
     object Kotlin : Version(kotlinVersion) {