Merge branch 'github/main' into main

kokoro-team · kokoro-team · commit 02d0eb9fdf36 · 2021-08-09T11:48:44.000-07:00
diff --git a/BiometricLoginKotlin/app/src/main/java/com/example/biometricloginsample/LoginActivity.kt b/BiometricLoginKotlin/app/src/main/java/com/example/biometricloginsample/LoginActivity.kt
@@ -166,7 +166,7 @@ class LoginActivity : AppCompatActivity() {
         binding.login.setOnClickListener {
             loginWithPasswordViewModel.login(
                 binding.username.text.toString(),
-                binding.login.text.toString()
+                binding.password.text.toString()
             )
         }
         Log.d(TAG, "Username ${SampleAppUser.username}; fake token ${SampleAppUser.fakeToken}")

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ class LoginActivity : AppCompatActivity() {`
`166`	`166`	`binding.login.setOnClickListener {`
`167`	`167`	`loginWithPasswordViewModel.login(`
`168`	`168`	`binding.username.text.toString(),`
`169`		`- binding.login.text.toString()`
	`169`	`+ binding.password.text.toString()`
`170`	`170`	`)`
`171`	`171`	`}`
`172`	`172`	`Log.d(TAG, "Username ${SampleAppUser.username}; fake token ${SampleAppUser.fakeToken}")`