Commit with unresolved merge conflicts outside of kalium

wireapp · Apr 23, 2024 · b3e4826 · b3e4826
1 parent 114d60a
commit b3e4826
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/di/KaliumConfigsModule.kt b/app/src/main/kotlin/com/wire/android/di/KaliumConfigsModule.kt
@@ -51,7 +51,7 @@ class KaliumConfigsModule {
             forceConstantBitrateCalls = BuildConfig.FORCE_CONSTANT_BITRATE_CALLS,
             // we use upsert, available from SQL3.24, which is supported from Android API30, so for older APIs we have to use SQLCipher
             shouldEncryptData = !BuildConfig.DEBUG || Build.VERSION.SDK_INT < Build.VERSION_CODES.R,
-            lowerKeyPackageLimits = BuildConfig.PRIVATE_BUILD,
+            lowerKeyPackageLimits = BuildConfig.LOWER_KEYPACKAGE_LIMIT,
             lowerKeyingMaterialsUpdateThreshold = BuildConfig.PRIVATE_BUILD,
             isMLSSupportEnabled = BuildConfig.MLS_SUPPORT_ENABLED,
             developmentApiEnabled = BuildConfig.DEVELOPMENT_API_ENABLED,

diff --git a/buildSrc/src/main/kotlin/customization/FeatureConfigs.kt b/buildSrc/src/main/kotlin/customization/FeatureConfigs.kt
@@ -54,6 +54,7 @@ enum class FeatureConfigs(val value: String, val configType: ConfigType) {
      * Security/Cryptography stuff
      */
     MLS_SUPPORT_ENABLED("mls_support_enabled", ConfigType.BOOLEAN),
+    LOWER_KEYPACKAGE_LIMIT("lower_keypackage_limit", ConfigType.BOOLEAN),
     ENCRYPT_PROTEUS_STORAGE("encrypt_proteus_storage", ConfigType.BOOLEAN),
     WIPE_ON_COOKIE_INVALID("wipe_on_cookie_invalid", ConfigType.BOOLEAN),
     WIPE_ON_ROOTED_DEVICE("wipe_on_rooted_device", ConfigType.BOOLEAN),

diff --git a/default.json b/default.json
@@ -87,6 +87,7 @@
     "force_constant_bitrate_calls": false,
     "ignore_ssl_certificates": false,
     "mls_support_enabled": true,
+    "lower_keypackage_limit": false,
     "encrypt_proteus_storage": false,
     "self_deleting_messages": true,
     "wipe_on_cookie_invalid": false,

diff --git a/kalium b/kalium