crtn32002/matrix-AKJA

.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

CHANGES.rst

@@ -1,3 +1,30 @@
+Changes to Matrix Android SDK in 0.9.37 (2020-XX-XX)
+=======================================================
+
+Features:
+ -
+
+Improvements:
+ -
+
+Bugfix:
+ - Fix a crash when it checks user presence (related to matrix-org/synapse#7606).
+
+API Change:
+ -
+
+Translations:
+ -
+
+Others:
+ -
+
+Build:
+ - Update targetSdkVersion to Android 10 (API 29)
+
+Test:
+ -
+
 Changes to Matrix Android SDK in 0.9.36 (2020-09-14)
 =======================================================
 

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"
 

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"
     }

matrix-sdk/build.gradle

@@ -15,7 +15,7 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     packagingOptions {
         exclude 'LICENSE.txt'
@@ -26,9 +26,9 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 936
-        versionName "0.9.36"
+        targetSdkVersion 29
+        versionCode 937
+        versionName "0.9.37-dev"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // Enable multi dex for test

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());