This commit is contained in:
Niels Andriesse
2020-01-07 10:52:50 +11:00
parent 23770f79a9
commit 9dee062976
11 changed files with 57 additions and 42 deletions

View File

@@ -23,11 +23,6 @@ class DisplayNameActivity : BaseActionBarActivity() {
registerButton.setOnClickListener { register() }
}
override fun onResume() {
super.onResume()
displayNameEditText.requestFocus()
}
private fun register() {
val displayName = displayNameEditText.text.toString().trim()
if (displayName.isEmpty()) {

View File

@@ -121,7 +121,7 @@ class ViewMyQRCodeFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val size = toPx(240, resources)
val size = toPx(280, resources)
val qrCode = QRCodeUtilities.encode(hexEncodedPublicKey, size)
qrCodeImageView.setImageBitmap(qrCode)
val explanation = SpannableStringBuilder("This is your unique public QR code. Other users may scan this in order to begin a conversation with you.")
@@ -137,7 +137,7 @@ class ViewMyQRCodeFragment : Fragment() {
val file = File(directory, fileName)
file.createNewFile()
val fos = FileOutputStream(file)
val size = toPx(240, resources)
val size = toPx(280, resources)
val qrCode = QRCodeUtilities.encode(hexEncodedPublicKey, size, false)
qrCode.compress(Bitmap.CompressFormat.PNG, 100, fos)
fos.flush()

View File

@@ -7,6 +7,7 @@ import android.content.Intent
import android.graphics.Typeface
import android.net.Uri
import android.os.Bundle
import android.os.Handler
import android.text.Spannable
import android.text.SpannableStringBuilder
import android.text.style.StyleSpan
@@ -87,7 +88,32 @@ class RegisterActivity : BaseActionBarActivity() {
}
private fun updatePublicKeyTextView() {
publicKeyTextView.text = keyPair!!.hexEncodedPublicKey
val hexEncodedPublicKey = keyPair!!.hexEncodedPublicKey
val characterCount = hexEncodedPublicKey.count()
var count = 0
val limit = 40
fun animate() {
val numberOfIndexesToShuffle = (0 until (40 - count)).random()
val indexesToShuffle = (0 until characterCount).shuffled().subList(0, numberOfIndexesToShuffle)
var mangledHexEncodedPublicKey = hexEncodedPublicKey
for (index in indexesToShuffle) {
try {
mangledHexEncodedPublicKey = mangledHexEncodedPublicKey.substring(0, index) + "0123456789abcdef________________".random() + mangledHexEncodedPublicKey.substring(index + 1, mangledHexEncodedPublicKey.count())
} catch (exception: Exception) {
// Do nothing
}
}
count += 1
if (count < limit) {
publicKeyTextView.text = mangledHexEncodedPublicKey
Handler().postDelayed({
animate()
}, 40)
} else {
publicKeyTextView.text = hexEncodedPublicKey
}
}
animate()
}
// endregion

View File

@@ -44,11 +44,6 @@ class RestoreActivity : BaseActionBarActivity() {
termsButton.text = termsExplanation
termsButton.setOnClickListener { showTerms() }
}
override fun onResume() {
super.onResume()
mnemonicEditText.requestFocus()
}
// endregion
// region General