Merge branch 'release/0.9.31'

Author: BillCarsonFr

CHANGES.rst

@@ -1,3 +1,21 @@
+Changes to Matrix Android SDK in 0.9.31 (2019-11-22)
+=======================================================
+
+Features:
+ - Integrations / Manage Widget Permissions in Account Data
+
+Improvements:
+ - Integration Manager preferences are now managed by SDK
+ - Integrations / Manage Jitsi Domain Permissions in Account Data
+
+Bugfix:
+ - Crash on Realm crypto DB (vector-im/riot-android#3373)
+ - Match identity server registration to the IS r0.3.0 spec (#3382)
+
+API Change:
+ - /account/3pid/add requires user interactive Auth
+
+
 Changes to Matrix Android SDK in 0.9.30 (2019-10-09)
 =======================================================
 

matrix-sdk-core/src/main/java/org/matrix/androidsdk/rest/model/WellKnown.kt

@@ -27,6 +27,17 @@ import com.google.gson.annotations.SerializedName
  *     "m.identity_server": {
  *         "base_url": "https://vector.im"
  *     }
+ *     "m.integrations": {
+ *          "managers": [
+ *              {
+ *                  "api_url": "https://integrations.example.org",
+ *                  "ui_url": "https://integrations.example.org/ui"
+ *              },
+ *              {
+ *                  "api_url": "https://bots.example.org"
+ *              }
+ *          ]
+ *    }
  * }
  * </pre>
  */
@@ -39,4 +50,35 @@ class WellKnown {
     @JvmField
     @SerializedName("m.identity_server")
     var identityServer: WellKnownBaseConfig? = null
+
+
+    @JvmField
+    @SerializedName("m.integrations")
+    var integrations: Map<String, *>? = null
+
+    /**
+     * Returns the list of integration managers proposed
+     */
+    fun getIntegrationManagers(): List<WellKnownManagerConfig> {
+        val managers = ArrayList<WellKnownManagerConfig>()
+        integrations?.get("managers")?.let {
+            (it as? ArrayList<*>)?.let { configs ->
+                configs.forEach { config ->
+                    (config as? Map<*, *>)?.let { map ->
+                        val apiUrl = map["api_url"] as? String
+                        val uiUrl = map["ui_url"] as? String ?: apiUrl
+                        if (apiUrl != null
+                                && apiUrl.startsWith("https://")
+                                && uiUrl!!.startsWith("https://")) {
+                            managers.add(WellKnownManagerConfig(
+                                    apiUrl = apiUrl,
+                                    uiUrl = uiUrl
+                            ))
+                        }
+                    }
+                }
+            }
+        }
+        return managers
+    }
 }

matrix-sdk-core/src/main/java/org/matrix/androidsdk/rest/model/WellKnownManagerConfig.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.androidsdk.rest.model
+
+
+data class WellKnownManagerConfig(
+        val apiUrl : String,
+        val uiUrl: String
+)

matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/cryptostore/db/Helper.kt

@@ -50,41 +50,36 @@ fun String.hash() = try {
  * Get realm, invoke the action, close realm, and return the result of the action
  */
 fun <T> doWithRealm(realmConfiguration: RealmConfiguration, action: (Realm) -> T): T {
-    val realm = Realm.getInstance(realmConfiguration)
-    val result = action.invoke(realm)
-    realm.close()
-    return result
+    return Realm.getInstance(realmConfiguration).use {
+        action.invoke(it)
+    }
 }
 
 /**
  * Get realm, do the query, copy from realm, close realm, and return the copied result
  */
 fun <T : RealmObject> doRealmQueryAndCopy(realmConfiguration: RealmConfiguration, action: (Realm) -> T?): T? {
-    val realm = Realm.getInstance(realmConfiguration)
-    val result = action.invoke(realm)
-    val copiedResult = result?.let { realm.copyFromRealm(result) }
-    realm.close()
-    return copiedResult
+    return Realm.getInstance(realmConfiguration).use { realm ->
+        action.invoke(realm)?.let { realm.copyFromRealm(it) }
+    }
 }
 
 /**
  * Get realm, do the list query, copy from realm, close realm, and return the copied result
  */
 fun <T : RealmObject> doRealmQueryAndCopyList(realmConfiguration: RealmConfiguration, action: (Realm) -> Iterable<T>): Iterable<T> {
-    val realm = Realm.getInstance(realmConfiguration)
-    val result = action.invoke(realm)
-    val copiedResult = realm.copyFromRealm(result)
-    realm.close()
-    return copiedResult
+    return Realm.getInstance(realmConfiguration).use { realm ->
+        action.invoke(realm).let { realm.copyFromRealm(it) }
+    }
 }
 
 /**
  * Get realm instance, invoke the action in a transaction and close realm
  */
 fun doRealmTransaction(realmConfiguration: RealmConfiguration, action: (Realm) -> Unit) {
-    val realm = Realm.getInstance(realmConfiguration)
-    realm.executeTransaction { action.invoke(it) }
-    realm.close()
+    Realm.getInstance(realmConfiguration).use { realm ->
+        realm.executeTransaction { action.invoke(it) }
+    }
 }
 
 /**

matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/cryptostore/db/RealmCryptoStore.kt

@@ -100,7 +100,7 @@ class RealmCryptoStore(private val enableFileEncryption: Boolean = false) : IMXC
 
     override fun open() {
         // Ensure CryptoMetadataEntity is inserted in DB
-        doWithRealm(realmConfiguration) { realm ->
+        doRealmTransaction(realmConfiguration) { realm ->
             var currentMetadata = realm.where<CryptoMetadataEntity>().findFirst()
 
             var deleteAll = false
@@ -118,15 +118,13 @@ class RealmCryptoStore(private val enableFileEncryption: Boolean = false) : IMXC
             }
 
             if (currentMetadata == null) {
-                realm.executeTransaction {
-                    if (deleteAll) {
-                        it.deleteAll()
-                    }
+                if (deleteAll) {
+                    realm.deleteAll()
+                }
 
-                    // Metadata not found, or database cleaned, create it
-                    it.createObject(CryptoMetadataEntity::class.java, credentials.getUserId()).apply {
-                        deviceId = credentials.getDeviceId()
-                    }
+                // Metadata not found, or database cleaned, create it
+                realm.createObject(CryptoMetadataEntity::class.java, credentials.getUserId()).apply {
+                    deviceId = credentials.getDeviceId()
                 }
             }
         }

matrix-sdk-crypto/src/main/res/values/strings.xml

@@ -36,7 +36,7 @@
     <string name="verification_emoji_robot">Robot</string>
     <string name="verification_emoji_hat">Hat</string>
     <string name="verification_emoji_glasses">Glasses</string>
-    <string name="verification_emoji_wrench">Spanner</string>
+    <string name="verification_emoji_wrench">Wrench</string>
     <string name="verification_emoji_santa">Santa</string>
     <string name="verification_emoji_thumbsup">Thumbs Up</string>
     <string name="verification_emoji_umbrella">Umbrella</string>
@@ -55,7 +55,7 @@
     <string name="verification_emoji_flag">Flag</string>
     <string name="verification_emoji_train">Train</string>
     <string name="verification_emoji_bicycle">Bicycle</string>
-    <string name="verification_emoji_airplane">Aeroplane</string>
+    <string name="verification_emoji_airplane">Airplane</string>
     <string name="verification_emoji_rocket">Rocket</string>
     <string name="verification_emoji_trophy">Trophy</string>
     <string name="verification_emoji_ball">Ball</string>

matrix-sdk/build.gradle

@@ -27,8 +27,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 930
-        versionName "0.9.30"
+        versionCode 931
+        versionName "0.9.31"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // Enable multi dex for test

matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java

@@ -70,6 +70,7 @@
 import org.matrix.androidsdk.db.MXMediaCache;
 import org.matrix.androidsdk.features.identityserver.IdentityServerManager;
 import org.matrix.androidsdk.features.identityserver.IdentityServerNotConfiguredException;
+import org.matrix.androidsdk.features.integrationmanager.IntegrationManager;
 import org.matrix.androidsdk.features.terms.TermsManager;
 import org.matrix.androidsdk.groups.GroupsManager;
 import org.matrix.androidsdk.network.NetworkConnectivityReceiver;
@@ -179,6 +180,8 @@ public class MXSession implements CryptoSession {
 
     private IdentityServerManager mIdentityServerManager;
 
+    private IntegrationManager mIntegrationManager;
+
     private boolean mIsAliveSession = true;
 
     // online status
@@ -384,6 +387,8 @@ public void onReadReceiptsLoaded(final String roomId) {
         termsManager = new TermsManager(this);
 
         mIdentityServerManager = new IdentityServerManager(this, appContext);
+
+        mIntegrationManager = new IntegrationManager(this, appContext);
     }
 
     private void checkIfAlive() {
@@ -569,6 +574,11 @@ public IdentityServerManager getIdentityServerManager() {
         return mIdentityServerManager;
     }
 
+    public IntegrationManager getIntegrationManager() {
+        checkIfAlive();
+        return mIntegrationManager;
+    }
+
     public CallRestClient getCallRestClient() {
         checkIfAlive();
         return mCallRestClient;
@@ -2124,6 +2134,13 @@ public void unIgnoreUsers(List<String> userIds, ApiCallback<Void> callback) {
         }
     }
 
+    public void enableIntegrationManagerUsage(Boolean enable, ApiCallback<Void> callback) {
+        Map<String, Object> enableImAccountDataEl = new HashMap<>();
+        enableImAccountDataEl.put("enabled", enable);
+
+        mAccountDataRestClient.setAccountData(getMyUserId(), AccountDataElement.ACCOUNT_DATA_TYPE_INTEGRATION_PROVISIONING, enableImAccountDataEl, callback);
+    }
+
     /**
      * @return the network receiver.
      */