Skip to content

Commit ce72501

Browse files
author
David Crow
committed
Fix android build
1 parent 4cec2dc commit ce72501

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

android/airship-framework-proxy/src/main/java/com/urbanairship/android/framework/proxy/ProxyLogger.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
package com.urbanairship.android.framework.proxy
44

55
import android.util.Log
6-
import com.urbanairship.util.UAStringUtil
76
import java.util.*
87

98
/**
@@ -169,7 +168,7 @@ public object ProxyLogger {
169168
return
170169
}
171170

172-
val formattedMessage: String? = if (UAStringUtil.isEmpty(message)) {
171+
val formattedMessage: String? = if (message.isNullOrEmpty()) {
173172
// Default to empty string
174173
""
175174
} else {

android/airship-framework-proxy/src/main/java/com/urbanairship/android/framework/proxy/Utils.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import com.urbanairship.android.framework.proxy.ProxyLogger.error
1212
import com.urbanairship.json.JsonException
1313
import com.urbanairship.json.JsonValue
1414
import com.urbanairship.push.PushMessage
15-
import com.urbanairship.util.UAStringUtil
1615
import androidx.core.graphics.toColorInt
1716

1817
/**
@@ -102,7 +101,7 @@ public object Utils {
102101
resourceName: String,
103102
resourceFolder: String
104103
): Int {
105-
if (!UAStringUtil.isEmpty(resourceName)) {
104+
if (resourceName.isNotBlank()) {
106105
val id =
107106
context.resources.getIdentifier(resourceName, resourceFolder, context.packageName)
108107
if (id != 0) {
@@ -124,7 +123,7 @@ public object Utils {
124123
@ColorInt
125124
@JvmStatic
126125
public fun getHexColor(hexColor: String, @ColorInt defaultColor: Int): Int {
127-
if (!UAStringUtil.isEmpty(hexColor)) {
126+
if (hexColor.isNotBlank()) {
128127
try {
129128
return hexColor.toColorInt()
130129
} catch (e: IllegalArgumentException) {
@@ -141,7 +140,7 @@ public object Utils {
141140

142141
private fun getNotificationId(notificationId: Int, notificationTag: String?): String {
143142
var id = notificationId.toString()
144-
if (!UAStringUtil.isEmpty(notificationTag)) {
143+
if (!notificationTag.isNullOrEmpty()) {
145144
id += ":$notificationTag"
146145
}
147146
return id

0 commit comments

Comments
 (0)