mirrors/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-04-04 21:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: Small warning

Browse source
This commit is contained in:
J-Jamet 2023-05-14 13:14:27 +02:00
parent ee1a0a53a6
commit b713237ec3
3 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/kunzisoft/keepass/settings/preference/IconPackListPreference.kt
View file

@ -38,7 +38,7 @@ class IconPackListPreference @JvmOverloads constructor(context: Context,
for (iconPack in IconPackChooser.getIconPackList(context)) {
if (iconPack.id != null) {
entries.add(iconPack.name)
values.add(iconPack.id!!)
values.add(iconPack.id)
}
}

19
app/src/main/java/com/kunzisoft/keepass/utils/UriUtil.kt
View file

@ -190,7 +190,7 @@ object UriUtil {
fun Context.openUrl(url: String?) {
try {
if (url != null && url.isNotEmpty()) {
if (!url.isNullOrEmpty()) {
// Default http:// if no protocol specified
val newUrl = if (!url.contains("://")) {
"http://$url"
@ -210,20 +210,17 @@ object UriUtil {
fun Context.isContributingUser(): Boolean {
return (Education.isEducationScreenReclickedPerformed(this)
|| isExternalAppInstalled(
this,
this.getString(R.string.keepro_app_id),
false
)
|| isExternalAppInstalled(this.getString(R.string.keepro_app_id), false)
)
}
private fun isExternalAppInstalled(context: Context,
packageName: String,
showError: Boolean = true): Boolean {
fun Context.isExternalAppInstalled(packageName: String, showError: Boolean = true): Boolean {
try {
context.applicationContext.packageManager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES)
Education.setEducationScreenReclickedPerformed(context)
this.applicationContext.packageManager.getPackageInfo(
packageName,
PackageManager.GET_ACTIVITIES
)
Education.setEducationScreenReclickedPerformed(this)
return true
} catch (e: Exception) {
if (showError)

4
database/src/main/java/com/kunzisoft/keepass/utils/UriHelper.kt
View file

@ -73,7 +73,7 @@ object UriHelper {
fun Uri.withFileScheme(): Boolean {
val scheme = this.scheme
if (scheme == null || scheme.isEmpty() || scheme.lowercase(Locale.ENGLISH) == "file") {
if (scheme.isNullOrEmpty() || scheme.lowercase(Locale.ENGLISH) == "file") {
return true
}
return false
@ -87,5 +87,5 @@ object UriHelper {
return false
}
private const val TAG = "UriUtilDatabase"
private const val TAG = "UriHelper"
}