From 0d4c5781083eb1985249ffc0373a655c34b249a2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Sep 2025 12:40:25 +0200
Subject: [PATCH 1/3] Improve log to see the build type.

---
 app/build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6131abf385..bc50437fb2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -103,7 +103,8 @@ android {
     }
 
     val baseAppName = BuildTimeConfig.APPLICATION_NAME
-    logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName)")
+    val buildType = if (isEnterpriseBuild) "Enterprise" else "FOSS"
+    logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName) [$buildType]")
 
     buildTypes {
         val oidcRedirectSchemeBase = BuildTimeConfig.METADATA_HOST_REVERSED ?: "io.element.android"

From 9daadb384e668b1b0a408623b77cd20addc4fa93 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Sep 2025 13:33:37 +0200
Subject: [PATCH 2/3] Do not let default enterprise `impl` module be
 implemented for enterprise build.

---
 app/build.gradle.kts                                             | 1 +
 features/enterprise/{impl => impl-foss}/build.gradle.kts         | 0
 .../android/features/enterprise/impl/DefaultEnterpriseService.kt | 0
 .../features/enterprise/impl/DefaultSessionEnterpriseService.kt  | 0
 .../features/enterprise/impl/DefaultEnterpriseServiceTest.kt     | 0
 .../enterprise/impl/DefaultSessionEnterpriseServiceTest.kt       | 0
 6 files changed, 1 insertion(+)
 rename features/enterprise/{impl => impl-foss}/build.gradle.kts (100%)
 rename features/enterprise/{impl => impl-foss}/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt (100%)
 rename features/enterprise/{impl => impl-foss}/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt (100%)
 rename features/enterprise/{impl => impl-foss}/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt (100%)
 rename features/enterprise/{impl => impl-foss}/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt (100%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bc50437fb2..c8d07a80d7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -261,6 +261,7 @@ dependencies {
         allEnterpriseImpl(project)
         implementation(projects.appicon.enterprise)
     } else {
+        implementation(projects.features.enterprise.implFoss)
         implementation(projects.appicon.element)
     }
     allFeaturesImpl(project)
diff --git a/features/enterprise/impl/build.gradle.kts b/features/enterprise/impl-foss/build.gradle.kts
similarity index 100%
rename from features/enterprise/impl/build.gradle.kts
rename to features/enterprise/impl-foss/build.gradle.kts
diff --git a/features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt
similarity index 100%
rename from features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt
rename to features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt
diff --git a/features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt
similarity index 100%
rename from features/enterprise/impl/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt
rename to features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt
diff --git a/features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt b/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt
similarity index 100%
rename from features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt
rename to features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt
diff --git a/features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt b/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt
similarity index 100%
rename from features/enterprise/impl/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt
rename to features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseServiceTest.kt

From 3603b8afef6e757ef558c0c9b499233cbc9468c4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Sep 2025 13:44:00 +0200
Subject: [PATCH 3/3] Update ref on submodule.

---
 enterprise | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/enterprise b/enterprise
index 76e10f6fa4..9c78fd98e8 160000
--- a/enterprise
+++ b/enterprise
@@ -1 +1 @@
-Subproject commit 76e10f6fa4db4196df245a3d29131a95d9e60a4d
+Subproject commit 9c78fd98e895ca8bf92ffc6604111155c8759cc0