fix: PackageInfo compat

app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt

@@ -31,6 +31,7 @@ import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
 import com.kunzisoft.keepass.utils.UriUtil.isContributingUser
+import com.kunzisoft.keepass.utils.getPackageInfoCompat
 import org.joda.time.DateTime
 
 class AboutActivity : StylishActivity() {
@@ -55,7 +56,7 @@ class AboutActivity : StylishActivity() {
         var version: String
         var build: String
         try {
-            version = packageManager.getPackageInfo(packageName, 0).versionName
+            version = packageManager.getPackageInfoCompat(packageName).versionName
             build = BuildConfig.BUILD_VERSION
         } catch (e: NameNotFoundException) {
             Log.w(javaClass.simpleName, "Unable to get the app or the build version", e)

app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt

@@ -69,7 +69,7 @@ import com.kunzisoft.keepass.utils.DexUtil
 import com.kunzisoft.keepass.utils.MagikeyboardUtil
 import com.kunzisoft.keepass.utils.MenuUtil
 import com.kunzisoft.keepass.utils.getParcelableCompat
-import com.kunzisoft.keepass.utils.UriHelper.parseUri
+import com.kunzisoft.keepass.utils.parseUri
 import com.kunzisoft.keepass.utils.UriUtil.isContributingUser
 import com.kunzisoft.keepass.utils.UriUtil.openUrl
 import com.kunzisoft.keepass.view.asError

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt

@@ -9,7 +9,7 @@ import com.kunzisoft.keepass.database.MainCredential
 import com.kunzisoft.keepass.database.DatabaseTaskProvider
 import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.utils.UriHelper.getBinaryDir
+import com.kunzisoft.keepass.utils.getBinaryDir
 import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
 
 abstract class DatabaseActivity: StylishActivity(), DatabaseRetrieval {

app/src/main/java/com/kunzisoft/keepass/app/database/FileDatabaseHistoryAction.kt

@@ -27,8 +27,8 @@ import com.kunzisoft.keepass.model.DatabaseFile
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.IOActionTask
 import com.kunzisoft.keepass.utils.SingletonHolderParameter
-import com.kunzisoft.keepass.utils.UriHelper.decodeUri
+import com.kunzisoft.keepass.utils.decodeUri
-import com.kunzisoft.keepass.utils.UriHelper.parseUri
+import com.kunzisoft.keepass.utils.parseUri
 import com.kunzisoft.keepass.viewmodels.FileDatabaseInfo
 
 class FileDatabaseHistoryAction(private val applicationContext: Context) {

app/src/main/java/com/kunzisoft/keepass/database/MainCredential.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.kunzisoft.keepass.database.element.MasterCredential
 import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.utils.readParcelableCompat
-import com.kunzisoft.keepass.utils.UriHelper.getUriInputStream
+import com.kunzisoft.keepass.utils.getUriInputStream
 import com.kunzisoft.keepass.utils.readEnum
 import com.kunzisoft.keepass.utils.writeEnum
 

app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.kt

@@ -24,7 +24,7 @@ import android.net.Uri
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.MainCredential
 import com.kunzisoft.keepass.hardware.HardwareKey
-import com.kunzisoft.keepass.utils.UriHelper.getBinaryDir
+import com.kunzisoft.keepass.utils.getBinaryDir
 
 class CreateDatabaseRunnable(
     context: Context,

app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.kt

@@ -29,8 +29,8 @@ import com.kunzisoft.keepass.database.exception.UnknownDatabaseLocationException
 import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
-import com.kunzisoft.keepass.utils.UriHelper.getBinaryDir
+import com.kunzisoft.keepass.utils.getBinaryDir
-import com.kunzisoft.keepass.utils.UriHelper.getUriInputStream
+import com.kunzisoft.keepass.utils.getUriInputStream
 
 class LoadDatabaseRunnable(
     private val context: Context,

app/src/main/java/com/kunzisoft/keepass/database/action/MergeDatabaseRunnable.kt

@@ -28,7 +28,7 @@ import com.kunzisoft.keepass.database.exception.DatabaseException
 import com.kunzisoft.keepass.database.exception.UnknownDatabaseLocationException
 import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
-import com.kunzisoft.keepass.utils.UriHelper.getUriInputStream
+import com.kunzisoft.keepass.utils.getUriInputStream
 
 class MergeDatabaseRunnable(
     context: Context,

app/src/main/java/com/kunzisoft/keepass/database/action/ReloadDatabaseRunnable.kt

@@ -26,8 +26,8 @@ import com.kunzisoft.keepass.database.exception.DatabaseException
 import com.kunzisoft.keepass.database.exception.UnknownDatabaseLocationException
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
-import com.kunzisoft.keepass.utils.UriHelper.getBinaryDir
+import com.kunzisoft.keepass.utils.getBinaryDir
-import com.kunzisoft.keepass.utils.UriHelper.getUriInputStream
+import com.kunzisoft.keepass.utils.getUriInputStream
 
 class ReloadDatabaseRunnable(
     private val context: Context,

app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.kt

@@ -26,7 +26,7 @@ import com.kunzisoft.keepass.database.MainCredential
 import com.kunzisoft.keepass.database.exception.DatabaseException
 import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.tasks.ActionRunnable
-import com.kunzisoft.keepass.utils.UriHelper.getUriOutputStream
+import com.kunzisoft.keepass.utils.getUriOutputStream
 import java.io.File
 
 open class SaveDatabaseRunnable(

app/src/main/java/com/kunzisoft/keepass/tasks/BinaryDatabaseManager.kt

@@ -8,8 +8,8 @@ import android.util.Log
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.binary.BinaryCache
 import com.kunzisoft.keepass.database.element.binary.BinaryData
-import com.kunzisoft.keepass.utils.UriHelper.getUriInputStream
+import com.kunzisoft.keepass.utils.getUriInputStream
-import com.kunzisoft.keepass.utils.UriHelper.getUriOutputStream
+import com.kunzisoft.keepass.utils.getUriOutputStream
 import com.kunzisoft.keepass.utils.readAllBytes
 import kotlinx.coroutines.*
 import java.io.ByteArrayInputStream

app/src/main/java/com/kunzisoft/keepass/utils/BroadcastAction.kt

@@ -36,7 +36,6 @@ import com.kunzisoft.keepass.services.ClipboardEntryNotificationService
 import com.kunzisoft.keepass.services.KeyboardEntryNotificationService
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.TimeoutHelper
-import com.kunzisoft.keepass.utils.UriHelper.getBinaryDir
 import com.kunzisoft.keepass.utils.UriUtil.releaseAllUnnecessaryPermissionUris
 
 const val DATABASE_START_TASK_ACTION = "com.kunzisoft.keepass.DATABASE_START_TASK_ACTION"

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

@@ -32,8 +32,6 @@ import com.kunzisoft.keepass.BuildConfig
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.education.Education
-import com.kunzisoft.keepass.utils.UriHelper.withContentScheme
-import com.kunzisoft.keepass.utils.UriHelper.withFileScheme
 import java.io.File
 
 
@@ -216,7 +214,7 @@ object UriUtil {
 
     fun Context.isExternalAppInstalled(packageName: String, showError: Boolean = true): Boolean {
         try {
-            this.applicationContext.packageManager.getPackageInfo(
+            this.applicationContext.packageManager.getPackageInfoCompat(
                 packageName,
                 PackageManager.GET_ACTIVITIES
             )

app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFileViewModel.kt

@@ -9,7 +9,7 @@ import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.model.DatabaseFile
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.IOActionTask
-import com.kunzisoft.keepass.utils.UriHelper.parseUri
+import com.kunzisoft.keepass.utils.parseUri
 
 class DatabaseFileViewModel(application: Application) : AndroidViewModel(application) {
 

app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFilesViewModel.kt

@@ -10,7 +10,7 @@ import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.model.DatabaseFile
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.IOActionTask
-import com.kunzisoft.keepass.utils.UriHelper.parseUri
+import com.kunzisoft.keepass.utils.parseUri
 import com.kunzisoft.keepass.utils.UriUtil.releaseUriPermission
 
 class DatabaseFilesViewModel(application: Application) : AndroidViewModel(application) {

app/src/main/java/com/kunzisoft/keepass/viewmodels/FileDatabaseInfo.kt

@@ -23,7 +23,7 @@ import android.content.Context
 import android.net.Uri
 import android.text.format.Formatter
 import androidx.documentfile.provider.DocumentFile
-import com.kunzisoft.keepass.utils.UriHelper.parseUri
+import com.kunzisoft.keepass.utils.parseUri
 import com.kunzisoft.keepass.utils.UriUtil.getDocumentFile
 import com.kunzisoft.keepass.utils.UriUtil.takeUriPermission
 import java.io.Serializable

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

@@ -22,80 +22,85 @@ package com.kunzisoft.keepass.utils
 import android.annotation.SuppressLint
 import android.content.ContentResolver
 import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.util.Log
 import java.io.*
 import java.util.*
 
-
+fun String.parseUri(): Uri? {
-object UriHelper {
+    return if (this.isNotEmpty()) Uri.parse(this) else null
-
-    fun String.parseUri(): Uri? {
-        return if (this.isNotEmpty()) Uri.parse(this) else null
-    }
-
-    fun String.decodeUri(): String {
-        return Uri.decode(this) ?: ""
-    }
-
-    fun Context.getBinaryDir(): File {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            this.applicationContext.noBackupFilesDir
-        } else {
-            this.applicationContext.filesDir
-        }
-    }
-
-    @Throws(FileNotFoundException::class)
-    fun ContentResolver.getUriInputStream(fileUri: Uri?): InputStream? {
-        if (fileUri == null)
-            return null
-        return when {
-            fileUri.withFileScheme() -> fileUri.path?.let { FileInputStream(it) }
-            fileUri.withContentScheme() -> this.openInputStream(fileUri)
-            else -> null
-        }
-    }
-
-    @SuppressLint("Recycle")
-    @Throws(FileNotFoundException::class)
-    fun ContentResolver.getUriOutputStream(fileUri: Uri?): OutputStream? {
-        if (fileUri == null)
-            return null
-        return when {
-            fileUri.withFileScheme() -> fileUri.path?.let { FileOutputStream(it) }
-            fileUri.withContentScheme() -> {
-                try {
-                    this.openOutputStream(fileUri, "wt")
-                } catch (e: FileNotFoundException) {
-                    Log.e(TAG, "Unable to open stream in `wt` mode, retry in `rwt` mode.", e)
-                    // https://issuetracker.google.com/issues/180526528
-                    // Try with rwt to fix content provider issue
-                    val outStream = this.openOutputStream(fileUri, "rwt")
-                    Log.w(TAG, "`rwt` mode used.")
-                    outStream
-                }
-            }
-            else -> null
-        }
-    }
-
-    fun Uri.withFileScheme(): Boolean {
-        val scheme = this.scheme
-        if (scheme.isNullOrEmpty() || scheme.lowercase(Locale.ENGLISH) == "file") {
-            return true
-        }
-        return false
-    }
-
-    fun Uri.withContentScheme(): Boolean {
-        val scheme = this.scheme
-        if (scheme != null && scheme.lowercase(Locale.ENGLISH) == "content") {
-            return true
-        }
-        return false
-    }
-
-    private const val TAG = "UriHelper"
 }
+
+fun String.decodeUri(): String {
+    return Uri.decode(this) ?: ""
+}
+
+fun Context.getBinaryDir(): File {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        this.applicationContext.noBackupFilesDir
+    } else {
+        this.applicationContext.filesDir
+    }
+}
+
+@Throws(FileNotFoundException::class)
+fun ContentResolver.getUriInputStream(fileUri: Uri?): InputStream? {
+    if (fileUri == null)
+        return null
+    return when {
+        fileUri.withFileScheme() -> fileUri.path?.let { FileInputStream(it) }
+        fileUri.withContentScheme() -> this.openInputStream(fileUri)
+        else -> null
+    }
+}
+
+@SuppressLint("Recycle")
+@Throws(FileNotFoundException::class)
+fun ContentResolver.getUriOutputStream(fileUri: Uri?): OutputStream? {
+    if (fileUri == null)
+        return null
+    return when {
+        fileUri.withFileScheme() -> fileUri.path?.let { FileOutputStream(it) }
+        fileUri.withContentScheme() -> {
+            try {
+                this.openOutputStream(fileUri, "wt")
+            } catch (e: FileNotFoundException) {
+                Log.e(TAG, "Unable to open stream in `wt` mode, retry in `rwt` mode.", e)
+                // https://issuetracker.google.com/issues/180526528
+                // Try with rwt to fix content provider issue
+                val outStream = this.openOutputStream(fileUri, "rwt")
+                Log.w(TAG, "`rwt` mode used.")
+                outStream
+            }
+        }
+        else -> null
+    }
+}
+
+fun Uri.withFileScheme(): Boolean {
+    val scheme = this.scheme
+    if (scheme.isNullOrEmpty() || scheme.lowercase(Locale.ENGLISH) == "file") {
+        return true
+    }
+    return false
+}
+
+fun Uri.withContentScheme(): Boolean {
+    val scheme = this.scheme
+    if (scheme != null && scheme.lowercase(Locale.ENGLISH) == "content") {
+        return true
+    }
+    return false
+}
+fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int = 0): PackageInfo =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
+    } else {
+        @Suppress("DEPRECATION") getPackageInfo(packageName, flags)
+    }
+
+
+private const val TAG = "UriHelper"