Merge branch 'stable'

apps/multiplatform/common/build.gradle.kts

@@ -155,6 +155,7 @@ buildConfig {
     buildConfigField("String", "DESKTOP_VERSION_NAME", "\"${extra["desktop.version_name"]}\"")
     buildConfigField("int", "DESKTOP_VERSION_CODE", "${extra["desktop.version_code"]}")
     buildConfigField("String", "DATABASE_BACKEND", "\"${extra["database.backend"]}\"")
+    buildConfigField("Boolean", "ANDROID_BUNDLE", "${extra["android.bundle"]}")
   }
 }
 

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SettingsView.kt

@@ -21,6 +21,7 @@ import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
+import chat.simplex.common.BuildConfigCommon
 import chat.simplex.common.model.*
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
@@ -127,7 +128,9 @@ fun SettingsLayout(
     SectionDividerSpaced()
 
     SectionView(stringResource(MR.strings.settings_section_title_support)) {
-      ContributeItem(uriHandler)
+      if (!BuildConfigCommon.ANDROID_BUNDLE) {
+        ContributeItem(uriHandler)
+      }
       RateAppItem(uriHandler)
       StarOnGithubItem(uriHandler)
     }

apps/multiplatform/gradle.properties

@@ -27,6 +27,8 @@ kotlin.jvm.target=11
 android.version_name=6.4-beta.2
 android.version_code=294
 
+android.bundle=false
+
 desktop.version_name=6.4-beta.2
 desktop.version_code=105