Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-04-21 13:37:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 91

Moved lint rules to .editorconfig for Android Studio (#36302)

Browse source 
<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #36202

`./gradlew spotlessCheck` and Android Studio should use the same style
rules. The `.editorconfig` Code Style option was enabled by default in
my Android Studio.
This commit is contained in:
Victor Lyuboslavsky 2025-11-25 15:37:21 -06:00 committed by GitHub
parent a2327f84af
commit 7a3c344d68
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
android/.editorconfig Normal file
View file

@ -0,0 +1,25 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8
[*.{kt,kts}]
ktlint_code_style = android_studio
indent_size = 4
indent_style = space
max_line_length = 140
# Jetpack Compose requires Composable functions to start with uppercase (PascalCase)
ktlint_standard_function-naming = disabled
# Android conventionally uses uppercase TAG constants for logging
ktlint_standard_property-naming = disabled
# Android Studio IDE settings (prefixed with ij_)
# Allow trailing commas (cleaner diffs + easier reordering)
ij_kotlin_allow_trailing_comma = true
ij_kotlin_allow_trailing_comma_on_call_site = true
# Import ordering: prioritize Android
ij_kotlin_imports_layout = *,android.**,androidx.**,com.**,org.**,java.**,kotlin.**,kotlinx.**,^

9
android/app/build.gradle.kts
View file

@ -83,14 +83,7 @@ spotless {
kotlin {
target("**/*.kt")
targetExclude("**/build/**/*.kt")
ktlint().editorConfigOverride(
mapOf(
// Jetpack Compose requires Composable functions to start with uppercase (PascalCase)
"ktlint_standard_function-naming" to "disabled",
// Android conventionally uses uppercase TAG constants for logging
"ktlint_standard_property-naming" to "disabled",
),
)
ktlint()
}
kotlinGradle {
target("*.gradle.kts")

18
android/app/src/main/java/com/fleetdm/agent/CertificateService.kt
View file

@ -6,14 +6,13 @@ import android.content.Context
import android.content.Intent
import android.os.IBinder
import android.util.Log
import org.json.JSONObject
import java.security.PrivateKey
import java.security.cert.Certificate
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import org.json.JSONObject
import java.security.PrivateKey
import java.security.cert.Certificate
import java.security.cert.X509Certificate
/**
* Service to handle SCEP enrollment and silent certificate installation using DevicePolicyManager.
@ -35,10 +34,7 @@ class CertificateService : Service() {
)
// Structure for SCEP result, holding the key and certificate(s)
data class ScepResult(
val privateKey: PrivateKey,
val certificateChain: Array<Certificate>,
)
data class ScepResult(val privateKey: PrivateKey, val certificateChain: Array<Certificate>)
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
val certDataJson = intent?.getStringExtra("CERT_DATA")
@ -118,11 +114,7 @@ class CertificateService : Service() {
* Performs a silent installation of the KeyPair using the delegated CERT_INSTALL scope.
* This method requires NO user interaction on modern managed devices (API 18+).
*/
private fun installCertificateSilently(
alias: String,
privateKey: PrivateKey,
certificateChain: Array<Certificate>,
) {
private fun installCertificateSilently(alias: String, privateKey: PrivateKey, certificateChain: Array<Certificate>) {
val dpm = getSystemService(Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
// The admin component is null because the caller is a DELEGATED application,