From 870e33b07a0e4d7a89bdb84338d07cc1d3068f58 Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 4 Oct 2019 12:11:28 +0200 Subject: [PATCH 01/18] 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 50fb6265a..3ba8266ea 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,30 @@ +Changes to Matrix Android SDK in 0.9.30 (2019-XX-XX) +======================================================= + +Features: + - + +Improvements: + - + +Bugfix: + - + +API Change: + - + +Translations: + - + +Others: + - + +Build: + - + +Test: + - + Changes to Matrix Android SDK in 0.9.29 (2019-10-04) ======================================================= diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle index e0071e7aa..04695922b 100644 --- a/matrix-sdk/build.gradle +++ b/matrix-sdk/build.gradle @@ -27,8 +27,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 28 - versionCode 929 - versionName "0.9.29" + versionCode 930 + versionName "0.9.30-dev" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // Enable multi dex for test From 879463809fc39b925589b1b5ba8edc2b0b08f661 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Thu, 3 Oct 2019 12:39:40 +0000 Subject: [PATCH 02/18] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (140 of 140 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e0e66a80a..cd131a5d8 100644 --- a/matrix-sdk/src/main/res/values-zh-rTW/strings.xml +++ b/matrix-sdk/src/main/res/values-zh-rTW/strings.xml @@ -170,4 +170,5 @@ 正在傳送訊息…… 清除傳送佇列 - +%1$s 撤銷了 %2$s 加入聊天室的邀請 + From be7a8a026cb38854416da91521398c1c27db7e50 Mon Sep 17 00:00:00 2001 From: random Date: Fri, 4 Oct 2019 12:24:37 +0000 Subject: [PATCH 03/18] Translated using Weblate (Italian) Currently translated at 100.0% (140 of 140 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/res/values-it/strings.xml b/matrix-sdk/src/main/res/values-it/strings.xml index 1edc03817..75e1edbdf 100644 --- a/matrix-sdk/src/main/res/values-it/strings.xml +++ b/matrix-sdk/src/main/res/values-it/strings.xml @@ -172,4 +172,5 @@ Invio messaggio in corso … Cancella la coda di invio - +%1$s ha revocato l\'invito a %2$s di unirsi alla stanza + From 4cd8afef1c45817f8017e3da03149c9025579568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=ED=83=9C=EC=84=AD?= Date: Sat, 5 Oct 2019 00:54:01 +0000 Subject: [PATCH 04/18] Translated using Weblate (Korean) Currently translated at 100.0% (140 of 140 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/ko/ --- matrix-sdk/src/main/res/values-ko/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/res/values-ko/strings.xml b/matrix-sdk/src/main/res/values-ko/strings.xml index 5255bc768..13da39732 100644 --- a/matrix-sdk/src/main/res/values-ko/strings.xml +++ b/matrix-sdk/src/main/res/values-ko/strings.xml @@ -170,4 +170,5 @@ 메시지 보내는 중… 전송 대기 열 지우기 - +%1$s님이 %2$s님에게 방에 참가하라고 보낸 초대를 취소했습니다 + From 1340247dee379b75fbf97454bcf24dedf2383ca6 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Sun, 6 Oct 2019 17:03:43 +0000 Subject: [PATCH 05/18] Translated using Weblate (Hungarian) Currently translated at 100.0% (140 of 140 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/res/values-hu/strings.xml b/matrix-sdk/src/main/res/values-hu/strings.xml index e3d4e88c6..0c070de8a 100644 --- a/matrix-sdk/src/main/res/values-hu/strings.xml +++ b/matrix-sdk/src/main/res/values-hu/strings.xml @@ -171,4 +171,5 @@ Üzenet küldése… Küldő sor ürítése - +%1$s visszavonta a meghívót a belépéshez ebbe a szobába: %2$s + From a27b3653d05de928e3d021d74e75d4391e62a782 Mon Sep 17 00:00:00 2001 From: Valere Date: Tue, 8 Oct 2019 17:55:06 +0200 Subject: [PATCH 06/18] Defensive coding against malformed IS --- .../identityserver/IdentityServerManager.kt | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/features/identityserver/IdentityServerManager.kt b/matrix-sdk/src/main/java/org/matrix/androidsdk/features/identityserver/IdentityServerManager.kt index da4f3b1ca..f70aabd14 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/features/identityserver/IdentityServerManager.kt +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/features/identityserver/IdentityServerManager.kt @@ -270,12 +270,18 @@ class IdentityServerManager(val mxSession: MXSession, identityAuthRestClient = null thirdPidRestClient = null } else { - val alteredHsConfig = HomeServerConnectionConfig.Builder(mxSession.homeServerConfig) - .withIdentityServerUri(Uri.parse(newUrl)) - .build() + try { + val alteredHsConfig = HomeServerConnectionConfig.Builder(mxSession.homeServerConfig) + .withIdentityServerUri(Uri.parse(newUrl)) + .build() - identityAuthRestClient = IdentityAuthRestClient(alteredHsConfig) - thirdPidRestClient = ThirdPidRestClient(alteredHsConfig) + identityAuthRestClient = IdentityAuthRestClient(alteredHsConfig) + thirdPidRestClient = ThirdPidRestClient(alteredHsConfig) + } catch (t: Throwable) { + Log.e(LOG_TAG, "Failed to create IS Rest clients", t) + //What to do from there? this IS is invalid + return + } } synchronized(listeners) { listeners.forEach { it.onIdentityServerChange() } } @@ -302,6 +308,11 @@ class IdentityServerManager(val mxSession: MXSession, } private fun requestIdentityServerToken(requestOpenIdTokenResponse: RequestOpenIdTokenResponse, callback: ApiCallback) { + if (identityAuthRestClient == null) { + callback.onUnexpectedError(IdentityServerNotConfiguredException()) + return + } + identityAuthRestClient?.register(requestOpenIdTokenResponse, object : SimpleApiCallback(callback) { override fun onSuccess(info: IdentityServerRegisterResponse) { // Store the token for next time @@ -596,7 +607,7 @@ class IdentityServerManager(val mxSession: MXSession, override fun onUnexpectedError(e: Exception) { if (e is IdentityServerV2ApiNotAvailable) { //mm ? request to HS? - legacyDeleteAndRequestToken(threePid,callback,idServer) + legacyDeleteAndRequestToken(threePid, callback, idServer) } else { super.onUnexpectedError(e) } @@ -659,7 +670,7 @@ class IdentityServerManager(val mxSession: MXSession, override fun onUnexpectedError(e: Exception) { if (e is IdentityServerV2ApiNotAvailable) { //mm ? request to HS? - legacyDeleteAndAddMsisdn(threePid,callback,idServer) + legacyDeleteAndAddMsisdn(threePid, callback, idServer) } else { super.onUnexpectedError(e) } From 3962302b878cc901458f05a317be349093954991 Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 9 Oct 2019 09:33:48 +0200 Subject: [PATCH 07/18] Fix on several crashes from the store --- .../crypto/interfaces/CryptoDataHandler.kt | 2 +- .../crypto/interfaces/CryptoStore.kt | 2 +- .../org/matrix/androidsdk/MXDataHandler.java | 9 +++++++- .../java/org/matrix/androidsdk/MXSession.java | 13 ++++++++---- .../org/matrix/androidsdk/data/MyUser.java | 21 +++++++++++-------- .../identityserver/IdentityServerManager.kt | 4 ++-- .../androidsdk/features/terms/TermsManager.kt | 2 +- 7 files changed, 34 insertions(+), 19 deletions(-) diff --git a/matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/interfaces/CryptoDataHandler.kt b/matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/interfaces/CryptoDataHandler.kt index c128b841d..3b5c9d55c 100644 --- a/matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/interfaces/CryptoDataHandler.kt +++ b/matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/interfaces/CryptoDataHandler.kt @@ -17,7 +17,7 @@ package org.matrix.androidsdk.crypto.interfaces interface CryptoDataHandler { - val store: CryptoStore + val store: CryptoStore? fun setCryptoEventsListener(eventListener: CryptoEventListener) fun getRoom(roomId: String): CryptoRoom fun onEventDecrypted(event: CryptoEvent) diff --git a/matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/interfaces/CryptoStore.kt b/matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/interfaces/CryptoStore.kt index 1cccd6985..2c6ab2979 100644 --- a/matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/interfaces/CryptoStore.kt +++ b/matrix-sdk-crypto/src/main/java/org/matrix/androidsdk/crypto/interfaces/CryptoStore.kt @@ -18,5 +18,5 @@ package org.matrix.androidsdk.crypto.interfaces // For classical store interface CryptoStore { - val eventStreamToken: String + val eventStreamToken: String? } diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/MXDataHandler.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/MXDataHandler.java index 8befc418c..6ff6a28e6 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/MXDataHandler.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/MXDataHandler.java @@ -681,6 +681,7 @@ void checkPermanentStorageData() { * @return the used store. */ @Override + @Nullable public IMXStore getStore() { if (isAlive()) { return mStore; @@ -1911,7 +1912,13 @@ public void onBingEvent(final Event event, final RoomState roomState, final Bing public void updateEventState(Event event, Event.SentState newState) { if ((null != event) && (event.mSentState != newState)) { event.mSentState = newState; - getStore().flushRoomEvents(event.roomId); + //crash reported on app store + if (getStore() != null) { + getStore().flushRoomEvents(event.roomId); + } else { + Log.e(LOG_TAG, "#updateEventState Failed to access to store "); + } + onEventSentStateUpdated(event); } } 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 779aaf21e..67ada3912 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/MXSession.java @@ -289,11 +289,16 @@ public void onStoreReady(String accountId) { @Override public void onStoreCorrupted(String accountId, String description) { - Log.d(LOG_TAG, "## onStoreCorrupted() : token " + getDataHandler().getStore().getEventStreamToken()); + //NPE reported on store + if (getDataHandler().getStore() != null) { + Log.d(LOG_TAG, "## onStoreCorrupted() : token " + getDataHandler().getStore().getEventStreamToken()); - // nothing was saved - if (null == getDataHandler().getStore().getEventStreamToken()) { - getDataHandler().onStoreReady(); + // nothing was saved + if (null == getDataHandler().getStore().getEventStreamToken()) { + getDataHandler().onStoreReady(); + } + } else { + Log.d(LOG_TAG, "## onStoreCorrupted() : no store access "); } } diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java index 174ebf1ed..771b41874 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java @@ -124,17 +124,20 @@ public void onSuccess(Void info) { * Build the lists of identifiers */ private void buildIdentifiersLists() { - List identifiers = mDataHandler.getStore().thirdPartyIdentifiers(); mEmailIdentifiers = new ArrayList<>(); mPhoneNumberIdentifiers = new ArrayList<>(); - for (ThirdPartyIdentifier identifier : identifiers) { - switch (identifier.medium) { - case ThreePid.MEDIUM_EMAIL: - mEmailIdentifiers.add(identifier); - break; - case ThreePid.MEDIUM_MSISDN: - mPhoneNumberIdentifiers.add(identifier); - break; + List identifiers = mDataHandler.getStore().thirdPartyIdentifiers(); + //NPE reported on playstore + if (mDataHandler.getStore() != null) { + for (ThirdPartyIdentifier identifier : identifiers) { + switch (identifier.medium) { + case ThreePid.MEDIUM_EMAIL: + mEmailIdentifiers.add(identifier); + break; + case ThreePid.MEDIUM_MSISDN: + mPhoneNumberIdentifiers.add(identifier); + break; + } } } } diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/features/identityserver/IdentityServerManager.kt b/matrix-sdk/src/main/java/org/matrix/androidsdk/features/identityserver/IdentityServerManager.kt index f70aabd14..d8ad91dd9 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/features/identityserver/IdentityServerManager.kt +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/features/identityserver/IdentityServerManager.kt @@ -74,7 +74,7 @@ class IdentityServerManager(val mxSession: MXSession, if (accountDataElement.type == AccountDataElement.ACCOUNT_DATA_TYPE_IDENTITY_SERVER) { // The identity server has been updated val accountDataIdentityServer = - mxSession.dataHandler.store.getAccountDataElement(AccountDataElement.ACCOUNT_DATA_TYPE_IDENTITY_SERVER) + mxSession.dataHandler.store?.getAccountDataElement(AccountDataElement.ACCOUNT_DATA_TYPE_IDENTITY_SERVER) accountDataIdentityServer?.content?.let { localSetIdentityServerUrl(it[AccountDataElement.ACCOUNT_DATA_KEY_IDENTITY_SERVER_BASE_URL] as String?) @@ -124,7 +124,7 @@ class IdentityServerManager(val mxSession: MXSession, */ private fun retrieveIdentityServerUrl(): String? { val accountDataIdentityServer = - mxSession.dataHandler.store.getAccountDataElement(AccountDataElement.ACCOUNT_DATA_TYPE_IDENTITY_SERVER) + mxSession.dataHandler.store?.getAccountDataElement(AccountDataElement.ACCOUNT_DATA_TYPE_IDENTITY_SERVER) accountDataIdentityServer?.content?.let { return it[AccountDataElement.ACCOUNT_DATA_KEY_IDENTITY_SERVER_BASE_URL] as String? diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/features/terms/TermsManager.kt b/matrix-sdk/src/main/java/org/matrix/androidsdk/features/terms/TermsManager.kt index 30970b202..a2a6d4eb7 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/features/terms/TermsManager.kt +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/features/terms/TermsManager.kt @@ -113,7 +113,7 @@ class TermsManager(private val mxSession: MXSession) { private fun getAlreadyAcceptedTermUrlsFromAccountData(): Set { val accountDataCurrentAcceptedTerms = - mxSession.dataHandler.store.getAccountDataElement(AccountDataElement.ACCOUNT_DATA_TYPE_ACCEPTED_TERMS) + mxSession.dataHandler.store?.getAccountDataElement(AccountDataElement.ACCOUNT_DATA_TYPE_ACCEPTED_TERMS) return (accountDataCurrentAcceptedTerms?.content ?.get(AccountDataElement.ACCOUNT_DATA_KEY_ACCEPTED_TERMS) as? List<*>) From 8c7bfba9414da27b5197722dae9bb0e80c9c21e7 Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 9 Oct 2019 10:44:24 +0200 Subject: [PATCH 08/18] Fix #3349 --- .../src/main/java/org/matrix/androidsdk/data/MyUser.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java index 771b41874..05527207f 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java @@ -314,7 +314,9 @@ public void onSuccess(String aDisplayname) { // local value displayname = aDisplayname; // store metadata - mDataHandler.getStore().setDisplayName(aDisplayname, System.currentTimeMillis()); + if (mDataHandler.getStore() != null) { + mDataHandler.getStore().setDisplayName(aDisplayname, System.currentTimeMillis()); + } mIsDisplayNameRefreshed = true; From d1e5f2fbcc9df61b52413e152234c596529d6318 Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 9 Oct 2019 10:52:09 +0200 Subject: [PATCH 09/18] Fix test compilation --- .../org/matrix/androidsdk/crypto/PartialSharedSessionTest.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/crypto/PartialSharedSessionTest.kt b/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/crypto/PartialSharedSessionTest.kt index bc2c8f134..6945dcc04 100644 --- a/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/crypto/PartialSharedSessionTest.kt +++ b/matrix-sdk/src/androidTest/java/org/matrix/androidsdk/crypto/PartialSharedSessionTest.kt @@ -99,8 +99,7 @@ class PartialSharedSessionTest { mTestHelper.await(latch) val aliceRoom = aliceSession.dataHandler - .store - .getRoom(roomId) + .store!!.getRoom(roomId) latch = CountDownLatch(1) @@ -140,7 +139,7 @@ class PartialSharedSessionTest { val aliceNewSession = mTestHelper.logIntoAccount(aliceSession.myUserId, defaultSessionParamsWithInitialSync) - val aliceRoomOtherSession = aliceNewSession.dataHandler.store.getRoom(aliceRoom.roomId) + val aliceRoomOtherSession = aliceNewSession.dataHandler.store!!.getRoom(aliceRoom.roomId) val aliceSecondSessionEvents = sentEvents.map { aliceRoomOtherSession.store.getEvent(it.eventId, aliceRoomOtherSession.roomId) From 684a8f5df586bf3a2184bb4ce22f2642da65f7d2 Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 9 Oct 2019 11:14:49 +0200 Subject: [PATCH 10/18] Update changes.rst --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 3ba8266ea..30ea859ed 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Improvements: - Bugfix: - - + - App won't start with some custom HS config #499 API Change: - From a5f099f73ebd1ebc60e8dcfd7af28ea95b3a60a6 Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 9 Oct 2019 14:25:40 +0200 Subject: [PATCH 11/18] code review fix --- matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java index 05527207f..786209509 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/data/MyUser.java @@ -126,9 +126,9 @@ public void onSuccess(Void info) { private void buildIdentifiersLists() { mEmailIdentifiers = new ArrayList<>(); mPhoneNumberIdentifiers = new ArrayList<>(); - List identifiers = mDataHandler.getStore().thirdPartyIdentifiers(); //NPE reported on playstore if (mDataHandler.getStore() != null) { + List identifiers = mDataHandler.getStore().thirdPartyIdentifiers(); for (ThirdPartyIdentifier identifier : identifiers) { switch (identifier.medium) { case ThreePid.MEDIUM_EMAIL: From fe429226d7d8ec6b137f2a5c821e5123cb0ea5c4 Mon Sep 17 00:00:00 2001 From: Nathan Follens Date: Tue, 8 Oct 2019 10:49:58 +0000 Subject: [PATCH 12/18] Translated using Weblate (Dutch) Currently translated at 100.0% (140 of 140 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 | 3 ++- 1 file changed, 2 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 c2d524e48..3fea79cd7 100644 --- a/matrix-sdk/src/main/res/values-nl/strings.xml +++ b/matrix-sdk/src/main/res/values-nl/strings.xml @@ -181,4 +181,5 @@ Bericht wordt verstuurd… Uitgaande wachtrij legen - +%1$s heeft de uitnodiging voor %2$s om het gesprek toe te treden ingetrokken + From 8797925a4c36e3687ad0cfb850277184eeaaffcd Mon Sep 17 00:00:00 2001 From: Tuomas Hietala Date: Mon, 7 Oct 2019 18:44:15 +0000 Subject: [PATCH 13/18] Translated using Weblate (Finnish) Currently translated at 100.0% (140 of 140 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/fi/ --- matrix-sdk/src/main/res/values-fi/strings.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/matrix-sdk/src/main/res/values-fi/strings.xml b/matrix-sdk/src/main/res/values-fi/strings.xml index 1cfc49938..b33180506 100644 --- a/matrix-sdk/src/main/res/values-fi/strings.xml +++ b/matrix-sdk/src/main/res/values-fi/strings.xml @@ -22,7 +22,7 @@ %s soitti äänipuhelun. %s vastasi puheluun. %s lopetti puhelun. - %1$s muutti tulevan huonehistorian näkyväksi käyttäjälle %2$s + %1$s muutti tulevan huonehistorian näkyväksi seuraaville: %2$s kaikki huoneen jäsenet, kutsumisestaan asti. kaikki huoneen jäsenet, liittymisestään asti. kaikki huoneen jäsenet. @@ -34,7 +34,7 @@ VoIP-konferenssi alkoi VoIP-konferenssi päättyi - (myös profiilikuva vaihdettiin) + (myös kuva vaihdettiin) %1$s poisti huoneen nimen %1$s poisti huoneen aiheen %1$s päivitti profiilinsa %2$s @@ -173,4 +173,5 @@ Lähetetään viestiä… Tyhjennä lähetysjono - +%1$s veti takaisin käyttäjän %2$s liittymiskutsun huoneeseen + From 8b87e5516e17dab32704d4620990d65fca663487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Tue, 8 Oct 2019 05:09:28 +0000 Subject: [PATCH 14/18] Translated using Weblate (French) Currently translated at 100.0% (140 of 140 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/res/values-fr/strings.xml b/matrix-sdk/src/main/res/values-fr/strings.xml index 9541555d7..958dd2c94 100644 --- a/matrix-sdk/src/main/res/values-fr/strings.xml +++ b/matrix-sdk/src/main/res/values-fr/strings.xml @@ -172,4 +172,5 @@ Envoi du message… Vider la file d’envoi - +%1$s a révoqué l’invitation pour %2$s à rejoindre le salon + From 4b74aa32cf99f6f6397983c2120626051c3a1f23 Mon Sep 17 00:00:00 2001 From: jadiof Date: Mon, 7 Oct 2019 22:35:43 +0000 Subject: [PATCH 15/18] Translated using Weblate (German) Currently translated at 100.0% (140 of 140 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/res/values-de/strings.xml b/matrix-sdk/src/main/res/values-de/strings.xml index f0419de83..6624743ad 100644 --- a/matrix-sdk/src/main/res/values-de/strings.xml +++ b/matrix-sdk/src/main/res/values-de/strings.xml @@ -175,4 +175,5 @@ Erste Synchronisation: Importiere Gemeinschaften Erste Synchronisation: Importiere Benutzerdaten - +%1$s hat die Einladung an %2$s, den Raum zu betreten, zurückgezogen + From 050ed8fc58284a5328602ee158f97a2de7d543c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=ED=83=9C=EC=84=AD?= Date: Tue, 8 Oct 2019 12:45:46 +0000 Subject: [PATCH 16/18] Translated using Weblate (Korean) Currently translated at 100.0% (140 of 140 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/ko/ --- matrix-sdk/src/main/res/values-ko/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk/src/main/res/values-ko/strings.xml b/matrix-sdk/src/main/res/values-ko/strings.xml index 13da39732..7fd4f782e 100644 --- a/matrix-sdk/src/main/res/values-ko/strings.xml +++ b/matrix-sdk/src/main/res/values-ko/strings.xml @@ -52,7 +52,7 @@ ** 암호를 해독할 수 없음: %s ** 발신인의 기기에서 이 메시지의 키를 보내지 않았습니다. - 질문한 사람 + 관련 대화 검열할 수 없습니다 메시지를 보낼 수 없습니다 From 6adc646b991f7af78db073ce6891427532728818 Mon Sep 17 00:00:00 2001 From: Nathan Follens Date: Tue, 8 Oct 2019 10:50:37 +0000 Subject: [PATCH 17/18] Translated using Weblate (West Flemish) Currently translated at 100.0% (140 of 140 strings) Translation: Riot Android/matrix-android-sdk Translate-URL: https://translate.riot.im/projects/riot-android/matrix-android-sdk/vls/ --- matrix-sdk/src/main/res/values-vls/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/matrix-sdk/src/main/res/values-vls/strings.xml b/matrix-sdk/src/main/res/values-vls/strings.xml index eb533e15a..7aece56ae 100644 --- a/matrix-sdk/src/main/res/values-vls/strings.xml +++ b/matrix-sdk/src/main/res/values-vls/strings.xml @@ -44,7 +44,7 @@ Bericht verwyderd [reden: %1$s] Bericht verwyderd deur %1$s [reden: %2$s] %1$s èt zyn/heur profiel %2$s bygewerkt - %1$s èt een uutnodigienge noa %2$s gesteurd vo ’t gesprek toe te treden + %1$s èt een uutnodigienge noa %2$s gesteurd vo ’t gesprek toe te treedn %1$s èt d’uutnodigienge vo %2$s anveird ** Kun nie ountsleuteln: %s ** @@ -172,4 +172,5 @@ Bericht wor verstuurd… Uutgoande wachtreeke leegn - +%1$s èt d’uutnodigienge vo %2$s vo ’t gesprek toe te treedn ingetrokkn + From 7ae9bd627d025b30d5590fbbf03afc03a3fc5230 Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 9 Oct 2019 15:48:03 +0200 Subject: [PATCH 18/18] Prepare release --- CHANGES.rst | 21 ++------------------- matrix-sdk/build.gradle | 2 +- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 30ea859ed..7bb5e375c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,29 +1,12 @@ -Changes to Matrix Android SDK in 0.9.30 (2019-XX-XX) +Changes to Matrix Android SDK in 0.9.30 (2019-10-09) ======================================================= -Features: - - - -Improvements: - - - Bugfix: - App won't start with some custom HS config #499 -API Change: - - - Translations: - - + - Updated translations -Others: - - - -Build: - - - -Test: - - Changes to Matrix Android SDK in 0.9.29 (2019-10-04) ======================================================= diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle index 04695922b..187e35472 100644 --- a/matrix-sdk/build.gradle +++ b/matrix-sdk/build.gradle @@ -28,7 +28,7 @@ android { minSdkVersion 16 targetSdkVersion 28 versionCode 930 - versionName "0.9.30-dev" + versionName "0.9.30" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // Enable multi dex for test