Fix empty usage-history chart + externalize signing secrets
Build APK / build (push) Successful in 2m18s
Build APK / build (push) Successful in 2m18s
History chart: recordHistory() threw away the previous point whenever a new reading landed within the 2-min de-dup window, but the foreground loop refreshes every 30s — so history could never grow past one point while the app was open and the chart stayed stuck on 'Collecting history…'. Now it throttles by SKIPPING a too-soon reading instead of replacing the last one, so points accumulate during normal use. Security: - Remove hardcoded release keystore passwords from build.gradle.kts; read from env vars / gitignored keystore.properties; CI injects from Gitea secrets (KEYSTORE_PASSWORD/KEY_PASSWORD). Signing identity unchanged. - Make the cookie-never-plaintext invariant explicit on the read path. - Drop custom ACTION_REFRESH from the exported widget intent-filter so other apps can't trigger refreshes; internal explicit PendingIntent still works. - Gate an unguarded Log.w behind BuildConfig.DEBUG.
This commit is contained in:
+34
-5
@@ -1,8 +1,21 @@
|
||||
import java.util.Properties
|
||||
|
||||
plugins {
|
||||
id("com.android.application")
|
||||
id("org.jetbrains.kotlin.android")
|
||||
}
|
||||
|
||||
// Signing credentials are NEVER committed. They are read from (in order):
|
||||
// 1. environment variables (KEYSTORE_PASSWORD / KEY_PASSWORD / KEY_ALIAS) — used by CI
|
||||
// 2. keystore.properties at the repo root (gitignored) — used locally
|
||||
// See keystore.properties.example. Debug builds need none of this.
|
||||
val keystoreProps = Properties().apply {
|
||||
val f = rootProject.file("keystore.properties")
|
||||
if (f.exists()) f.inputStream().use { load(it) }
|
||||
}
|
||||
fun signingCred(envName: String, propName: String): String? =
|
||||
System.getenv(envName) ?: keystoreProps.getProperty(propName)
|
||||
|
||||
android {
|
||||
namespace = "me.khodak.claudeusage"
|
||||
compileSdk = 34
|
||||
@@ -15,12 +28,22 @@ android {
|
||||
versionName = "1.18"
|
||||
}
|
||||
|
||||
val releaseStorePassword = signingCred("KEYSTORE_PASSWORD", "storePassword")
|
||||
val releaseKeyPassword = signingCred("KEY_PASSWORD", "keyPassword")
|
||||
val releaseKeyAlias = signingCred("KEY_ALIAS", "keyAlias") ?: "claudewidget"
|
||||
val hasSigningCreds = releaseStorePassword != null && releaseKeyPassword != null
|
||||
|
||||
signingConfigs {
|
||||
create("release") {
|
||||
storeFile = file("claude-widget-release.keystore")
|
||||
storePassword = "ClaudeWidget2026!"
|
||||
keyAlias = "claudewidget"
|
||||
keyPassword = "ClaudeWidget2026!"
|
||||
// Only wire the keystore when credentials are present, so debug builds and
|
||||
// credential-less checkouts configure cleanly. Same keystore file + alias as before —
|
||||
// signing identity is unchanged; only the password source moved out of version control.
|
||||
if (hasSigningCreds) {
|
||||
storeFile = file("claude-widget-release.keystore")
|
||||
storePassword = releaseStorePassword
|
||||
keyAlias = releaseKeyAlias
|
||||
keyPassword = releaseKeyPassword
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +52,13 @@ android {
|
||||
isMinifyEnabled = true
|
||||
isShrinkResources = true
|
||||
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
|
||||
signingConfig = signingConfigs.getByName("release")
|
||||
// Sign only when creds were supplied; otherwise fail loudly at assembleRelease rather
|
||||
// than silently shipping an unsigned APK. Tag builds in CI inject creds (see workflow).
|
||||
if (hasSigningCreds) {
|
||||
signingConfig = signingConfigs.getByName("release")
|
||||
} else {
|
||||
logger.warn("No signing credentials (KEYSTORE_PASSWORD/keystore.properties) — release APK will be unsigned.")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user