Skip to content

Commit 4ab3034

Browse files
pcolbypcolby
committed
Merge branch 'main' into gradle-versions-check
2 parents 122f659 + 3df77d2 commit 4ab3034

File tree

13 files changed

+43
-21
lines changed

13 files changed

+43
-21
lines changed

‎.github/workflows/codeql.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ jobs:
2424
- name: Initialize CodeQL
2525
uses: github/codeql-action/init@v3
2626
with:
27-
languages: java
27+
languages: kotlin
2828
- name: Autobuild
2929
uses: github/codeql-action/autobuild@v3
30+
- run: find app/build/intermediates/ -name 'lint-resources.xml' -delete
31+
shell: bash
3032
- name: Perform CodeQL Analysis
3133
uses: github/codeql-action/analyze@v3

‎CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog[^1]
22

3+
## [1.4.4][] (2024-10-17)
4+
5+
Support for Android 15.
6+
37
## [1.4.3][] (2024-08-12)
48

59
Redirected long-tap to NFC Settings when granted `WRITE_SECURE_SETTINGS` permission.
@@ -46,7 +50,8 @@ Added translations for 86 languages.
4650

4751
Initial release.
4852

49-
[Unreleased]: https://github.com/pcolby/nfc-quick-settings/compare/v1.4.3...HEAD
53+
[Unreleased]: https://github.com/pcolby/nfc-quick-settings/compare/v1.4.4...HEAD
54+
[1.4.4]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.4.4
5055
[1.4.3]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.4.3
5156
[1.4.2]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.4.2
5257
[1.4.1]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.4.1

‎SECURITY.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 1.4.x | :white_check_mark: |
8+
| < 1.4 | :x: |
9+
10+
## Reporting a Vulnerability
11+
12+
Please report security vulnerabilties via email to [email protected].
13+
14+
Thanks!

‎app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ android {
2424
}
2525
}
2626
namespace 'au.id.colby.nfcquicksettings'
27-
compileSdk 34
27+
compileSdk 35
2828

2929
defaultConfig {
3030
applicationId "au.id.colby.nfcquicksettings"
3131
minSdk 24
32-
targetSdk 34
33-
versionCode 14
34-
versionName "1.4.4-pre"
32+
targetSdk 35
33+
versionCode 15
34+
versionName "1.4.5-pre"
3535
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3636
}
3737

@@ -65,7 +65,7 @@ base {
6565
}
6666

6767
dependencies {
68-
implementation 'androidx.core:core-ktx:1.13.1'
68+
implementation 'androidx.core:core-ktx:1.15.0'
6969
implementation 'androidx.appcompat:appcompat:1.7.0'
7070
implementation 'com.google.android.material:material:1.12.0'
7171
testImplementation 'junit:junit:4.13.2'

‎app/src/androidTest/java/au/id/colby/nfcquicksettings/ExampleInstrumentedTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2023-2024 Paul Colby <[email protected]>
1+
// SPDX-FileCopyrightText: 2023-2025 Paul Colby <[email protected]>
22
// SPDX-License-Identifier: GPL-3.0-or-later
33

44
package au.id.colby.nfcquicksettings

‎app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
android:label="@string/app_name"
1515
android:roundIcon="@mipmap/ic_launcher_round"
1616
android:supportsRtl="true"
17-
tools:targetApi="34">
17+
android:usesCleartextTraffic="false"
18+
tools:targetApi="35">
1819

1920
<activity
2021
android:name=".NfcTilePreferencesActivity"

‎app/src/main/java/au/id/colby/nfcquicksettings/NfcTileService.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2023-2024 Paul Colby <[email protected]>
1+
// SPDX-FileCopyrightText: 2023-2025 Paul Colby <[email protected]>
22
// SPDX-License-Identifier: GPL-3.0-or-later
33

44
package au.id.colby.nfcquicksettings
@@ -105,7 +105,7 @@ class NfcTileService : TileService() {
105105
* @return true if the [adapter]'s new state was successfully requested.
106106
*/
107107
private fun invertNfcState(adapter: NfcAdapter? = NfcAdapter.getDefaultAdapter(this)): Boolean {
108-
return adapter?.run { setNfcAdapterState(this, !isEnabled) } ?: false
108+
return adapter?.run { setNfcAdapterState(this, !isEnabled) } == true
109109
}
110110

111111
/**

‎app/src/main/play/release-notes/en-US/default.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Redirected long-tap to NFC Settings, when granted WRITE_SECURE_SETTINGS permission
1+
- Support for Android 15.

‎app/src/main/res/values-fr-rCA/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="tile_subtitle_active">Activé</string>
4-
<string name="tile_subtitle_inactive">Désactivé</string>
4+
<string name="tile_subtitle_inactive">Désactivée</string>
55
<string name="tile_subtitle_turning_on">Activation en cours…</string>
66
<string name="tile_subtitle_unavailable">Non disponible</string>
77
</resources>

‎app/src/main/res/values-kk/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<resources>
33
<string name="tile_subtitle_active">Қосулы</string>
44
<string name="tile_subtitle_inactive">Өшірулі</string>
5-
<string name="tile_subtitle_turning_on">Қосылуда…</string>
5+
<string name="tile_subtitle_turning_on">Қосылып жатыр…</string>
66
<string name="tile_subtitle_unavailable">Қолжетімсіз</string>
77
</resources>

‎app/src/main/res/values-kn/strings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="tile_subtitle_active">ಆನ್ ಮಾಡಿ</string>
4-
<string name="tile_subtitle_inactive">ಆಫ್ ಮಾಡಿ</string>
3+
<string name="tile_subtitle_active">ಆನ್</string>
4+
<string name="tile_subtitle_inactive">ಆಫ್</string>
55
<string name="tile_subtitle_turning_on">ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ...</string>
66
<string name="tile_subtitle_unavailable">ಲಭ್ಯವಿಲ್ಲ</string>
77
</resources>

‎app/src/test/java/au/id/colby/nfcquicksettings/ExampleUnitTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2023-2024 Paul Colby <[email protected]>
1+
// SPDX-FileCopyrightText: 2023-2025 Paul Colby <[email protected]>
22
// SPDX-License-Identifier: GPL-3.0-or-later
33

44
package au.id.colby.nfcquicksettings

‎build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '8.7.0' apply false
4-
id 'com.android.library' version '8.7.0' apply false
3+
id 'com.android.application' version '8.7.3' apply false
4+
id 'com.android.library' version '8.7.3' apply false
55
id 'com.github.ben-manes.versions' version '0.51.0'
6-
id 'org.jetbrains.dokka' version '1.9.20' apply false
7-
id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
6+
id 'org.jetbrains.dokka' version '2.0.0' apply false
7+
id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
88
}

0 commit comments

Comments
 (0)