mirror/BinaryEye
0
0
Fork 0
mirror of https://github.com/markusfisch/BinaryEye.git synced 2024-09-20 03:52:16 +02:00
Code

Fix handling empty meta strings

Browse Source 
Check if the data is empty and not just null.

And prepare WiFi info like we do it for meta info.
This commit is contained in:
Markus Fisch 2022-02-10 22:20:54 +01:00
parent 09ce14125e
commit e8b8e578cb
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/DecodeFragment.kt
View File

@ -173,50 +173,25 @@ class DecodeFragment : Fragment() {
}
}
private fun fillDataTable(tableLayout: TableLayout, items: LinkedHashMap<Int, String?>?) {
val ctx = tableLayout.context
val spaceBetween = (16f * ctx.resources.displayMetrics.density).toInt()
var hasEntries = false
items?.forEach { item ->
item.value?.let {
val tr = TableRow(ctx)
val keyView = TextView(ctx)
keyView.setText(item.key)
val valueView = TextView(ctx)
valueView.setPadding(spaceBetween, 0, 0, 0)
valueView.text = it
tr.addView(keyView)
tr.addView(valueView)
tableLayout.addView(tr)
hasEntries = true
}
}
if (hasEntries) {
tableLayout.setPadding(0, 0, 0, spaceBetween)
}
}
private fun fillDataView(tableLayout: TableLayout, content: String) {
val items = LinkedHashMap<Int, String?>()
if (action is WifiAction) {
val wifiData = WifiConnector.parseMap(content)
if (wifiData != null) {
items[R.string.entry_type] = getString(R.string.wifi_network)
items[R.string.wifi_ssid] = wifiData["S"]
items[R.string.wifi_password] = wifiData["P"]
items[R.string.wifi_type] = wifiData["T"]
items[R.string.wifi_hidden] = wifiData["H"]
items[R.string.wifi_eap] = wifiData["E"]
items[R.string.wifi_identity] = wifiData["I"]
items[R.string.wifi_anonymous_identity] = wifiData["A"]
items[R.string.wifi_phase2] = wifiData["PH2"]
WifiConnector.parseMap(content)?.let { wifiData ->
items.putAll(
linkedMapOf(
R.string.entry_type to getString(R.string.wifi_network),
R.string.wifi_ssid to wifiData["S"],
R.string.wifi_password to wifiData["P"],
R.string.wifi_type to wifiData["T"],
R.string.wifi_hidden to wifiData["H"],
R.string.wifi_eap to wifiData["E"],
R.string.wifi_identity to wifiData["I"],
R.string.wifi_anonymous_identity to wifiData["A"],
R.string.wifi_phase2 to wifiData["PH2"]
)
)
}
}
fillDataTable(tableLayout, items)
}
@ -235,6 +210,31 @@ class DecodeFragment : Fragment() {
)
}
private fun fillDataTable(
tableLayout: TableLayout,
items: LinkedHashMap<Int, String?>
) {
val ctx = tableLayout.context
val spaceBetween = (16f * ctx.resources.displayMetrics.density).toInt()
items.forEach { item ->
val text = item.value
if (!text.isNullOrBlank()) {
val tr = TableRow(ctx)
val keyView = TextView(ctx)
keyView.setText(item.key)
val valueView = TextView(ctx)
valueView.setPadding(spaceBetween, 0, 0, 0)
valueView.text = text
tr.addView(keyView)
tr.addView(valueView)
tableLayout.addView(tr)
}
}
if (tableLayout.childCount > 0) {
tableLayout.setPadding(0, 0, 0, spaceBetween)
}
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.fragment_decode, menu)
if (isBinary) {