agorise/bitsy-wallet
agorise/bitsy-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Avoid a crash in ReceiveTransactionFragment when the QR width and/or height is zero, but still send the report to Crashlytics to further investigate the issue in case it repeats again.

Browse source
This commit is contained in:
Severiano Jaramillo 2019-03-16 20:53:22 -06:00
parent 702cdea3aa
commit 5bee51092d
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt
View file

@ -12,6 +12,7 @@ import android.view.*
import android.widget.AdapterView import android.widget.AdapterView
import android.widget.Toast import android.widget.Toast
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.collection.LongSparseArray
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProviders
@ -79,7 +80,7 @@ class ReceiveTransactionFragment : ConnectedFragment() {
private var selectedInAutoCompleteTextView = false private var selectedInAutoCompleteTextView = false
// Map used to keep track of request and response id pairs // Map used to keep track of request and response id pairs
private val responseMap = HashMap<Long, Int>() private val responseMap = LongSparseArray<Int>()//HashMap<Long, Int>()
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
setHasOptionsMenu(true) setHasOptionsMenu(true)
@ -196,9 +197,9 @@ class ReceiveTransactionFragment : ConnectedFragment() {
// Get a list of assets that match the already typed string by the user // Get a list of assets that match the already typed string by the user
if (it.length > 1 && mNetworkService != null) { if (it.length > 1 && mNetworkService != null) {
val id = mNetworkService!!.sendMessage(ListAssets(it, AUTO_SUGGEST_ASSET_LIMIT), val id = mNetworkService?.sendMessage(ListAssets(it, AUTO_SUGGEST_ASSET_LIMIT),
ListAssets.REQUIRED_API) ListAssets.REQUIRED_API)
responseMap[id] = RESPONSE_LIST_ASSETS if (id != null) responseMap.append(id, RESPONSE_LIST_ASSETS)
} }
} }
) )
@ -297,15 +298,10 @@ class ReceiveTransactionFragment : ConnectedFragment() {
internal fun encodeAsBitmap(data: String, color: String): Bitmap? { internal fun encodeAsBitmap(data: String, color: String): Bitmap? {
val result: BitMatrix val result: BitMatrix
// Get measured width and height of the ImageView where the QR code will be placed // Get measured width and height of the ImageView where the QR code will be placed and make sure
var w = ivQR.width // the final QR code has a squared shape
var h = ivQR.height val w = Math.min(ivQR.width, ivQR.height)
val h = w
// Gets minimum side length and sets both width and height to that value so the final
// QR code has a squared shape
val minSide = if (w < h) w else h
h = minSide
w = h
try { try {
val hints = HashMap<EncodeHintType, Any>() val hints = HashMap<EncodeHintType, Any>()
@ -326,9 +322,15 @@ class ReceiveTransactionFragment : ConnectedFragment() {
pixels[offset + x] = if (result.get(x, y)) Color.parseColor(color) else Color.WHITE pixels[offset + x] = if (result.get(x, y)) Color.parseColor(color) else Color.WHITE
} }
} }
val bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
bitmap.setPixels(pixels, 0, w, 0, 0, w, h) return try {
return bitmap val bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
bitmap.setPixels(pixels, 0, w, 0, 0, w, h)
bitmap
} catch (e: IllegalArgumentException) {
Crashlytics.logException(e)
null
}
} }
/** /**