From c54730d3fb9cc1dc0b9bd539978c0b8617ef2683 Mon Sep 17 00:00:00 2001
From: Amir Khodak <amir.khodak@gmail.com>
Date: Fri, 22 May 2026 20:34:30 +0000
Subject: [PATCH] Fix R8 dontwarn rules, WorkManager init, and release signing
 config

- Add dontwarn for errorprone annotations (Tink) and sun.security.x509
- Remove WorkManagerInitializer from manifest (app uses on-demand init)
- Wire signingConfigs.release from local.properties

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 app/build.gradle.kts             | 15 +++++++++++++++
 app/proguard-rules.pro           |  2 ++
 app/src/main/AndroidManifest.xml | 12 ++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 869e17f..bd7488b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,6 +13,11 @@ val versionProps = Properties().apply {
     load(rootProject.file("version.properties").inputStream())
 }
 
+val localProps = Properties().apply {
+    val f = rootProject.file("local.properties")
+    if (f.exists()) load(f.inputStream())
+}
+
 android {
     namespace = "com.syncflow"
     compileSdk = 34
@@ -31,11 +36,21 @@ android {
         manifestPlaceholders["MSAL_REDIRECT_URI"] = "msauth://com.syncflow/YOUR_BASE64_SIGNATURE"
     }
 
+    signingConfigs {
+        create("release") {
+            storeFile = localProps["KEYSTORE_PATH"]?.toString()?.let { file(it) }
+            storePassword = localProps["KEYSTORE_PASSWORD"]?.toString()
+            keyAlias = localProps["KEY_ALIAS"]?.toString()
+            keyPassword = localProps["KEY_PASSWORD"]?.toString()
+        }
+    }
+
     buildTypes {
         release {
             isMinifyEnabled = true
             isShrinkResources = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            signingConfig = signingConfigs.getByName("release")
         }
     }
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8350558..0a01a5e 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -6,3 +6,5 @@
 -dontwarn org.bouncycastle.**
 -dontwarn org.conscrypt.**
 -dontwarn org.openjsse.**
+-dontwarn com.google.errorprone.annotations.**
+-dontwarn sun.security.x509.X509Key
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 81d95e2..20e7a68 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,5 +68,17 @@
             </intent-filter>
         </receiver>
 
+        <!-- Remove WorkManager's default initializer — app uses on-demand init via Configuration.Provider -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+        </provider>
+
     </application>
 </manifest>