From 6e9641638fe865a3f1fdb8a7adf684ce156eefd5 Mon Sep 17 00:00:00 2001 From: Jonas Lochmann Date: Mon, 14 Oct 2024 02:00:00 +0200 Subject: [PATCH] Update target sdk --- app/build.gradle | 4 ++-- .../android/foregroundapp/LollipopForegroundAppHelper.kt | 4 ++-- .../java/io/timelimit/android/update/UpdateIntegration.kt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 27898e2..786d148 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,11 +25,11 @@ plugins { android { namespace 'io.timelimit.android' - compileSdkVersion 34 + compileSdk 35 defaultConfig { applicationId "io.timelimit.android" minSdkVersion 26 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 218 versionName "7.1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/io/timelimit/android/integration/platform/android/foregroundapp/LollipopForegroundAppHelper.kt b/app/src/main/java/io/timelimit/android/integration/platform/android/foregroundapp/LollipopForegroundAppHelper.kt index 417e86e..ddabc3f 100644 --- a/app/src/main/java/io/timelimit/android/integration/platform/android/foregroundapp/LollipopForegroundAppHelper.kt +++ b/app/src/main/java/io/timelimit/android/integration/platform/android/foregroundapp/LollipopForegroundAppHelper.kt @@ -1,5 +1,5 @@ /* - * TimeLimit Copyright 2019 - 2022 Jonas Lochmann + * TimeLimit Copyright 2019 - 2024 Jonas Lochmann * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -184,7 +184,7 @@ class LollipopForegroundAppHelper(context: Context) : UsageStatsForegroundAppHel } private fun doesActivityExistAsAlias(app: ForegroundApp) = try { - packageManager.getPackageInfo(app.packageName, PackageManager.GET_ACTIVITIES).activities.find { + packageManager.getPackageInfo(app.packageName, PackageManager.GET_ACTIVITIES).activities?.find { it.enabled && it.targetActivity == app.activityName } != null } catch (ex: PackageManager.NameNotFoundException) { diff --git a/app/src/main/java/io/timelimit/android/update/UpdateIntegration.kt b/app/src/main/java/io/timelimit/android/update/UpdateIntegration.kt index 33a3684..f1bc4f8 100644 --- a/app/src/main/java/io/timelimit/android/update/UpdateIntegration.kt +++ b/app/src/main/java/io/timelimit/android/update/UpdateIntegration.kt @@ -1,5 +1,5 @@ /* - * TimeLimit Copyright 2019 - 2020 Jonas Lochmann + * TimeLimit Copyright 2019 - 2024 Jonas Lochmann * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -70,12 +70,12 @@ object UpdateIntegration { val signatures = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { // new signature - context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNING_CERTIFICATES).signingInfo.apkContentsSigners + context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNING_CERTIFICATES).signingInfo!!.apkContentsSigners } else { // old signature // this is "unsafe", but it is not used for security features - context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES).signatures + context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_SIGNATURES).signatures!! } return signatures.map { HexString.toHex(MessageDigest.getInstance("SHA-256").digest(it.toByteArray())) }