From 9bdf30ea5103da254355057098b157975c93ca9f Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 6 Nov 2026 11:08:08 +0300
Subject: [PATCH 1/3] disable r8

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 app/build.gradle.kts | 6 +++---
 fastlane/Fastfile    | 7 -------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 00b5ea45f45f..57f0f96bb041 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -128,9 +128,6 @@ android {
 
         buildTypes {
             release {
-                optimization {
-                    enable = true
-                }
                 buildConfigField("String", "NC_TEST_SERVER_DATA_STRING", "\"\"")
                 ndk {
                     abiFilters += allAbis
@@ -140,6 +137,9 @@ android {
                 enableUnitTestCoverage = project.hasProperty("coverage")
                 enableAndroidTestCoverage = project.hasProperty("coverage")
                 resConfigs("xxxhdpi")
+                optimization {
+                    enable = true
+                }
                 ndk {
                     abiFilters += if (ciBuild) allAbis else localDebugAbis
                 }
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f8208e8ed568..f26cc9179323 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -40,13 +40,6 @@ APK_SIGNING_PROPERTIES = {
 import("./common.Fastfile")
 
 platform :android do
-
-    before_all do
-        gradleFile = "../app/build.gradle.kts"
-        content = File.read(gradleFile)
-        File.write(gradleFile, content.sub(/(optimization\s*\{\s*enable\s*=\s*)true/, '\\1false'))
-    end
-
     ## private lanes
     desc "check if library is set correctly"
     private_lane :checkLibrary do |options|

From 7b77c07b462eaa9ed5a86a6bf9952a117c244f6f Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 6 Nov 2026 11:10:54 +0300
Subject: [PATCH 2/3] configure r8

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 app/build.gradle.kts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 57f0f96bb041..7dd5849caea3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,6 +19,7 @@ val ciBuild = System.getenv("CI") == "true"
 val perfAnalysis = project.hasProperty("perfAnalysis")
 
 val allAbis = listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+var enableR8 = false
 val localDebugAbis = when (System.getProperty("os.arch")) {
     "aarch64", "arm64" -> listOf("arm64-v8a")
     else -> listOf("arm64-v8a", "x86_64")
@@ -129,6 +130,9 @@ android {
         buildTypes {
             release {
                 buildConfigField("String", "NC_TEST_SERVER_DATA_STRING", "\"\"")
+                optimization {
+                    enable = enableR8
+                }
                 ndk {
                     abiFilters += allAbis
                 }
@@ -138,7 +142,7 @@ android {
                 enableAndroidTestCoverage = project.hasProperty("coverage")
                 resConfigs("xxxhdpi")
                 optimization {
-                    enable = true
+                    enable = enableR8
                 }
                 ndk {
                     abiFilters += if (ciBuild) allAbis else localDebugAbis
@@ -168,6 +172,7 @@ android {
                 dimension = "default"
                 versionCode = 20220322
                 versionName = "20220322"
+                enableR8 = true
             }
 
             register("qa") {

From 6eaa3ca2f43e00052b777746adfa2904fb6e54ed Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 6 Nov 2026 11:18:58 +0300
Subject: [PATCH 3/3] configure r8

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 app/build.gradle.kts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7dd5849caea3..8ad94b13f8e8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,7 +19,6 @@ val ciBuild = System.getenv("CI") == "true"
 val perfAnalysis = project.hasProperty("perfAnalysis")
 
 val allAbis = listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-var enableR8 = false
 val localDebugAbis = when (System.getProperty("os.arch")) {
     "aarch64", "arm64" -> listOf("arm64-v8a")
     else -> listOf("arm64-v8a", "x86_64")
@@ -130,9 +129,6 @@ android {
         buildTypes {
             release {
                 buildConfigField("String", "NC_TEST_SERVER_DATA_STRING", "\"\"")
-                optimization {
-                    enable = enableR8
-                }
                 ndk {
                     abiFilters += allAbis
                 }
@@ -142,7 +138,7 @@ android {
                 enableAndroidTestCoverage = project.hasProperty("coverage")
                 resConfigs("xxxhdpi")
                 optimization {
-                    enable = enableR8
+                    enable = true
                 }
                 ndk {
                     abiFilters += if (ciBuild) allAbis else localDebugAbis
@@ -172,7 +168,9 @@ android {
                 dimension = "default"
                 versionCode = 20220322
                 versionName = "20220322"
-                enableR8 = true
+                optimization {
+                    enable = true
+                }
             }
 
             register("qa") {