diff --git a/build.gradle b/build.gradle
index 3ecc1c14f..e4537e71a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -86,13 +86,13 @@ ext {
android {
namespace 'eu.siacs.conversations'
- compileSdkVersion 32
+ compileSdkVersion 33
defaultConfig {
minSdkVersion 21
- targetSdkVersion 32
- versionCode 42050
- versionName "2.12.2"
+ targetSdkVersion 33
+ versionCode 42051
+ versionName "2.12.2-2"
archivesBaseName += "-$versionName"
applicationId "org.snikket.android"
resValue "string", "applicationId", applicationId
@@ -142,10 +142,12 @@ android {
playstore {
dimension "distribution"
versionNameSuffix "+playstore"
+ buildConfigField "boolean", "CONTACTS_INTEGRATION", "false"
}
free {
dimension "distribution"
versionNameSuffix "+free"
+ buildConfigField "boolean", "CONTACTS_INTEGRATION", "true"
}
}
diff --git a/src/conversationsFree/AndroidManifest.xml b/src/conversationsFree/AndroidManifest.xml
new file mode 100644
index 000000000..9fd60596b
--- /dev/null
+++ b/src/conversationsFree/AndroidManifest.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index c18addf27..984bdc507 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
-
= Build.VERSION_CODES.M) {
+ } else if (Config.CONTACTS_INTEGRATION && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS);
}
}