Skip to content

Commit 1fb5372

Browse files
committed
Merge branch 'dev' of github.com:hiennguyen92/flutter_callkit_incoming into dev
2 parents fa1224e + eec8239 commit 1fb5372

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

android/src/main/kotlin/com/hiennv/flutter_callkit_incoming/CallkitIncomingActivity.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,14 @@ class CallkitIncomingActivity : Activity() {
198198
ImageLoaderProvider.loadImage(this@CallkitIncomingActivity, logoUrl, headers, R.drawable.transparent, ivLogo)
199199
}
200200

201-
val avatarUrl = data?.getString(CallkitConstants.EXTRA_CALLKIT_AVATAR, "")
201+
var avatarUrl = data?.getString(CallkitConstants.EXTRA_CALLKIT_AVATAR, "")
202202
if (!avatarUrl.isNullOrEmpty()) {
203203
ivAvatar.visibility = View.VISIBLE
204+
if (!avatarUrl.startsWith("http://", true) && !avatarUrl.startsWith("https://", true)) {
205+
avatarUrl = String.format("file:///android_asset/flutter_assets/%s", avatarUrl)
206+
}
204207
val headers =
205-
data.getSerializable(CallkitConstants.EXTRA_CALLKIT_HEADERS) as HashMap<String, Any?>
208+
data?.getSerializable(CallkitConstants.EXTRA_CALLKIT_HEADERS) as HashMap<String, Any?>
206209
ImageLoaderProvider.loadImage(this@CallkitIncomingActivity, avatarUrl, headers, R.drawable.ic_default_avatar, ivAvatar)
207210
}
208211

0 commit comments

Comments
 (0)