Compare commits

..

No commits in common. "d5bc1f98810f0408e00524645b33ff9cd797bff7" and "e01cf09f51162c401577d39db3e942d963cbafe3" have entirely different histories.

6 changed files with 23 additions and 25 deletions

View file

@ -25,11 +25,11 @@ plugins {
android {
namespace 'io.timelimit.android'
compileSdk 35
compileSdkVersion 34
defaultConfig {
applicationId "io.timelimit.android"
minSdkVersion 26
targetSdkVersion 35
targetSdkVersion 34
versionCode 218
versionName "7.1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -146,8 +146,8 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
@ -167,8 +167,8 @@ wire {
dependencies {
def nav_version = "2.5.3"
def room_version = "2.6.1"
def work_version = '2.9.1'
def paging_version = "3.3.2"
def work_version = '2.9.0'
def paging_version = "3.3.1"
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21"
@ -177,12 +177,12 @@ dependencies {
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation "com.google.android.material:material:1.12.0"
implementation 'androidx.compose.material:material:1.7.4'
implementation 'androidx.activity:activity-compose:1.9.3'
implementation 'androidx.compose.material:material:1.6.8'
implementation 'androidx.activity:activity-compose:1.9.1'
implementation "com.google.accompanist:accompanist-flowlayout:0.30.0"
implementation 'androidx.compose.material:material-icons-extended:1.7.4'
debugImplementation "androidx.compose.ui:ui-tooling:1.7.4"
implementation 'androidx.fragment:fragment-ktx:1.8.4'
implementation 'androidx.compose.material:material-icons-extended:1.6.8'
debugImplementation "androidx.compose.ui:ui-tooling:1.6.8"
implementation 'androidx.fragment:fragment-ktx:1.8.2'
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui:$nav_version"
@ -203,7 +203,7 @@ dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.6.2'
androidTestImplementation 'androidx.test:runner:1.6.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
implementation 'org.mindrot:jbcrypt:0.4'
@ -216,7 +216,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp-tls:4.9.3'
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
googleApiImplementation "com.android.billingclient:billing-ktx:7.1.1"
googleApiImplementation "com.android.billingclient:billing-ktx:7.0.0"
implementation('io.socket:socket.io-client:2.0.0') {
exclude group: 'org.json', module: 'json'

View file

@ -55,9 +55,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:enableOnBackInvokedCallback="true"
tools:targetApi="tiramisu">
android:theme="@style/AppTheme">
<!-- UI -->

View file

@ -1,5 +1,5 @@
/*
* TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
* TimeLimit Copyright <C> 2019 - 2022 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) {

View file

@ -1,5 +1,5 @@
/*
* TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
* TimeLimit Copyright <C> 2019 - 2020 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())) }

View file

@ -15,8 +15,8 @@
*/
plugins {
id 'com.android.application' version '8.7.1' apply false
id 'com.android.library' version '8.7.1' apply false
id 'com.android.application' version '8.5.1' apply false
id 'com.android.library' version '8.5.1' apply false
id 'org.jetbrains.kotlin.android' version "1.9.21" apply false
id 'com.google.devtools.ksp' version '1.9.21-1.0.16' apply false
id 'androidx.navigation.safeargs' version '2.6.0' apply false

View file

@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
distributionSha256Sum=258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionSha256Sum=194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0