From 79d403101669bfa27a4eeb09b0bb8c5a18f63339 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 25 May 2018 18:24:56 +0200 Subject: [PATCH 01/25] Version++ --- CHANGES.rst | 6 ++++++ matrix-sdk/build.gradle | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b8f6f33e8..9686fcc26 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +Changes to Matrix Android SDK in 0.9.5 (2018-XX-XX) +======================================================= + + + + Changes to Matrix Android SDK in 0.9.4 (2018-05-25) ======================================================= diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle index 88f3f99f5..7e48adf45 100644 --- a/matrix-sdk/build.gradle +++ b/matrix-sdk/build.gradle @@ -16,9 +16,9 @@ android { minSdkVersion 16 targetSdkVersion 26 // use version to define a version code. - versionCode 904 - version "0.9.4" - versionName "0.9.4" + versionCode 905 + version "0.9.5-dev" + versionName "0.9.5-dev" resValue "string", "flavor_description", "SDKApp" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } From 3e95dae7e39f7e301d9617f2a34008723a5a46ae Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 20 Apr 2018 06:28:58 +0000 Subject: [PATCH 02/25] Translated using Weblate (Russian) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/ru/ --- matrix-sdk/src/main/res/values-ru/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix-sdk/src/main/res/values-ru/strings.xml b/matrix-sdk/src/main/res/values-ru/strings.xml index c7ce81cbd..e540c0f44 100644 --- a/matrix-sdk/src/main/res/values-ru/strings.xml +++ b/matrix-sdk/src/main/res/values-ru/strings.xml @@ -77,4 +77,6 @@ %1$s отправил стикер. + В ответ на + From f75633f9c5c5e569611466f9debf90c767ac7a64 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Fri, 20 Apr 2018 12:00:32 +0000 Subject: [PATCH 03/25] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/zh_Hant/ --- matrix-sdk/src/main/res/values-zh-rTW/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix-sdk/src/main/res/values-zh-rTW/strings.xml b/matrix-sdk/src/main/res/values-zh-rTW/strings.xml index 2848248b8..4d5ee7a43 100644 --- a/matrix-sdk/src/main/res/values-zh-rTW/strings.xml +++ b/matrix-sdk/src/main/res/values-zh-rTW/strings.xml @@ -66,4 +66,6 @@ %1$s 傳送了一張貼圖。 + 回覆 + From 811a6ee5e43d488e059fb176f2b63543db955b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Fri, 20 Apr 2018 06:26:23 +0000 Subject: [PATCH 04/25] Translated using Weblate (French) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/fr/ --- matrix-sdk/src/main/res/values-fr/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix-sdk/src/main/res/values-fr/strings.xml b/matrix-sdk/src/main/res/values-fr/strings.xml index b324d430b..0b7ca591d 100644 --- a/matrix-sdk/src/main/res/values-fr/strings.xml +++ b/matrix-sdk/src/main/res/values-fr/strings.xml @@ -66,4 +66,6 @@ %1$s a envoyé un sticker. + En réponse à + From 91d5fcfdb25398e23abb3a8ee05f0f780b81e1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Mon, 28 May 2018 08:55:04 +0000 Subject: [PATCH 05/25] Added translation using Weblate (Icelandic) --- matrix-sdk/src/main/res/values-is/strings.xml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 matrix-sdk/src/main/res/values-is/strings.xml diff --git a/matrix-sdk/src/main/res/values-is/strings.xml b/matrix-sdk/src/main/res/values-is/strings.xml new file mode 100644 index 000000000..a6b3daec9 --- /dev/null +++ b/matrix-sdk/src/main/res/values-is/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file From 1ca278c3c8a68f33b991fa0428024e315fdfc8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Mon, 28 May 2018 09:03:56 +0000 Subject: [PATCH 06/25] Translated using Weblate (Icelandic) Currently translated at 60.0% (33 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/is/ --- matrix-sdk/src/main/res/values-is/strings.xml | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/matrix-sdk/src/main/res/values-is/strings.xml b/matrix-sdk/src/main/res/values-is/strings.xml index a6b3daec9..e67bc390c 100644 --- a/matrix-sdk/src/main/res/values-is/strings.xml +++ b/matrix-sdk/src/main/res/values-is/strings.xml @@ -1,2 +1,44 @@ - - \ No newline at end of file + +Matrix Android SDK + + %1$s: %2$s + %1$s sendi mynd. + %1$s sendi límmerki. + + %s sendi boð um þátttöku + %1$s bauð %2$s + %1$s bauð þér + %1$s gekk í hópinn + %1$s hætti + %1$s hafnaði boðinu + %1$s sparkaði %2$s + %1$s afbannaði %2$s + %1$s bannaði %2$s + %1$s breyttu auðkennismynd sinni + allir meðlimir spjallrásar, síðan þeim var boðið. + allir meðlimir spjallrásar, síðan þeir skráðu sig. + allir meðlimir spjallrásar. + hver sem er. + óþekktur (%s). + VoIP-símafundur hafinn + VoIP-símafundi lokið + + (einnig var skipt um auðkennismynd) + " af %1$s" + " [ástæða: %1$s]" + ** Mistókst að afkóða: %s ** + Sem svar til + + Gat ekki sent skilaboð + + Gat ekki sent inn mynd + + Villa í netkerfi + Villa í Matrix + + Dulrituð skilaboð + + Tölvupóstfang + Símanúmer + + From 4c228141db91cb6360f8a7eb0e36cca2f23f2483 Mon Sep 17 00:00:00 2001 From: random Date: Wed, 16 May 2018 15:31:32 +0000 Subject: [PATCH 07/25] Translated using Weblate (Italian) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/it/ --- matrix-sdk/src/main/res/values-it/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix-sdk/src/main/res/values-it/strings.xml b/matrix-sdk/src/main/res/values-it/strings.xml index 1fd32aeec..4014cbbe0 100644 --- a/matrix-sdk/src/main/res/values-it/strings.xml +++ b/matrix-sdk/src/main/res/values-it/strings.xml @@ -66,4 +66,6 @@ "corretto %1$s " %1$s ha inviato un adesivo. + In risposta a + From c72e398a228e0d924afdbf0f521e904449e17434 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 28 May 2018 11:58:30 +0200 Subject: [PATCH 08/25] Fix regression on URL preview, along with regression on searching user. (vector-im/riot-android#2264) --- CHANGES.rst | 2 ++ .../main/java/org/matrix/androidsdk/rest/api/EventsApi.java | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 9686fcc26..b8ed90bde 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,8 @@ Changes to Matrix Android SDK in 0.9.5 (2018-XX-XX) ======================================================= +Bugfix + - Fix regression on URL preview, along with regression on searching user. (vector-im/riot-android#2264) diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/api/EventsApi.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/api/EventsApi.java index 3a49204d9..e199ffd79 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/api/EventsApi.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/api/EventsApi.java @@ -29,7 +29,6 @@ import java.util.Map; import retrofit2.Call; -import retrofit2.Callback; import retrofit2.http.Body; import retrofit2.http.GET; import retrofit2.http.POST; @@ -78,7 +77,7 @@ public interface EventsApi { * * @param searchUsersParams the search params. */ - @POST(RestClient.URI_API_PREFIX_PATH_R0 + "/user_directory/search") + @POST(RestClient.URI_API_PREFIX_PATH_R0 + "user_directory/search") Call searchUsers(@Body SearchUsersParams searchUsersParams); /** @@ -87,6 +86,6 @@ public interface EventsApi { * @param url the URL * @param ts the ts */ - @GET(RestClient.URI_API_PREFIX_PATH_MEDIA_R0 + "/preview_url") + @GET(RestClient.URI_API_PREFIX_PATH_MEDIA_R0 + "preview_url") Call> getURLPreview(@Query("url") String url, @Query("ts") long ts); } From 4264960b1b84ca6d739fddbcae068c6780ea8422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Mon, 28 May 2018 10:48:45 +0000 Subject: [PATCH 09/25] Translated using Weblate (Icelandic) Currently translated at 85.4% (47 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/is/ --- matrix-sdk/src/main/res/values-is/strings.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/res/values-is/strings.xml b/matrix-sdk/src/main/res/values-is/strings.xml index e67bc390c..b9491642b 100644 --- a/matrix-sdk/src/main/res/values-is/strings.xml +++ b/matrix-sdk/src/main/res/values-is/strings.xml @@ -41,4 +41,19 @@ Tölvupóstfang Símanúmer - +%1$s tók til baka boð frá %2$s + %1$s setti birtingarnafn sitt sem %2$s + %1$s breytti birtingarnafni sínu úr %2$s í %3$s + %1$s fjarlægði birtingarnafn sitt (%2$s) + %1$s breytti umræðuefninu í: %2$s + %1$s breytti heiti spjallrásarinnar í: %2$s + %s hringdi myndsamtal. + %s hringdi raddsamtal. + %s svaraði símtalinu. + %s lauk símtalinu. + %1$s kveikti á enda-í-enda dulritun (%2$s) + + %1$s bað um VoIP-símafund + %1$s fjarlægði heiti spjallrásar + %1$s fjarlægði umfjöllunarefni spjallrásar + From 2453174fe44c8a2a2382f72cfa5dfb314f90b46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Mon, 28 May 2018 10:56:46 +0000 Subject: [PATCH 10/25] Translated using Weblate (Icelandic) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/is/ --- matrix-sdk/src/main/res/values-is/strings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/matrix-sdk/src/main/res/values-is/strings.xml b/matrix-sdk/src/main/res/values-is/strings.xml index b9491642b..e665055ac 100644 --- a/matrix-sdk/src/main/res/values-is/strings.xml +++ b/matrix-sdk/src/main/res/values-is/strings.xml @@ -56,4 +56,15 @@ %1$s bað um VoIP-símafund %1$s fjarlægði heiti spjallrásar %1$s fjarlægði umfjöllunarefni spjallrásar + %1$s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir %2$s + "ritstýrði %1$s " + %1$s uppfærði notandasniðið sitt %2$s + %1$s sendi boð til %2$s um þátttöku í spjallrásinni + %1$s samþykkti boð um að taka þátt í %2$s + + Tæki sendandans hefur ekki sent okkur dulritunarlyklana fyrir þessi skilaboð. + + Gat ekki ritstýrt + Ekki er í augnablikinu hægt að taka aftur þátt í spjallrás sem er tóm. + From e23b8bfb044551df8554a1055f67c55eb4e3f79d Mon Sep 17 00:00:00 2001 From: Nathan van Beelen Date: Mon, 28 May 2018 17:10:28 +0000 Subject: [PATCH 11/25] Translated using Weblate (Dutch) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/nl/ --- matrix-sdk/src/main/res/values-nl/strings.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/res/values-nl/strings.xml b/matrix-sdk/src/main/res/values-nl/strings.xml index 3fd91993b..45df5f882 100644 --- a/matrix-sdk/src/main/res/values-nl/strings.xml +++ b/matrix-sdk/src/main/res/values-nl/strings.xml @@ -73,4 +73,8 @@ E-mailadres Telefoonnummer - +%1$s heeft een sticker gestuurd. + + Als antwoord op + + From 8f4fb142a3d1c2317e4788eae49a9395d54ed067 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 29 May 2018 14:34:49 +0200 Subject: [PATCH 12/25] Test: upgrade test dependencies --- matrix-sdk/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle index 7e48adf45..0974f1471 100644 --- a/matrix-sdk/build.gradle +++ b/matrix-sdk/build.gradle @@ -136,9 +136,9 @@ dependencies { implementation(name: 'react-native-webrtc', ext: 'aar') // Robolectric - testImplementation 'com.android.support.test:runner:0.5' - testImplementation 'com.android.support.test:rules:0.5' - testImplementation 'org.mockito:mockito-core:1.+' + testImplementation 'com.android.support.test:runner:1.0.2' + testImplementation 'com.android.support.test:rules:1.0.2' + testImplementation 'org.mockito:mockito-core:2.7.22' testImplementation 'junit:junit:4.12' testImplementation 'org.hamcrest:hamcrest-library:1.3' testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3' // fixes issue on linux/mac @@ -149,7 +149,7 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support:support-annotations:25.3.1' - androidTestImplementation 'com.android.support.test:runner:0.5' - androidTestImplementation 'com.android.support.test:rules:0.5' + androidTestImplementation 'com.android.support:support-annotations:27.1.1' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test:rules:1.0.2' } From ec3491c83d5f00864f6dd1acd8e5ccd2d3e8f757 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 29 May 2018 14:43:27 +0200 Subject: [PATCH 13/25] Test: upgrade Robolectric from 3.0 to 3.8 --- matrix-sdk/build.gradle | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle index 0974f1471..b6c92c461 100644 --- a/matrix-sdk/build.gradle +++ b/matrix-sdk/build.gradle @@ -103,6 +103,12 @@ android { dir 'libs' } } + + testOptions { + unitTests { + includeAndroidResources = true + } + } } static def gitRevision() { @@ -135,17 +141,16 @@ dependencies { // replace the compile 'io.pristine:libjingle:9690@aar' implementation(name: 'react-native-webrtc', ext: 'aar') - // Robolectric + // Test testImplementation 'com.android.support.test:runner:1.0.2' testImplementation 'com.android.support.test:rules:1.0.2' testImplementation 'org.mockito:mockito-core:2.7.22' testImplementation 'junit:junit:4.12' testImplementation 'org.hamcrest:hamcrest-library:1.3' testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3' // fixes issue on linux/mac - testImplementation('org.robolectric:robolectric:3.0') { - exclude group: 'commons-logging', module: 'commons-logging' - exclude group: 'org.apache.httpcomponents', module: 'httpclient' - } + + // Robolectric + testImplementation "org.robolectric:robolectric:3.8" testImplementation 'junit:junit:4.12' androidTestImplementation 'junit:junit:4.12' From 4ff42acb868e3f507d59661f4958116a6a33b7a5 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 29 May 2018 15:23:33 +0200 Subject: [PATCH 14/25] CI: Travis should run Lint and Tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61955d2ac..5353b56f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,4 +39,4 @@ cache: - $HOME/.android/build-cache # Just build the project for now -script: ./gradlew clean assembleRelease --stacktrace +script: ./gradlew clean lintRelease test assembleRelease --stacktrace From c2574780bfd5022425c5acbd8566a205e60d4e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20V=C3=A1gner?= Date: Sat, 28 Apr 2018 21:45:20 +0000 Subject: [PATCH 15/25] Translated using Weblate (Slovak) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/sk/ --- matrix-sdk/src/main/res/values-sk/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix-sdk/src/main/res/values-sk/strings.xml b/matrix-sdk/src/main/res/values-sk/strings.xml index 9e93dabbd..3f5bc5425 100644 --- a/matrix-sdk/src/main/res/values-sk/strings.xml +++ b/matrix-sdk/src/main/res/values-sk/strings.xml @@ -66,4 +66,6 @@ %1$s poslal nálepku. + Odpoveď na + From a7f4e9aaec8000619533e1d931e527120955dc32 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 20 Apr 2018 06:34:23 +0000 Subject: [PATCH 16/25] Translated using Weblate (Bulgarian) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/bg/ --- matrix-sdk/src/main/res/values-bg/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix-sdk/src/main/res/values-bg/strings.xml b/matrix-sdk/src/main/res/values-bg/strings.xml index 674e2bd89..cb89e2b4f 100644 --- a/matrix-sdk/src/main/res/values-bg/strings.xml +++ b/matrix-sdk/src/main/res/values-bg/strings.xml @@ -66,4 +66,6 @@ %1$s изпрати стикер. + В отговор на + From 665dfc9ebef95aa6f970f38afeb84a62c65362a3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 30 May 2018 14:46:41 +0200 Subject: [PATCH 17/25] Add deactivate account API, the same way a logout API exists --- .../java/org/matrix/androidsdk/MXSession.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) 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 230d8a696..f662593b7 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java @@ -2076,6 +2076,45 @@ public void onUnexpectedError(Exception e) { }); } + /** + * Deactivate the account. + * + * @param context the application context + * @param type type of authentication + * @param userId current user id + * @param userPassword current password + * @param eraseUserData true to also erase all the user data + * @param callback the success and failure callback + */ + public void deactivateAccount(final Context context, + final String type, + final String userId, + final String userPassword, + final boolean eraseUserData, + final ApiCallback callback) { + mProfileRestClient.deactivateAccount(type, userId, userPassword, eraseUserData, new SimpleApiCallback(callback) { + + @Override + public void onSuccess(Void info) { + Log.e(LOG_TAG, "## deactivateAccount() : succeed -> clearing the application data "); + + // Clear crypto data + // For security and because it will be no more useful as we will get a new device id + // on the next log in + enableCrypto(false, null); + + clear(context, new SimpleApiCallback(callback) { + @Override + public void onSuccess(Void info) { + if (null != callback) { + callback.onSuccess(null); + } + } + }); + } + }); + } + /** * Update the URL preview status by default * From 1772ea8d700e78219c2d8d3fee4795907f4b13a6 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 30 May 2018 17:36:57 +0200 Subject: [PATCH 18/25] Remove userId param, this class already knows it --- matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 f662593b7..4a0c033cb 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java @@ -2081,18 +2081,16 @@ public void onUnexpectedError(Exception e) { * * @param context the application context * @param type type of authentication - * @param userId current user id * @param userPassword current password * @param eraseUserData true to also erase all the user data * @param callback the success and failure callback */ public void deactivateAccount(final Context context, final String type, - final String userId, final String userPassword, final boolean eraseUserData, final ApiCallback callback) { - mProfileRestClient.deactivateAccount(type, userId, userPassword, eraseUserData, new SimpleApiCallback(callback) { + mProfileRestClient.deactivateAccount(type, getMyUserId(), userPassword, eraseUserData, new SimpleApiCallback(callback) { @Override public void onSuccess(Void info) { From 8ea37738f7797d443309fcb72c48ed1f5e9763fe Mon Sep 17 00:00:00 2001 From: Osoitz Date: Sun, 27 May 2018 23:42:26 +0000 Subject: [PATCH 19/25] Translated using Weblate (Basque) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/eu/ --- matrix-sdk/src/main/res/values-eu/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix-sdk/src/main/res/values-eu/strings.xml b/matrix-sdk/src/main/res/values-eu/strings.xml index 3d411a1b2..d3a16db44 100644 --- a/matrix-sdk/src/main/res/values-eu/strings.xml +++ b/matrix-sdk/src/main/res/values-eu/strings.xml @@ -66,4 +66,6 @@ %1$s erabiltzaileak eranskailu bat bidali du. + Honi erantzunez + From d063d79f2d2da4c8677ae9b650053fbb73439820 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Fri, 25 May 2018 15:00:13 +0000 Subject: [PATCH 20/25] Translated using Weblate (Hungarian) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/hu/ --- matrix-sdk/src/main/res/values-hu/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix-sdk/src/main/res/values-hu/strings.xml b/matrix-sdk/src/main/res/values-hu/strings.xml index 8691df7a6..c275519ec 100644 --- a/matrix-sdk/src/main/res/values-hu/strings.xml +++ b/matrix-sdk/src/main/res/values-hu/strings.xml @@ -66,4 +66,6 @@ %1$s küldött egy matricát. + Válasz erre: + From e3333d782e834d2de5bea1f2e94af4e0025c48fe Mon Sep 17 00:00:00 2001 From: Bamstam Date: Mon, 30 Apr 2018 15:18:00 +0000 Subject: [PATCH 21/25] Translated using Weblate (German) Currently translated at 100.0% (55 of 55 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/de/ --- matrix-sdk/src/main/res/values-de/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix-sdk/src/main/res/values-de/strings.xml b/matrix-sdk/src/main/res/values-de/strings.xml index 08520e3d1..9cdc3cdf6 100644 --- a/matrix-sdk/src/main/res/values-de/strings.xml +++ b/matrix-sdk/src/main/res/values-de/strings.xml @@ -77,4 +77,6 @@ %1$s sandte einen Sticker. + Als Antwort auf + From 44cb9cf2741d601d9f9eb983f0101ff4ea41ff77 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 1 Jun 2018 08:19:12 +0100 Subject: [PATCH 22/25] Fix format of /report/ API body 'score' should be an integer, not a list, and synapse is going to start enforcing this soon. --- .../org/matrix/androidsdk/rest/client/RoomsRestClient.java | 7 ++----- .../matrix/androidsdk/rest/model/ReportContentParams.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/client/RoomsRestClient.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/client/RoomsRestClient.java index 23e3f9413..a93361809 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/client/RoomsRestClient.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/client/RoomsRestClient.java @@ -653,10 +653,7 @@ public void reportEvent(final String roomId, final String eventId, final int sco ReportContentParams content = new ReportContentParams(); - ArrayList scores = new ArrayList<>(); - scores.add(score); - - content.score = scores; + content.score = score; content.reason = reason; mApi.reportEvent(roomId, eventId, content).enqueue(new RestAdapterCallback(description, mUnsentEventsManager, callback, new RestAdapterCallback.RequestRetryCallBack() { @@ -985,4 +982,4 @@ public void onRetry() { } })); } -} \ No newline at end of file +} diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/ReportContentParams.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/ReportContentParams.java index 2d8b27e07..9faece60f 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/ReportContentParams.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/ReportContentParams.java @@ -24,7 +24,7 @@ public class ReportContentParams { // The event range from -100 “most offensive” to 0 “inoffensive”. - public List score; + public Integer score; // the report reason public String reason; From ee1bc999c957679ef16725085d3a09834723971c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Fri, 1 Jun 2018 08:35:37 +0100 Subject: [PATCH 23/25] ReportContentParams.java: s/Integer/int. --- .../org/matrix/androidsdk/rest/model/ReportContentParams.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/ReportContentParams.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/ReportContentParams.java index 9faece60f..c05531c94 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/ReportContentParams.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/model/ReportContentParams.java @@ -24,7 +24,7 @@ public class ReportContentParams { // The event range from -100 “most offensive” to 0 “inoffensive”. - public Integer score; + public int score; // the report reason public String reason; From 7cab21f93d7193afec738b3d155da8b1fac84d3d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 1 Jun 2018 10:06:32 +0200 Subject: [PATCH 24/25] Update Javadoc (bad copy/paste) --- .../java/org/matrix/androidsdk/rest/client/RoomsRestClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/client/RoomsRestClient.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/client/RoomsRestClient.java index a93361809..bf9f53b70 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/client/RoomsRestClient.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/rest/client/RoomsRestClient.java @@ -646,7 +646,7 @@ public void onRetry() { * @param eventId the event id * @param score the metric to let the user rate the severity of the abuse. It ranges from -100 “most offensive” to 0 “inoffensive” * @param reason the reason - * @param callback the callback containing the created event if successful + * @param callback the callback */ public void reportEvent(final String roomId, final String eventId, final int score, final String reason, final ApiCallback callback) { final String description = "report : roomId " + roomId + " eventId " + eventId; From 6508a4056265ed15509fda228cdb1f740f7e7b16 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 1 Jun 2018 11:13:31 +0200 Subject: [PATCH 25/25] Update CHANGES and version code to 0.9.5 --- CHANGES.rst | 6 ++++-- matrix-sdk/build.gradle | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b8ed90bde..6c0656a0f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,10 +1,12 @@ -Changes to Matrix Android SDK in 0.9.5 (2018-XX-XX) +Changes to Matrix Android SDK in 0.9.5 (2018-06-01) ======================================================= Bugfix - Fix regression on URL preview, along with regression on searching user. (vector-im/riot-android#2264) + - Fix bad param format on reporting content request (vector-im/riot-android#2301) - +API Change: + - New API in MXSession to deactivate account Changes to Matrix Android SDK in 0.9.4 (2018-05-25) ======================================================= diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle index b6c92c461..4c14a1ec1 100644 --- a/matrix-sdk/build.gradle +++ b/matrix-sdk/build.gradle @@ -17,8 +17,8 @@ android { targetSdkVersion 26 // use version to define a version code. versionCode 905 - version "0.9.5-dev" - versionName "0.9.5-dev" + version "0.9.5" + versionName "0.9.5" resValue "string", "flavor_description", "SDKApp" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" }