Merge branch 'release-v0.9.0'

# Conflicts:
#	CHANGES.rst
#	matrix-sdk/build.gradle
#	matrix-sdk/src/main/java/org/matrix/androidsdk/call/MXCall.java
#	matrix-sdk/src/main/java/org/matrix/androidsdk/call/MXWebRtcView.java
#	matrix-sdk/src/main/java/org/matrix/androidsdk/crypto/MXDeviceList.java
#	matrix-sdk/src/main/java/org/matrix/androidsdk/data/store/MXFileStore.java
#	matrix-sdk/src/main/java/org/matrix/androidsdk/rest/client/RoomsRestClient.java
#	matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/MatrixError.java
#	matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/bingrules/BingRule.java

CHANGES.rst

@@ -1,3 +1,42 @@
+Changes to Matrix Android SDK in 0.9.0 (2018-02-15)
+=======================================================
+
+Improvements:
+ * Groups: Handle the user's groups and their data (vector-im/riot-meta#114).
+ * Groups: Add methods to accept group invite and leave it (vector-im/riot-meta#114).
+ * Groups Flair: Handle the publicised groups for the matrix users (vector-im/riot-meta#118).
+ * Groups Flair: Support the new state event type `m.room.related_groups`(vector-im/riot-meta#118).
+ * Improve media cache (PR #226).
+ * Force to save the room events when their states are updated.
+ * Do not retry a request if the response is not formatted as expected.
+ * Increase the call timeout to reduce the number of failed calls with a slow network.
+ * Add configuration errors management.
+ * Improve the text extraction from android share feature.
+ * Improve the user id regex to supported extended format (vector-im/riot-android#1927).
+ * Update the room notifications management (vector-im/riot-meta#9).
+ * Saved the incoming key requests in the store (PR #232).
+ * Improve isAvatarThumbnailCached() to avoid flickering.
+ * Add the global URL preview flag management.
+ * Synchronize the room url preview disabled by the user.
+
+Bugfixes:
+ * Do kicked rooms appear in the room list? (#1856).
+ * Fix a sharekeys issue when the user devices were not downloaded to check if they exist.
+ * Messages are not displayed properly (#1805).
+ * If an m.room.encryption event is redacted, android thinks the room is no longer encrypted (vector-im/riot-android#1064).
+ * Excessive battery use reported by my phones software (vector-im/riot-android#1838).
+ * Create a direct chat with an email address is not marked/seen as direct (vector-im/riot-android#1931).
+ * F-Droid: can't compile with react-native-webrtc.aar built from source (#227).
+ * Fix empty emote case.
+ * Fix downloadManagerTask error management.
+ * Empty chat history (#1875).
+ * Fix a server issue : some group members are duplicated.
+ * Fix a sharekeys issue : getKeysClaimed() failed to return the decrypted value.
+
+Translations:
+ * Catalan, added thanks to @sim6 and @d1d4c.
+ * Arabic, added thanks to @SafaAlfulaij.
+
 Changes to Matrix Android SDK in 0.8.08 (2018-01-16)
 =======================================================
 

matrix-sdk/build.gradle

@@ -16,9 +16,9 @@ android {
  minSdkVersion 16
  targetSdkVersion 26
  // use version to define a version code.
- versionCode 808
- version "0.8.08"
- versionName "0.8.08"
+ versionCode 900
+ version "0.9.0"
+ versionName "0.9.0"
  resValue "string", "flavor_description", "SDKApp"
  testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
  }
@@ -117,9 +117,9 @@ dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
  compile 'com.android.support:appcompat-v7:26.+'
  compile 'com.squareup.retrofit:retrofit:1.6.1'
- compile 'com.google.code.gson:gson:2.7'
- compile 'com.squareup.okhttp:okhttp-urlconnection:2.7.5'
- compile 'com.squareup.okhttp:okhttp:2.7.5'
+ compile 'com.google.code.gson:gson:2.3'
+ compile 'com.squareup.okhttp:okhttp-urlconnection:2.2.0'
+ compile 'com.squareup.okhttp:okhttp:2.2.0'
 
  compile(name: 'olm-sdk', ext: 'aar')
 

matrix-sdk/src/androidTest/java/org/matrix/androidsdk/AttachmentEncryptionTest.java

@@ -11,8 +11,8 @@
 
 import org.junit.runners.MethodSorters;
 import org.matrix.androidsdk.crypto.MXEncryptedAttachments;
-import org.matrix.androidsdk.rest.model.EncryptedFileInfo;
-import org.matrix.androidsdk.rest.model.EncryptedFileKey;
+import org.matrix.androidsdk.rest.model.crypto.EncryptedFileInfo;
+import org.matrix.androidsdk.rest.model.crypto.EncryptedFileKey;
 
 import java.io.InputStream;
 import java.util.Arrays;

matrix-sdk/src/androidTest/java/org/matrix/androidsdk/CryptoTest.java

@@ -49,10 +49,9 @@
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.Event;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.rest.model.RoomMember;
 import org.matrix.androidsdk.rest.model.login.Credentials;
-import org.matrix.androidsdk.ssl.UnrecognizedCertificateException;
 import org.matrix.androidsdk.util.JsonUtils;
 import org.matrix.androidsdk.util.Log;
 
@@ -1806,7 +1805,7 @@ public void onUnexpectedError(Exception e) {
  lock1.countDown();
  }
  });
- lock1.await(10000, TimeUnit.MILLISECONDS);
+ lock1.await(30000, TimeUnit.MILLISECONDS);
  assertTrue(results + "", results.containsKey("send1") && results.containsKey("bob1") && results.containsKey("sam1"));
 
  List<MXDeviceInfo> list = mBobSession.getCrypto().getUserDevices(mAliceSession.getMyUserId());

matrix-sdk/src/main/assets/www/call.js

@@ -53,7 +53,7 @@ function MatrixCall(opts) {
 }
 
 /** The length of time a call can be ringing for. */
-MatrixCall.CALL_TIMEOUT_MS = 60000;
+MatrixCall.CALL_TIMEOUT_MS = 120000;
 /** The fallback server to use for STUN. */
 MatrixCall.FALLBACK_STUN_SERVER = 'stun:stun.l.google.com:19302';