From ad61be85708187a6a810393270b194c03d8a8964 Mon Sep 17 00:00:00 2001 From: Koki Fukuda Date: Sun, 10 Aug 2025 21:25:25 +0900 Subject: [PATCH 1/7] Bump SDK tools --- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bc09733..a43955d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.5.2" +agp = "8.12.0" appcompat = "1.7.0" cardview = "1.0.0" kotlin = "1.9.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 50eab50..a865c25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip From 79023a5d7c2b8b1e67de0ee38eba4a4ab528ebe7 Mon Sep 17 00:00:00 2001 From: Koki Fukuda Date: Sun, 10 Aug 2025 21:35:36 +0900 Subject: [PATCH 2/7] Bump compileSdk to 35 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 3f21202..cde6d4b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ plugins { android { namespace 'com.chronoscoper.android.securescreen' - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId "com.chronoscoper.android.securescreen" minSdk 23 From bec75cb3cf80d7ca6492c51f9e32472251ffe2f5 Mon Sep 17 00:00:00 2001 From: Koki Fukuda Date: Sun, 10 Aug 2025 21:44:35 +0900 Subject: [PATCH 3/7] Update libraries --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a43955d..c296a17 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] agp = "8.12.0" -appcompat = "1.7.0" +appcompat = "1.7.1" cardview = "1.0.0" -kotlin = "1.9.0" +kotlin = "2.2.0" junit = "4.13.2" -espressoCore = "3.6.1" -kotlinStdlibJdk7 = "1.9.20" +espressoCore = "3.7.0" +kotlinStdlibJdk7 = "2.1.20" licenseviewer = "1.6.5" material = "1.12.0" preferenceKtx = "1.2.1" From cce2b7653a38be3a763dbd5c12f9c0c7b7f9c0d7 Mon Sep 17 00:00:00 2001 From: Koki Fukuda Date: Sun, 10 Aug 2025 21:59:05 +0900 Subject: [PATCH 4/7] Bump sdkVersion to 36 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index cde6d4b..a9190da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ plugins { android { namespace 'com.chronoscoper.android.securescreen' - compileSdk = 35 + compileSdk = 36 defaultConfig { applicationId "com.chronoscoper.android.securescreen" minSdk 23 From e7ccd86c710ce871c3dea23f5f18a84081655248 Mon Sep 17 00:00:00 2001 From: Koki Fukuda Date: Mon, 11 Aug 2025 10:36:58 +0900 Subject: [PATCH 5/7] Bump targetSdk to 35 --- app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a9190da..652a68f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { defaultConfig { applicationId "com.chronoscoper.android.securescreen" minSdk 23 - targetSdk 34 + targetSdk 35 versionCode 18 versionName "1.8" resourceConfigurations += ['ja'] @@ -32,11 +32,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = "17" } lint { checkReleaseBuilds false From 91e2a8b7aae49ed4195e1bdfb3d7b8ca9d6081cc Mon Sep 17 00:00:00 2001 From: Koki Fukuda Date: Mon, 11 Aug 2025 10:44:17 +0900 Subject: [PATCH 6/7] Tweak --- .../com/chronoscoper/android/securescreen/App.kt | 3 +-- .../android/securescreen/PinningTileService.kt | 1 - .../android/securescreen/SecureActivity.kt | 10 +++++----- .../android/securescreen/SettingsActivity.kt | 16 +++++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/chronoscoper/android/securescreen/App.kt b/app/src/main/java/com/chronoscoper/android/securescreen/App.kt index 410de63..da57429 100644 --- a/app/src/main/java/com/chronoscoper/android/securescreen/App.kt +++ b/app/src/main/java/com/chronoscoper/android/securescreen/App.kt @@ -19,7 +19,6 @@ import android.app.Application import android.app.Notification import android.app.NotificationChannel import android.app.NotificationManager -import android.content.Context import android.os.Build class App : Application() { @@ -30,7 +29,7 @@ class App : Application() { override fun onCreate() { super.onCreate() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - (getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager) + (getSystemService(NOTIFICATION_SERVICE) as NotificationManager) .createNotificationChannel( NotificationChannel( NC_DEFAULT, diff --git a/app/src/main/java/com/chronoscoper/android/securescreen/PinningTileService.kt b/app/src/main/java/com/chronoscoper/android/securescreen/PinningTileService.kt index a395936..5b60e60 100644 --- a/app/src/main/java/com/chronoscoper/android/securescreen/PinningTileService.kt +++ b/app/src/main/java/com/chronoscoper/android/securescreen/PinningTileService.kt @@ -2,7 +2,6 @@ package com.chronoscoper.android.securescreen import android.content.Intent import android.os.Build -import android.os.IBinder import android.service.quicksettings.TileService import androidx.annotation.RequiresApi diff --git a/app/src/main/java/com/chronoscoper/android/securescreen/SecureActivity.kt b/app/src/main/java/com/chronoscoper/android/securescreen/SecureActivity.kt index 5856b76..1a11c85 100644 --- a/app/src/main/java/com/chronoscoper/android/securescreen/SecureActivity.kt +++ b/app/src/main/java/com/chronoscoper/android/securescreen/SecureActivity.kt @@ -15,9 +15,7 @@ */ package com.chronoscoper.android.securescreen -import android.app.Activity import android.app.ActivityManager -import android.content.Context import android.os.Build import android.os.Bundle import android.os.Handler @@ -39,15 +37,16 @@ class SecureActivity : AppCompatActivity() { super.onCreate(savedInstanceState) binding = ActivitySecureBinding.inflate(layoutInflater) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + @Suppress("DEPRECATION") overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out) } else { overrideActivityTransition( - Activity.OVERRIDE_TRANSITION_OPEN, + OVERRIDE_TRANSITION_OPEN, android.R.anim.fade_in, android.R.anim.fade_out ) overrideActivityTransition( - Activity.OVERRIDE_TRANSITION_CLOSE, + OVERRIDE_TRANSITION_CLOSE, android.R.anim.fade_in, android.R.anim.fade_out ) @@ -111,7 +110,7 @@ class SecureActivity : AppCompatActivity() { } private fun isInLockTask(): Boolean { - val activityManager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager + val activityManager = getSystemService(ACTIVITY_SERVICE) as ActivityManager return activityManager.lockTaskModeState != ActivityManager.LOCK_TASK_MODE_NONE } @@ -127,6 +126,7 @@ class SecureActivity : AppCompatActivity() { override fun finish() { super.finish() if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + @Suppress("DEPRECATION") overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out) } } diff --git a/app/src/main/java/com/chronoscoper/android/securescreen/SettingsActivity.kt b/app/src/main/java/com/chronoscoper/android/securescreen/SettingsActivity.kt index 24a7752..f998e39 100644 --- a/app/src/main/java/com/chronoscoper/android/securescreen/SettingsActivity.kt +++ b/app/src/main/java/com/chronoscoper/android/securescreen/SettingsActivity.kt @@ -34,6 +34,8 @@ import androidx.core.content.ContextCompat import androidx.preference.PreferenceManager import com.chronoscoper.android.securescreen.databinding.ActivitySettingsBinding import com.chronoscoper.library.licenseviewer.LicenseViewer +import androidx.core.net.toUri +import androidx.core.content.edit class SettingsActivity : AppCompatActivity() { companion object { @@ -146,21 +148,21 @@ class SettingsActivity : AppCompatActivity() { private fun setupStartOnBootSwitch() = binding.startOnBoot.apply { isChecked = preferences.getBoolean("start_on_boot", false) setOnCheckedChangeListener { _, isChecked -> - preferences.edit().putBoolean("start_on_boot", isChecked).apply() + preferences.edit { putBoolean("start_on_boot", isChecked) } } } private fun setupFinishOnBackPressedSwitch() = binding.finishOnBackPressed.apply { isChecked = preferences.getBoolean("finish_on_back_pressed", false) setOnCheckedChangeListener { _, isChecked -> - preferences.edit().putBoolean("finish_on_back_pressed", isChecked).apply() + preferences.edit { putBoolean("finish_on_back_pressed", isChecked) } } } private fun setupFinishButtonSwitch() = binding.finishButton.apply { isChecked = preferences.getBoolean("finish_button", true) setOnCheckedChangeListener { _, isChecked -> - preferences.edit().putBoolean("finish_button", isChecked).apply() + preferences.edit { putBoolean("finish_button", isChecked) } } } @@ -169,10 +171,10 @@ class SettingsActivity : AppCompatActivity() { try { startActivity( Intent( - Intent.ACTION_VIEW, Uri.parse(GITHUB_REPO_URL) + Intent.ACTION_VIEW, GITHUB_REPO_URL.toUri() ) ) - } catch (ignore: ActivityNotFoundException) { + } catch (_: ActivityNotFoundException) { } } binding.version.text = BuildConfig.VERSION_NAME @@ -180,10 +182,10 @@ class SettingsActivity : AppCompatActivity() { try { startActivity( Intent( - Intent.ACTION_VIEW, Uri.parse(DEVELOPER_WEB_ADDRESS) + Intent.ACTION_VIEW, DEVELOPER_WEB_ADDRESS.toUri() ) ) - } catch (ignore: ActivityNotFoundException) { + } catch (_: ActivityNotFoundException) { } } binding.ossLicense.setOnClickListener { From 26e2b495eab9cb2ea231b834c22a3baf79b99e7d Mon Sep 17 00:00:00 2001 From: Koki Fukuda Date: Mon, 11 Aug 2025 10:54:29 +0900 Subject: [PATCH 7/7] Update copyright year --- LICENSE | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../main/java/com/chronoscoper/android/securescreen/App.kt | 2 +- .../com/chronoscoper/android/securescreen/BootReceiver.kt | 2 +- .../java/com/chronoscoper/android/securescreen/DebugLogger.kt | 2 +- .../com/chronoscoper/android/securescreen/SecureActivity.kt | 2 +- .../android/securescreen/SecureScreenNotification.kt | 4 ++-- .../com/chronoscoper/android/securescreen/SettingsActivity.kt | 2 +- app/src/main/res/animator/card_elevation_animator.xml | 2 +- app/src/main/res/drawable/card_button.xml | 2 +- app/src/main/res/drawable/card_button_deactivate.xml | 2 +- app/src/main/res/drawable/finish_button.xml | 2 +- app/src/main/res/layout/activity_secure.xml | 2 +- app/src/main/res/layout/activity_settings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-night/colors.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/LICENSE b/LICENSE index 4945d44..cad012d 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2017-2024 Koki Fukuda + Copyright 2017-2025 Koki Fukuda Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3f7e9e0..9a2196c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@