From de2e7344465f3e53c684a0ca3f0d670bc76ea303 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 14 Sep 2020 16:06:34 +0200 Subject: [PATCH 1/5] Version++ --- CHANGES.rst | 27 +++++++++++++++++++++++++++ matrix-sdk/build.gradle | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b7d87db0c4..343bd7560f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,30 @@ +Changes to Matrix Android SDK in 0.9.37 (2020-XX-XX) +======================================================= + +Features: + - + +Improvements: + - + +Bugfix: + - + +API Change: + - + +Translations: + - + +Others: + - + +Build: + - + +Test: + - + Changes to Matrix Android SDK in 0.9.36 (2020-09-14) ======================================================= diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle index 1ac9389713..8eecb32b6d 100644 --- a/matrix-sdk/build.gradle +++ b/matrix-sdk/build.gradle @@ -27,8 +27,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 28 - versionCode 936 - versionName "0.9.36" + versionCode 937 + versionName "0.9.37-dev" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // Enable multi dex for test From 025ab8cbdb58b480d2f5cedbd3739deba8c0c27c Mon Sep 17 00:00:00 2001 From: Giom Foret Date: Tue, 15 Sep 2020 19:11:54 +0200 Subject: [PATCH 2/5] Update targetSdkVersion to Android 10 (API 29) --- .travis.yml | 4 ++-- CHANGES.rst | 2 +- matrix-sdk-core/build.gradle | 4 ++-- matrix-sdk-crypto/build.gradle | 4 ++-- matrix-sdk/build.gradle | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0101bd0f7b..464269b3b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,10 @@ android: - platform-tools # The BuildTools version used by your project - - build-tools-28.0.3 + - build-tools-29.0.3 # The SDK version used to compile your project - - android-28 + - android-29 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock diff --git a/CHANGES.rst b/CHANGES.rst index 343bd7560f..de15410971 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -20,7 +20,7 @@ Others: - Build: - - + - Update targetSdkVersion to Android 10 (API 29) Test: - diff --git a/matrix-sdk-core/build.gradle b/matrix-sdk-core/build.gradle index 66f0f660b2..efc4cc424c 100644 --- a/matrix-sdk-core/build.gradle +++ b/matrix-sdk-core/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" diff --git a/matrix-sdk-crypto/build.gradle b/matrix-sdk-crypto/build.gradle index 16e14fa623..27afdcef2d 100644 --- a/matrix-sdk-crypto/build.gradle +++ b/matrix-sdk-crypto/build.gradle @@ -14,11 +14,11 @@ buildscript { } android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 29 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle index 8eecb32b6d..79b0b3d575 100644 --- a/matrix-sdk/build.gradle +++ b/matrix-sdk/build.gradle @@ -15,7 +15,7 @@ buildscript { } android { - compileSdkVersion 28 + compileSdkVersion 29 packagingOptions { exclude 'LICENSE.txt' @@ -26,7 +26,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 937 versionName "0.9.37-dev" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From 25686b39d98b3a77335ea1f44256fc5c533a1af6 Mon Sep 17 00:00:00 2001 From: yostyle Date: Tue, 22 Sep 2020 12:12:41 +0200 Subject: [PATCH 3/5] set user id before storing it --- matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java | 1 + 1 file changed, 1 insertion(+) diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java index c5248465ae..3c102e7161 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java @@ -547,6 +547,7 @@ public void onSuccess(User user) { currentUser.lastActiveAgo = user.lastActiveAgo; } else { currentUser = user; + currentUser.user_id = userId; } currentUser.setLatestPresenceTs(System.currentTimeMillis()); From 9fb9fd5a775c0267951823df02f92176719e8f60 Mon Sep 17 00:00:00 2001 From: yostyle Date: Tue, 22 Sep 2020 12:19:19 +0200 Subject: [PATCH 4/5] update changes --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index de15410971..a11d20d288 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Improvements: - Bugfix: - - + - Fix a crash when it checks user preference (related to matrix-org/synapse#7606). API Change: - From 1def84da39b35fd35140e3d6ba69ad80dd84b8e9 Mon Sep 17 00:00:00 2001 From: yostyle Date: Tue, 22 Sep 2020 12:43:42 +0200 Subject: [PATCH 5/5] update changes --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index a11d20d288..5fb309d0ba 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Improvements: - Bugfix: - - Fix a crash when it checks user preference (related to matrix-org/synapse#7606). + - Fix a crash when it checks user presence (related to matrix-org/synapse#7606). API Change: -