diff --git a/app/build.gradle b/app/build.gradle index 1e29e8e..45c9a22 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -172,15 +172,15 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20" implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.core:core:1.12.0' + implementation 'androidx.core:core:1.13.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation "com.google.android.material:material:1.11.0" - implementation 'androidx.compose.material:material:1.6.5' - implementation 'androidx.activity:activity-compose:1.8.2' + implementation 'androidx.compose.material:material:1.6.6' + implementation 'androidx.activity:activity-compose:1.9.0' implementation "com.google.accompanist:accompanist-flowlayout:0.30.0" - implementation 'androidx.compose.material:material-icons-extended:1.6.5' - debugImplementation "androidx.compose.ui:ui-tooling:1.6.5" + implementation 'androidx.compose.material:material-icons-extended:1.6.6' + debugImplementation "androidx.compose.ui:ui-tooling:1.6.6" implementation 'androidx.fragment:fragment-ktx:1.6.2' implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" @@ -211,11 +211,11 @@ dependencies { implementation 'com.google.android.flexbox:flexbox:3.0.0' - implementation 'com.squareup.okhttp3:okhttp:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' implementation 'com.squareup.okhttp3:okhttp-tls:4.9.3' implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - googleApiImplementation "com.android.billingclient:billing-ktx:6.2.0" + googleApiImplementation "com.android.billingclient:billing-ktx:6.2.1" implementation('io.socket:socket.io-client:2.0.0') { exclude group: 'org.json', module: 'json' diff --git a/app/src/main/java/io/timelimit/android/ui/MainActivity.kt b/app/src/main/java/io/timelimit/android/ui/MainActivity.kt index 6e5fd92..f5e1408 100644 --- a/app/src/main/java/io/timelimit/android/ui/MainActivity.kt +++ b/app/src/main/java/io/timelimit/android/ui/MainActivity.kt @@ -1,5 +1,5 @@ /* - * TimeLimit Copyright 2019 - 2023 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 @@ -383,10 +383,10 @@ class MainActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De return false } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) - if ((intent?.flags ?: 0) and Intent.FLAG_ACTIVITY_REORDER_TO_FRONT == Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) { + if (intent.flags and Intent.FLAG_ACTIVITY_REORDER_TO_FRONT == Intent.FLAG_ACTIVITY_REORDER_TO_FRONT) { return } diff --git a/app/src/main/java/io/timelimit/android/ui/homescreen/HomescreenActivity.kt b/app/src/main/java/io/timelimit/android/ui/homescreen/HomescreenActivity.kt index 9d77f6d..7b2f00d 100644 --- a/app/src/main/java/io/timelimit/android/ui/homescreen/HomescreenActivity.kt +++ b/app/src/main/java/io/timelimit/android/ui/homescreen/HomescreenActivity.kt @@ -1,5 +1,5 @@ /* - * TimeLimit Copyright 2019 - 2021 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 @@ -75,7 +75,7 @@ class HomescreenActivity: AppCompatActivity() { }) } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) model.handleLaunch(intent?.getBooleanExtra(FORCE_SELECTION, false) ?: false)