Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1bb1556 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Use PackageInfoCompat to support long version codes

parent 17b0e047

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ dependencies { 


    api "org.mnode.ical4j:ical4j:$ical4j_version"

    implementation 'org.slf4j:slf4j-jdk14:1.7.25'

    implementation 'androidx.core:core-ktx:1.0.1'



    androidTestImplementation 'androidx.test:runner:1.1.1'

    androidTestImplementation 'androidx.test:rules:1.1.1'

src/main/java/at/bitfire/ical4android/TaskProvider.kt

+6 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import android.content.Context 
import android.content.pm.PackageManager

import android.net.Uri

import android.os.Build

import androidx.core.content.pm.PackageInfoCompat

import org.dmfs.tasks.contract.TaskContract

import java.io.Closeable

import java.util.logging.Level
@@ -27,7 +28,7 @@ class TaskProvider private constructor( 
    enum class ProviderName(

            val authority: String,

            val packageName: String,

            val minVersionCode: Int,

            val minVersionCode: Long,

            val minVersionName: String

    ) {

        //Mirakel("de.azapps.mirakel.provider"),
@@ -80,8 +81,9 @@ class TaskProvider private constructor( 
        private fun checkVersion(context: Context, name: ProviderName) {

            // check whether package is available with required minimum version

            val info = context.packageManager.getPackageInfo(name.packageName, 0)

            if (info.versionCode < name.minVersionCode) {

                val exception = ProviderTooOldException(name, info.versionCode, info.versionName)

            val installedVersionCode = PackageInfoCompat.getLongVersionCode(info)

            if (installedVersionCode < name.minVersionCode) {

                val exception = ProviderTooOldException(name, installedVersionCode, info.versionName)

                Constants.log.log(Level.WARNING, "Task provider too old", exception)

                throw exception

            }
@@ -113,7 +115,7 @@ class TaskProvider private constructor( 


    class ProviderTooOldException(

            val provider: ProviderName,

            installedVersionCode: Int,

            installedVersionCode: Long,

            val installedVersionName: String

    ): Exception("Package ${provider.packageName} has version $installedVersionName ($installedVersionCode), " +

            "required: ${provider.minVersionName} (${provider.minVersionCode})")