codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented adding device info to message log

This commit is contained in:
dankito 2020-12-20 21:56:19 +01:00
parent 3f799d9e91
commit f1ac225081
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/dialogs/SendMessageLogDialog.kt
View File

@ -73,7 +73,7 @@ open class SendMessageLogDialog : DialogFragment() {
rootView.btnSendMessageLogViaEMail.isEnabled = false rootView.btnSendMessageLogViaEMail.isEnabled = false
} }
else { else {
rootView.edtxtMessageLog.setText(context?.getString(R.string.dialog_send_message_courteously_add_error_description, messageLog)) rootView.edtxtMessageLog.setText(context?.getString(R.string.dialog_send_message_courteously_add_error_description, getDeviceInfoLine() + "\n\n" + messageLog))
} }
rootView.btnSendMessageLogDirectly.setOnClickListener { sendMessageLogDirectly(rootView.edtxtMessageLog.text.toString()) } rootView.btnSendMessageLogDirectly.setOnClickListener { sendMessageLogDirectly(rootView.edtxtMessageLog.text.toString()) }
@ -101,7 +101,7 @@ open class SendMessageLogDialog : DialogFragment() {
} }
protected open fun sendMessageLogDirectly(messageLog: String) { protected open fun sendMessageLogDirectly(messageLog: String) {
val deviceInfo = DeviceInfo(Build.MANUFACTURER.capitalize(), Build.MODEL, "Android", Build.VERSION.RELEASE, System.getProperty("os.arch") ?: "") val deviceInfo = getDeviceInfo()
// TODO: sending with Ktor did not work // TODO: sending with Ktor did not work
//presenter.sendMessageLogDirectly(messageLog, deviceInfo) //presenter.sendMessageLogDirectly(messageLog, deviceInfo)
@ -117,6 +117,35 @@ open class SendMessageLogDialog : DialogFragment() {
} }
} }
protected open fun getDeviceInfoLine(): String {
val deviceInfo = getDeviceInfo()
var line = deviceInfo.manufacturer ?: ""
deviceInfo.deviceModel?.let { model ->
line += (if (line.isEmpty()) "" else " ") + model
}
deviceInfo.osName?.let { osName ->
line += (if (line.isEmpty()) "" else " - ") + osName
}
deviceInfo.osVersion?.let { osVersion ->
line += (if (line.isEmpty()) "" else " ") + osVersion
}
deviceInfo.osArch?.let { osArch ->
line += (if (line.isEmpty()) "" else " ") + osArch
}
return line
}
protected open fun getDeviceInfo(): DeviceInfo {
return DeviceInfo(Build.MANUFACTURER.capitalize(), Build.MODEL, "Android", Build.VERSION.RELEASE, System.getProperty("os.arch") ?: "")
}
protected open fun handleSendMessageLogDirectlyResponseOnUiThread(response: WebClientResponse) { protected open fun handleSendMessageLogDirectlyResponseOnUiThread(response: WebClientResponse) {
if (response.isSuccessResponse) { if (response.isSuccessResponse) {
showSuccessfullySentMessageLog() showSuccessfullySentMessageLog()