rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation issue after rebase

Browse Source
This commit is contained in:
Benoit Marty 2022-10-05 11:35:46 +02:00 committed by Benoit Marty
parent e76b2d7c61
commit 15616ecc7c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ComputeUserAgentUseCase.kt
View File

@ -20,6 +20,7 @@ import android.content.Context
import android.os.Build import android.os.Build
import org.matrix.android.sdk.BuildConfig import org.matrix.android.sdk.BuildConfig
import org.matrix.android.sdk.api.extensions.tryOrNull import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.util.getApplicationInfoCompat
import org.matrix.android.sdk.api.util.getPackageInfoCompat import org.matrix.android.sdk.api.util.getPackageInfoCompat
import javax.inject.Inject import javax.inject.Inject
@ -37,7 +38,7 @@ class ComputeUserAgentUseCase @Inject constructor(
val appPackageName = context.applicationContext.packageName val appPackageName = context.applicationContext.packageName
val pm = context.packageManager val pm = context.packageManager
val appName = tryOrNull { pm.getApplicationLabel(pm.getApplicationInfo(appPackageName, 0)).toString() } val appName = tryOrNull { pm.getApplicationLabel(pm.getApplicationInfoCompat(appPackageName, 0)).toString() }
?.takeIf { ?.takeIf {
it.matches("\\A\\p{ASCII}*\\z".toRegex()) it.matches("\\A\\p{ASCII}*\\z".toRegex())
} }