Merge branch 'release/0.8.10'

Author: bmarty

CHANGES.rst

@@ -1,10 +1,25 @@
+Changes in Riot 0.8.10 (2018-01-06)
+===================================================
+
+Improvements:
+ * Update matrix-sdk.aar lib (v0.9.5).
+ * GDPR compliance:
+    * Account deactivation is now managed natively in a dedicated screen
+
+Features:
+ * Send stickers to a Room
+
+Bug Fix:
+ * Gif do not play anymore (#2168)
+
 Changes in Riot 0.8.9 (2018-05-25)
 ===================================================
 
 Improvements:
+ * Update matrix-sdk.aar lib (v0.9.4).
  * GDPR compliance:
     * Manage M_CONSENT_NOT_GIVEN matrix error
-    * Sending analytics is no opt-in
+    * Sending analytics is now opt-in
     * Possibility to deactivate account (redirected to the web client for the moment)
  * Reply to feature: display only
 

build.gradle

@@ -19,8 +19,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 80900
-    versionNameProp = "0.8.9"
+    versionCodeProp = 81000
+    versionNameProp = "0.8.10"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }

build_riot_apks.sh

@@ -1,10 +1,17 @@
 #!/bin/bash
+
+# Clean all existing APK
 rm *.apk
-./gradlew clean 
 
-./gradlew lintAppRelease assembleAppMatrixorg
-./gradlew lintAppfdroidRelease assembleAppfdroidMatrixorg
+# Clean
+./gradlew clean
+
+# Run Lint and build the APK for the PlayStore
+./gradlew lintAppMatrixorg assembleAppMatrixorg --stacktrace
+
+# Run Lint and build the APK for FDroid
+./gradlew lintAppfdroidMatrixorg assembleAppfdroidMatrixorg --stacktrace
 
-#cp app/build/outputs/apk/app-alpha-matrixorg.apk ./alpha.apk
+# Copy (and rename) the built APKs to the root folder
 cp vector/build/outputs/apk/app/matrixorg/vector-app-matrixorg.apk ./riotGooglePlay.apk
 cp vector/build/outputs/apk/appfdroid/matrixorg/vector-appfdroid-matrixorg.apk ./riotFDroid.apk

settings.gradle

@@ -3,5 +3,5 @@ include ':vector'
 
 // uncomment theses lines to compile matrix SDK as project sources instead of external lib
 // see build.gradle section Matrix SDK management
-include ':matrix-sdk'
-project(':matrix-sdk').projectDir = new File(settingsDir, '../matrix-android-sdk/matrix-sdk')
+//include ':matrix-sdk'
+//project(':matrix-sdk').projectDir = new File(settingsDir, '../matrix-android-sdk/matrix-sdk')

tools/debug_dump_filesystem.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+adb shell am broadcast -a im.vector.receiver.DEBUG_ACTION_DUMP_FILESYSTEM

tools/debug_dump_prefs.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+adb shell am broadcast -a im.vector.receiver.DEBUG_ACTION_DUMP_PREFERENCES

vector/libs/matrix-sdk.aar

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2018 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 im.vector.receiver
+
+import android.content.*
+import android.preference.PreferenceManager
+import android.util.Log
+import im.vector.util.lsFiles
+
+/**
+ * Receiver to handle some command from ADB
+ */
+class DebugReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        when (intent.action) {
+            DEBUG_ACTION_DUMP_FILESYSTEM -> lsFiles(context)
+            DEBUG_ACTION_DUMP_PREFERENCES -> dumpPreferences(context)
+        }
+    }
+
+    private fun dumpPreferences(context: Context) {
+        logPrefs("DefaultSharedPreferences", PreferenceManager.getDefaultSharedPreferences(context))
+        logPrefs("Vector.LoginStorage", context.getSharedPreferences("Vector.LoginStorage", Context.MODE_PRIVATE))
+        logPrefs("GcmRegistrationManager", context.getSharedPreferences("GcmRegistrationManager", Context.MODE_PRIVATE))
+    }
+
+    private fun logPrefs(name: String, sharedPreferences: SharedPreferences?) {
+        Log.d(LOG_TAG, "SharedPreferences $name:")
+
+        sharedPreferences?.let { prefs ->
+            prefs.all.keys.forEach { key ->
+                Log.d(LOG_TAG, "$key : ${prefs.all[key]}")
+            }
+        }
+    }
+
+    companion object {
+        private const val LOG_TAG = "DebugReceiver"
+
+        private const val DEBUG_ACTION_DUMP_FILESYSTEM = "im.vector.receiver.DEBUG_ACTION_DUMP_FILESYSTEM"
+        private const val DEBUG_ACTION_DUMP_PREFERENCES = "im.vector.receiver.DEBUG_ACTION_DUMP_PREFERENCES"
+
+        fun getIntentFilter() = IntentFilter().apply {
+            addAction(DEBUG_ACTION_DUMP_FILESYSTEM)
+            addAction(DEBUG_ACTION_DUMP_PREFERENCES)
+        }
+    }
+}

vector/src/debug/java/im/vector/receiver/DebugReceiver.kt

@@ -21,13 +21,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.matrix.androidsdk.crypto.IncomingRoomKeyRequest;
 import org.matrix.androidsdk.crypto.IncomingRoomKeyRequestCancellation;
 import org.matrix.androidsdk.crypto.MXCrypto;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.rest.client.LoginRestClient;
 import org.matrix.androidsdk.rest.model.MatrixError;
 import org.matrix.androidsdk.ssl.Fingerprint;
 import org.matrix.androidsdk.ssl.UnrecognizedCertificateException;
@@ -465,6 +467,40 @@ public static boolean hasValidSessions() {
     // Session management
     //==============================================================================================================
 
+    /**
+     * Deactivate a session.
+     *
+     * @param context       the context.
+     * @param session       the session to deactivate.
+     * @param userPassword  the user password
+     * @param eraseUserData true to also erase all the user data
+     * @param aCallback     the success and failure callback
+     */
+    public void deactivateSession(final Context context,
+                                  final MXSession session,
+                                  final String userPassword,
+                                  final boolean eraseUserData,
+                                  final @NonNull ApiCallback<Void> aCallback) {
+        Log.d(LOG_TAG, "## deactivateSession() " + session.getMyUserId());
+
+        session.deactivateAccount(context, LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD, userPassword, eraseUserData, new SimpleApiCallback<Void>(aCallback) {
+            @Override
+            public void onSuccess(Void info) {
+                mLoginStorage.removeCredentials(session.getHomeServerConfig());
+
+                session.getDataHandler().removeListener(mLiveEventListener);
+
+                VectorApp.removeSyncingSession(session);
+
+                synchronized (LOG_TAG) {
+                    mMXSessions.remove(session);
+                }
+
+                aCallback.onSuccess(info);
+            }
+        });
+    }
+
     /**
      * Clear a session.
      *

vector/src/main/java/im/vector/Matrix.java

@@ -27,6 +27,7 @@ import butterknife.BindView
 import com.google.gson.reflect.TypeToken
 import im.vector.Matrix
 import im.vector.R
+import im.vector.activity.util.INTEGRATION_MANAGER_ACTIVITY_REQUEST_CODE
 import im.vector.types.JsonDict
 import im.vector.types.WidgetEventData
 import im.vector.util.AssetReader
@@ -167,6 +168,11 @@ abstract class AbstractWidgetActivity : RiotAppCompatActivity() {
                 }
 
                 override fun onPageFinished(view: WebView, url: String) {
+                    // Check that the Activity is still alive
+                    if (isDestroyed) {
+                        return
+                    }
+
                     hideWaitingView()
 
                     val js = AssetReader.readAssetFile(this@AbstractWidgetActivity, "postMessageAPI.js")
@@ -236,7 +242,42 @@ abstract class AbstractWidgetActivity : RiotAppCompatActivity() {
      *
      * @return true if the message is handled (it means an answer has been sent), false if not
      */
-    abstract fun dealsWithWidgetRequest(eventData: JsonDict<Any>): Boolean
+    @CallSuper
+    open fun dealsWithWidgetRequest(eventData: JsonDict<Any>): Boolean {
+        val action = eventData["action"] as String?
+
+        when (action) {
+            "integration_manager_open" -> {
+                var integType: String? = null
+                var integId: String? = null
+
+                val data = eventData["data"]
+
+                data
+                        .takeIf { it is Map<*, *> }
+                        ?.let {
+                            val dict = data as Map<*, *>
+
+                            dict["integType"]
+                                    .takeIf { it is String }
+                                    ?.let { integType = it as String }
+
+                            dict["integId"]
+                                    .takeIf { it is String }
+                                    ?.let { integId = it as String }
+
+                            // Add "type_" as a prefix
+                            integType?.let { integType = "type_$integType" }
+                        }
+
+                openIntegrationManager(integId, integType)
+                return true
+            }
+        }
+
+        // Not handled
+        return false
+    }
 
     /*
      * *********************************************************************************************
@@ -350,6 +391,23 @@ abstract class AbstractWidgetActivity : RiotAppCompatActivity() {
         sendObjectResponse(any.toJsonMap(), eventData)
     }
 
+    /* ==========================================================================================
+     * Protected methods
+     * ========================================================================================== */
+
+    /**
+     * Open integration manager
+     */
+    protected fun openIntegrationManager(widgetId: String?, screenId: String?) {
+        val intent = IntegrationManagerActivity.getIntent(context = this,
+                matrixId = mSession!!.myUserId,
+                roomId = mRoom!!.roomId,
+                widgetId = widgetId,
+                screenId = screenId)
+
+        startActivityForResult(intent, INTEGRATION_MANAGER_ACTIVITY_REQUEST_CODE)
+    }
+
     /* ==========================================================================================
      * INNER CLASSES
      * ========================================================================================== */