Merge branch 'release/0.9.32'

BillCarsonFr · BillCarsonFr · commit 43a9817f18d2 · 2019-11-25T09:26:40.000+01:00
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes to Matrix Android SDK in 0.9.32 (2019-11-25)
+=======================================================
+
+Bugfix:
+ - Fix / Integration Manager was not allowed by default
+
+
 Changes to Matrix Android SDK in 0.9.31 (2019-11-22)
 =======================================================
 
diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle
@@ -27,8 +27,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 931
-        versionName "0.9.31"
+        versionCode 932
+        versionName "0.9.32"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // Enable multi dex for test
diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/features/integrationmanager/IntegrationManager.kt b/matrix-sdk/src/main/java/org/matrix/androidsdk/features/integrationmanager/IntegrationManager.kt
@@ -209,7 +209,7 @@ class IntegrationManager(val mxSession: MXSession, val context: Context) {
         return mxSession.dataHandler
                 .store
                 ?.getAccountDataElement(AccountDataElement.ACCOUNT_DATA_TYPE_INTEGRATION_PROVISIONING)
-                ?.content?.get("enabled") == true
+                ?.content?.get("enabled") as? Boolean ?: true
     }
 
     init {

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ class IntegrationManager(val mxSession: MXSession, val context: Context) {`
`209`	`209`	`return mxSession.dataHandler`
`210`	`210`	`.store`
`211`	`211`	`?.getAccountDataElement(AccountDataElement.ACCOUNT_DATA_TYPE_INTEGRATION_PROVISIONING)`
`212`		`- ?.content?.get("enabled") == true`
	`212`	`+ ?.content?.get("enabled") as? Boolean ?: true`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`init {`