Skip to content

fix:char_array_to_string #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Darrenyuen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix:char_array_to_string #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/app/src/main/java/com/huawei/demo/health/HealthKitActivityRecordControllerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,14 +531,14 @@ class HealthKitActivityRecordControllerActivity : AppCompatActivity() {
* @param api api name
*/
private fun printFailureMessage(exception: Exception, api: String) {
val errorCode = exception.message
val errorCode = exception.message ?: ""
val pattern = Pattern.compile("[0-9]*")
val isNum = pattern.matcher(errorCode!!.toCharArray().toString())
val isNum = pattern.matcher(errorCode)
if (isNum.matches()) {
val errorMsg =
HiHealthStatusCodes.getStatusCodeMessage(
Integer.parseInt(
errorCode.toCharArray().toString()
errorCode
)
)
logger("$api failure $errorCode:$errorMsg")
Expand Down
6 changes: 3 additions & 3 deletions src/app/src/main/java/com/huawei/demo/health/HealthKitDataControllerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,12 @@ class HealthKitDataControllerActivity : AppCompatActivity() {
* @param api Interface name
*/
private fun printFailureMessage(e: Exception, api: String) {
val errorCode = e.message
val errorCode = e.message ?: ""
val pattern = Pattern.compile("[0-9]*")
val isNum = pattern.matcher(errorCode!!.toCharArray().toString())
val isNum = pattern.matcher(errorCode)
if (isNum.matches()) {
val errorMsg =
HiHealthStatusCodes.getStatusCodeMessage(Integer.parseInt(errorCode.toCharArray().toString()))
HiHealthStatusCodes.getStatusCodeMessage(Integer.parseInt(errorCode))
logger("$api failure $errorCode:$errorMsg")
} else {
logger("$api failure $errorCode")
Expand Down
6 changes: 3 additions & 3 deletions src/app/src/main/java/com/huawei/demo/health/HealthKitHealthRecordControllerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,14 +429,14 @@ class HealthKitHealthRecordControllerActivity : AppCompatActivity() {
* @param api the calling api
*/
private fun printFailureMessage(e: Exception?, api: String) {
val errorCode = e?.message
val errorCode = e?.message ?: ""
val pattern = Pattern.compile("[0-9]*")
val isNum = pattern.matcher(errorCode!!.toCharArray().toString())
val isNum = pattern.matcher(errorCode)
if (isNum.matches()) {
val errorMsg =
HiHealthStatusCodes.getStatusCodeMessage(
Integer.parseInt(
errorCode.toCharArray().toString()
errorCode
)
)
logger("$api failure $errorCode:$errorMsg")
Expand Down
6 changes: 3 additions & 3 deletions src/app/src/main/java/com/huawei/demo/health/HealthKitSettingControllerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,17 +411,17 @@ class HealthKitSettingControllerActivity : AppCompatActivity(), AdapterView.OnIt
* @param api Interface name
*/
private fun printFailureMessage(e: Exception, api: String) {
val errorCode = e.message
val errorCode = e.message ?: ""
val pattern = Pattern.compile("[0-9]*")
val isNum = pattern.matcher(errorCode!!.toCharArray().toString())
val isNum = pattern.matcher(errorCode)

if (e is ApiException) run {
val eCode = (e as ApiException).getStatusCode()
val errorMsg = HiHealthStatusCodes.getStatusCodeMessage(eCode)
logger("$api failure $eCode:$errorMsg")
return
} else if (isNum.matches()) {
val errorMsg = HiHealthStatusCodes.getStatusCodeMessage(Integer.parseInt(errorCode.toCharArray().toString()))
val errorMsg = HiHealthStatusCodes.getStatusCodeMessage(Integer.parseInt(errorCode))
logger("$api failure $errorCode:$errorMsg")
return
} else {
Expand Down