Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/fga/voip transfer init #2573

Closed
wants to merge 213 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
213 commits
Select commit Hold shift + click to select a range
217c88f
Translated using Weblate (Czech)
zeritti Nov 28, 2020
f7f7e80
Translated using Weblate (Estonian)
Nov 28, 2020
493cd2a
Translated using Weblate (French)
sblondon Nov 27, 2020
9531a38
Translated using Weblate (Portuguese (Brazil))
Nov 27, 2020
422c681
Translated using Weblate (Russian)
krikra01 Nov 27, 2020
a5079f5
Translated using Weblate (Albanian)
ujdhesa Nov 27, 2020
88e05ff
Translated using Weblate (Estonian)
Nov 27, 2020
eb17463
Translated using Weblate (French)
sblondon Nov 27, 2020
dd50399
Translated using Weblate (Portuguese (Brazil))
Nov 27, 2020
431f5d7
Translated using Weblate (Albanian)
ujdhesa Nov 27, 2020
f14b390
Translated using Weblate (Portuguese (Brazil))
Nov 27, 2020
f6cc056
Send task: small rework and cleanup
bmarty Nov 27, 2020
cd983de
Fix cancellation of sending event (#2438)
bmarty Nov 30, 2020
7bd8d54
Translated using Weblate (Persian)
danialbehzadi Nov 30, 2020
b53ba2b
Translated using Weblate (Japanese)
Nov 30, 2020
e42906f
Translated using Weblate (Russian)
Nov 30, 2020
6236b01
Translated using Weblate (Chinese (Simplified))
HolgerHuo Nov 30, 2020
1c3a279
Translated using Weblate (Chinese (Simplified))
Nov 30, 2020
3b21400
Translated using Weblate (Chinese (Traditional))
s8321414 Nov 30, 2020
6d0f9ba
Translated using Weblate (Russian)
Nov 30, 2020
0886080
Translated using Weblate (Chinese (Traditional))
s8321414 Nov 30, 2020
3133935
Translated using Weblate (Ukrainian)
strixaluco Nov 30, 2020
04914be
Translated using Weblate (Chinese (Traditional))
s8321414 Nov 30, 2020
cafe86e
Rework: create a MediaModule
bmarty Dec 3, 2020
e5cbf9e
Translated using Weblate (Persian)
Dec 3, 2020
3e563a3
Rework: Make RawCacheStrategy class more generic, to use it for other…
bmarty Dec 3, 2020
0c03718
Create a MediaService to handle UrlPreview request - WIP
bmarty Dec 3, 2020
8a35bfc
Rework: rename files using the interface name and not the implementat…
bmarty Dec 3, 2020
a6724b5
EventTypeFilter implementation to allow hiding member events.
Dec 3, 2020
32b7cc6
Changelog added.
Dec 3, 2020
1109d9f
PreviewUrl create DB object and handle migration
bmarty Dec 3, 2020
f9ccb0e
Translated using Weblate (Spanish)
bmarty Dec 2, 2020
ec60d7d
Translated using Weblate (Persian)
Dec 3, 2020
83df430
Translated using Weblate (Dutch)
quidje Dec 2, 2020
1933fc9
Translated using Weblate (Polish)
Keij0 Dec 2, 2020
5faaabf
Translated using Weblate (Swedish)
LinAGKar Dec 2, 2020
167144b
Translated using Weblate (Persian)
Dec 3, 2020
bd926fa
Translated using Weblate (Swedish)
LinAGKar Dec 2, 2020
bd5ac51
PreviewUrl: create the task and the service
bmarty Dec 3, 2020
dd150c6
Remove unnecessary non-null assertion
bmarty Dec 3, 2020
be20f9b
PreviewUrl: extract url from Content
bmarty Dec 3, 2020
a36d568
Create extension for androidx.collection.LruCache
bmarty Dec 3, 2020
fcd9fe7
PreviewUrl: layout for a single PreviewUrl
bmarty Dec 3, 2020
48354c7
PreviewUrl: Application part - WIP
bmarty Dec 4, 2020
fa7b0a2
PreviewUrl: Application part - bugfix
bmarty Dec 4, 2020
1161dcb
PreviewUrl: protocol is mandatory (exclude rstp://)
bmarty Dec 4, 2020
770041e
PreviewUrl: setting and e2e room
bmarty Dec 4, 2020
19315fc
PreviewUrl: handle click
bmarty Dec 4, 2020
679d9ba
Fix bad image rendering
bmarty Dec 4, 2020
9089c54
Ripple effect
bmarty Dec 4, 2020
c08c652
PreviewUrl: handle close (in memory)
bmarty Dec 4, 2020
2a19726
Cleanup and changelog
bmarty Dec 4, 2020
5d3682c
More cleanup
bmarty Dec 4, 2020
c2c9e37
PreviewUrl: fix layout issue and add more tests
bmarty Dec 4, 2020
78fe7e5
No need to create a Set to remove an item from it
bmarty Dec 4, 2020
431ac5a
Fix layout issue
bmarty Dec 4, 2020
e14b507
Translated using Weblate (German)
a22sc Dec 3, 2020
b9d7333
Translated using Weblate (Persian)
Dec 3, 2020
dacb9cd
Translated using Weblate (Russian)
Dec 3, 2020
3e9cb98
Translated using Weblate (German)
a22sc Dec 3, 2020
9bbae82
Translated using Weblate (Persian)
Dec 6, 2020
19524ea
Translated using Weblate (Italian)
Dec 5, 2020
8bdf384
Translated using Weblate (Czech)
zeritti Dec 5, 2020
555bf1f
Translated using Weblate (Italian)
Dec 5, 2020
c603ec0
Format files
bmarty Dec 7, 2020
7869d73
Fix the rotate screen issue
bmarty Dec 7, 2020
5237eb0
Merge branch 'develop' into feature/bma/fix_cancel
bmarty Dec 7, 2020
c31d368
Merge pull request #2468 from vector-im/feature/bma/fix_cancel
bmarty Dec 7, 2020
c7efd1f
Convert StateService to suspend functions
aqulu Dec 8, 2020
f3bc39a
Cleanup
bmarty Dec 8, 2020
28bfea6
This code is for debug build (see the path), so no need to check again
bmarty Dec 8, 2020
a0c8a8e
Log HTTP requests and responses in production (level BASIC, i.e. with…
bmarty Dec 8, 2020
b43f3b3
Log some details about the request which has failed
bmarty Dec 8, 2020
dda2685
Upgrade Realm dependency to 10.1.2
bmarty Dec 8, 2020
416f57b
Fix failing test compilation
aqulu Dec 8, 2020
c889dea
Remove unused imports
aqulu Dec 8, 2020
19d421d
Remove coroutine context change for sendStateEvent
aqulu Dec 8, 2020
40b9f03
Remove explicit coroutine context changes
aqulu Dec 8, 2020
7152dea
Rename method
bmarty Dec 8, 2020
4d4fe68
Translated using Weblate (Finnish)
Dec 6, 2020
7667ef6
Translated using Weblate (French)
Lanxor Dec 6, 2020
9339b7e
Translated using Weblate (French)
Dec 6, 2020
682dff9
Translated using Weblate (Italian)
Dec 7, 2020
2d9043f
Translated using Weblate (Japanese)
Dec 7, 2020
6190fb3
Translated using Weblate (Italian)
Dec 7, 2020
24a9dda
FileService: remove useless FileService.DownloadMode
bmarty Dec 8, 2020
8e11ba2
Glide: No Disk cache for encrypted images
bmarty Dec 8, 2020
42ab7f1
Add space between image and text
bmarty Dec 8, 2020
237cb63
Small formatting
bmarty Dec 8, 2020
62791e4
Encrypted files: store decrypted file in a dedicated folder
bmarty Dec 8, 2020
7057b29
Improve FileService API: add facility methods to deal with MessageWit…
bmarty Dec 8, 2020
ed822be
Fix try-catch behavior of sendStateEvent actions
aqulu Dec 8, 2020
ca77961
DefaultFileService: better management of the files and the filenames
bmarty Dec 9, 2020
1c43f92
DefaultFileService: store just sent file
bmarty Dec 9, 2020
283e10d
Use filename if available
bmarty Dec 9, 2020
e4968c4
Doc and internal
bmarty Dec 9, 2020
0956bae
Delete unencrypted files each time the app is started
bmarty Dec 9, 2020
4bd538e
Changelog and update comment
bmarty Dec 9, 2020
75071cf
Cleanup
bmarty Dec 9, 2020
d54571d
Emoji library added with Google style.
Dec 9, 2020
3d975b7
Update composer icons.
Dec 9, 2020
a96cc19
Update composer layout by adding emoji icon.
Dec 9, 2020
e8862b3
Add emoji keyboard, remove profile picture from composer.
Dec 9, 2020
7ba1116
Translated using Weblate (German)
a22sc Dec 9, 2020
a19ca8a
Translated using Weblate (Finnish)
Dec 9, 2020
280d3f2
Translated using Weblate (Finnish)
Dec 9, 2020
c2fc9fe
Translated using Weblate (Finnish)
Dec 9, 2020
5186ee6
Translated using Weblate (Finnish)
Dec 9, 2020
08964d8
Fix emoji keyboard orientation bug.
Dec 10, 2020
a9f5ed3
Add emoji license.
Dec 10, 2020
4007982
Changelog added.
Dec 10, 2020
c1cb23d
Fix ripple effect of the send button.
Dec 10, 2020
e6949c8
Added translation using Weblate (Slovenian)
jadranpro Dec 10, 2020
752bde4
Fix copyright.
Dec 10, 2020
5e2f091
Remove useless parameter `id`
bmarty Dec 10, 2020
43ac66f
Merge pull request #2514 from vector-im/feature/ons/emoji_keyboard
bmarty Dec 10, 2020
3d578c1
Translated using Weblate (Persian)
Dec 9, 2020
c953550
Translated using Weblate (Russian)
Dec 10, 2020
3473a7e
Translated using Weblate (Russian)
Dec 10, 2020
4cb7754
Translated using Weblate (Slovenian)
jadranpro Dec 10, 2020
f2ba236
Merge branch 'develop' into feature/bma/fix_span
bmarty Dec 11, 2020
5541c2e
Merge pull request #2512 from vector-im/feature/bma/fix_span
bmarty Dec 11, 2020
91c86c1
Merge branch 'develop' into feature/bma/url_preview
bmarty Dec 11, 2020
38843f7
No need for WRITE_EXTERNAL permission to send attachment to the app (…
bmarty Dec 1, 2020
eb30b9f
Show preview when sending attachment from the keyboard (#2440)
bmarty Dec 1, 2020
4390294
Attachment preview also for Gif files
bmarty Dec 1, 2020
21271b6
Do not compress GIFs (#1616, #1254)
bmarty Dec 1, 2020
ca75eae
Create MimeTypes object
bmarty Dec 2, 2020
49cad8f
Rename files.
bmarty Dec 11, 2020
d996c77
Fix typo
bmarty Dec 11, 2020
705b617
Fix Layout issue (visible only on RTL) (#2523)
bmarty Dec 11, 2020
32fd3be
Better alignment of button and animation, bigger touch area for send …
bmarty Dec 11, 2020
8d30658
Bigger touch area for the other buttons
bmarty Dec 11, 2020
60aaa2a
Code review fixes.
Dec 11, 2020
9b0c2e4
Reorder Views (no other change)
bmarty Dec 11, 2020
ed9ae07
Merge pull request #2475 from vector-im/feature/bma/gif_from_keyboard…
bmarty Dec 11, 2020
68a5ba9
Merge pull request #2524 from vector-im/feature/bma/fix_rtl
bmarty Dec 11, 2020
bd9da8e
element:// support + basic peeking + fix join via server
BillCarsonFr Dec 11, 2020
544345b
Update change log
BillCarsonFr Dec 11, 2020
989f1c6
Merge branch 'develop' into feature/bma/url_preview
bmarty Dec 11, 2020
5203d15
Merge pull request #2490 from vector-im/feature/bma/url_preview
bmarty Dec 11, 2020
5461fd4
Some cleanup up
bmarty Dec 11, 2020
071611b
We are not supposed to fallback on alternative alias
bmarty Dec 11, 2020
5b74eb3
Merge branch 'develop' into feature/state_service_coroutines
bmarty Dec 11, 2020
d8a1939
Fix number of enum
BillCarsonFr Dec 11, 2020
3eba43f
Merge pull request #2500 from aqulu/feature/state_service_coroutines
bmarty Dec 11, 2020
8795513
VoIP: start introducing switch call WIP
ganfra Dec 11, 2020
1f6907f
QueueMemento : fix synchronized
ganfra Dec 11, 2020
9039363
Merge branch 'develop' into feature/bca/fix_mxto
bmarty Dec 11, 2020
163c05d
Merge pull request #2526 from vector-im/feature/bca/fix_mxto
bmarty Dec 11, 2020
a5094f9
Translated using Weblate (Ukrainian)
Dec 11, 2020
69cd0e3
Translated using Weblate (Ukrainian)
IhorHordiichuk Dec 13, 2020
6f4c307
Translated using Weblate (Ukrainian)
Dec 11, 2020
74283e7
Translated using Weblate (Ukrainian)
IhorHordiichuk Dec 13, 2020
45a0586
Translated using Weblate (Russian)
Dec 11, 2020
2bdb425
Translated using Weblate (Ukrainian)
IhorHordiichuk Dec 13, 2020
f83b478
Translated using Weblate (Ukrainian)
strixaluco Dec 13, 2020
b915c91
Translated using Weblate (Ukrainian)
IhorHordiichuk Dec 12, 2020
b321838
Merge branch 'develop' into feature/ons/fix_hide_state_events
onurays Dec 14, 2020
03428ea
Social Login
BillCarsonFr Dec 3, 2020
351793d
Fix / support sso_with_password flow when no providers
BillCarsonFr Dec 3, 2020
42d1bf5
Refactor + fix sso in LoginFragment
BillCarsonFr Dec 3, 2020
26c01d4
Code review + Completion layout res
BillCarsonFr Dec 4, 2020
0fd8641
Fix copyright + lint
BillCarsonFr Dec 7, 2020
23e0520
Social login: cleanup
bmarty Dec 14, 2020
bba2daf
Capital H for GitHub
bmarty Dec 14, 2020
b31dfcf
IdentityProvider -> SsoIdentityProvider
bmarty Dec 14, 2020
db0a958
Fix crash in Realm migration
bmarty Dec 14, 2020
924fac8
Move HomeServerHistoryService binding to AuthModule
bmarty Dec 14, 2020
cf59c7d
Cleanup
bmarty Dec 14, 2020
ae29cbd
Better name
bmarty Dec 14, 2020
eb72d0c
Revert formatting change
bmarty Dec 14, 2020
8022430
Remove useless override
bmarty Dec 14, 2020
f3578e2
Cleanup
bmarty Dec 14, 2020
776d769
Do not modify the DB in debug mode, and add to history only if valid
bmarty Dec 14, 2020
2f616cb
Add some constants
bmarty Dec 14, 2020
c8c4e10
Cleanup layout
bmarty Dec 14, 2020
5a69b33
Move style for social login to a dedicated file
bmarty Dec 14, 2020
09040b7
Clear history (#1933)
bmarty Dec 14, 2020
995ec25
Translated using Weblate (Albanian)
ujdhesa Dec 13, 2020
545e13c
Translated using Weblate (Ukrainian)
IhorHordiichuk Dec 13, 2020
6687a74
Translated using Weblate (Albanian)
ujdhesa Dec 13, 2020
3813f6d
Merge branch 'origin/develop' into Weblate.
weblate Dec 14, 2020
4f98031
Merge pull request #2536 from RiotTranslateBot/weblate-element-androi…
bmarty Dec 14, 2020
2d4eeb6
Translated using Weblate (French)
bmarty Dec 14, 2020
338650c
Merge pull request #2537 from RiotTranslateBot/weblate-element-androi…
bmarty Dec 14, 2020
211c158
Remove bad translation
bmarty Dec 14, 2020
a027ef2
Merge pull request #2484 from vector-im/feature/bca/social_login
bmarty Dec 14, 2020
7da8b13
Chat Effects
BillCarsonFr Dec 9, 2020
7172f4d
VoIP: add info on other call when switching
ganfra Dec 15, 2020
6957768
PR Review
bmarty Dec 15, 2020
487ef87
Add /snow command
bmarty Dec 15, 2020
b4b302c
Merge pull request #2535 from vector-im/feature/bca/confetti
bmarty Dec 15, 2020
7828e3f
Merge pull request #2485 from vector-im/feature/ons/fix_hide_state_ev…
bmarty Dec 15, 2020
88a4dfd
Ensure the message is understood as a debug indication (#2509)
bmarty Dec 11, 2020
6ddcd04
Import SAS strings
bmarty Dec 14, 2020
bb9a08d
/confetti /snow commands: send emote if text is blank (iso Element Web)
bmarty Dec 15, 2020
45225e8
Merge pull request #2539 from vector-im/feature/bma/cleanup
bmarty Dec 15, 2020
e230cd8
Prepare release 1.0.12
bmarty Dec 15, 2020
2927f1f
Merge branch 'release/1.0.12' into develop
bmarty Dec 15, 2020
6cdb192
Version++
bmarty Dec 15, 2020
4e23eb7
VoIP: add duration tracking
ganfra Dec 15, 2020
2fad4ab
VoIP: always use silent for pending call notification
ganfra Dec 15, 2020
5c0e2e2
VoIP: fix a bunch of issues
ganfra Dec 16, 2020
2ef7b57
Merge branch 'develop' into feature/fga/voip_switch_call
ganfra Dec 16, 2020
a584ef1
Platform: fix RoomSummaryHolder usage (temporary)
ganfra Dec 16, 2020
801f130
VoIP: fix some other issues
ganfra Dec 16, 2020
b8649fa
VoIP: clean code
ganfra Dec 17, 2020
acdece9
VoIP: start to handle call transfer in SDK
ganfra Dec 17, 2020
b45878b
VoIP: add call transfer method
Dec 17, 2020
1f87a98
VoIP: start adding UI for call transfer
Dec 17, 2020
f8bb390
VoIP: use UserListFragment to select someone for call transfer (+ cle…
ganfra Dec 18, 2020
9ff5a03
VoIP: clean code for call transfer and disable it for now
ganfra Dec 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .idea/dictionaries/bmarty.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 45 additions & 8 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,70 @@
Changes in Element 1.0.12 (2020-XX-XX)
Changes in Element 1.0.13 (2020-XX-XX)
===================================================

Features ✨:
-

Improvements 🙌:
-

Bugfix 🐛:
-

Translations 🗣:
-

SDK API changes ⚠️:
-

Build 🧱:
-

Test:
-

Other changes:
-

Changes in Element 1.0.12 (2020-12-15)
===================================================

Features ✨:
- Add room aliases management, and room directory visibility management in a dedicated screen (#1579, #2428)
- Room setting: update join rules and guest access (#2442)
- Url preview (#481)
- Store encrypted file in cache and cleanup decrypted file at each app start (#2512)
- Emoji Keyboard (#2520)
- Social login (#2452)
- Support for chat effects in timeline (confetti, snow) (#2535)

Improvements 🙌:
- Add Setting Item to Change PIN (#2462)
- Improve room history visibility setting UX (#1579)
- Matrix.to deeplink custom scheme support
- Homeserver history (#1933)

Bugfix 🐛:
- Fix cancellation of sending event (#2438)
- Double bottomsheet effect after verify with passphrase
- EditText cursor jumps to the start while typing fast (#2469)

Translations 🗣:
-
- UTD for events before invitation if member state events are hidden (#2486)
- No known servers error is given when joining rooms on new Gitter bridge (#2516)
- Show preview when sending attachment from the keyboard (#2440)
- Do not compress GIFs (#1616, #1254)

SDK API changes ⚠️:
-
- StateService now exposes suspendable function instead of using MatrixCallback.
- RawCacheStrategy has been moved and renamed to CacheStrategy
- FileService: remove useless FileService.DownloadMode

Build 🧱:
- Upgrade some dependencies and Kotlin version
- Use fragment-ktx and preference-ktx dependencies (fix lint issue KtxExtensionAvailable)

Test:
-
- Upgrade Realm dependency to 10.1.2

Other changes:
- Remove "Status.im" theme #2424
- Log HTTP requests and responses in production (level BASIC, i.e. without any private data)

Changes in Element 1.0.11 (2020-11-27)
===================================================
Expand Down
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ allprojects {
includeGroupByRegex 'com\\.github\\.chrisbanes'
// PFLockScreen-Android
includeGroupByRegex 'com\\.github\\.vector-im'

//Chat effects
includeGroupByRegex 'com\\.github\\.jetradarmobile'
includeGroupByRegex 'nl\\.dionsegijn'
}
}
maven {
Expand Down
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/40100120.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Main changes in this version: URL Preview, new Emoji keyboard, new room settings capabilities, and snow for Christmas!
Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.0.12
2 changes: 2 additions & 0 deletions fastlane/metadata/android/fi/changelogs/40100100.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Tämä versio sisältää virheenkorjauksia ja muita parannuksia. Viestien lähettäminen on nyt paljon nopeampaa.
Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.0.10
30 changes: 30 additions & 0 deletions fastlane/metadata/android/fi/full_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Element on uudenlainen viestinsovellus, joka:

1. Antaa sinun päättää yksityisyydestäsi.
2. Antaa sinun kommunikoida kenen tahansa kanssa Matrix-verkossa ja jopa sen ulkopuolella siltaamalla sovelluksiin, kuten Slack
3. Suojaa sinua mainonnalta, tietojen keräämiseltä ja suljetuilta alustoilta
4. Suojaa sinut päästä päähän -salauksella sekä ristiin varmentamisella muiden todentamiseksi

Element eroaa täysin muista viestintäsovelluksista, koska se on hajautettu ja avointa lähdekoodia.

Element antaa sinun isännöidä itse - valita isännän - jotta sinulla on yksityisyys ja voit hallita tietojasi sekä keskustelujasi. Se antaa sinulle pääsyn avoimeen verkkoon; joten et ole jumissa Elementin käyttäjissä.

Element pystyy tekemään kaiken tämän, koska se toimii Matrixilla - avoimella, hajautetun viestinnän standardilla.

Element antaa sinulle hallinnan antamalla sinun valita, kuka isännöi keskustelujasi. Element-sovelluksessa voit valita isännän eri tavoin:

1. Hanki ilmainen tili Matrix-kehittäjien ylläpitämällä matrix.org-palvelimella tai valitse tuhansista vapaaehtoisten ylläpitämistä julkisista palvelimista.
2. Isännöi tiliäsi itse suorittamalla palvelinta omalla laitteellasi
3. Luo tili mukautetulla palvelimella yksinkertaisesti tilaamalla Element Matrix Services -palvelu

<b>Miksi valita Element?</b>

<b>OMAT TIEDOT</b>: Sinä päätät, missä tietosi ja viestisi säilytetään. Hallitset sitä itse, eikä jokin MEGAYHTIÖ, joka tutkii tietojasi tai antaa niitä kolmansille osapuolille.

<b>AVOIN KOMMUNIKOINYI JA YHTEISTYÖ</b>: Voit keskustella kaikkien muiden Matrix-verkon käyttäjien kanssa, riippumatta siitä käyttävätkö he Elementiä tai muuta Matrix-sovellusta, ja vaikka he käyttäisivät eri viestijärjestelmiä, kuten Slack, IRC tai XMPP.

<b>ERITTÄIN TURVALLINEN</b>: Vahva päästä päähän -salaus (vain keskustelussa olevat voivat purkaa viestien salauksen), ja ristiin varmentaminen keskustelun osallistujien laitteiden tarkistamiseksi.

<b>TÄYDELLISTÄ VIESTINTÄÄ</b>: Viestit, ääni- ja videopuhelut, tiedostojen jakaminen, näytön jakaminen ja koko joukko integraatioita, botteja ja widgettejä. Rakenna huoneita, yhteisöjä, pidä yhteyttä ja tee asioita.

<b>MISSÄ TAHANSA OLETKIN</b>: Pidä yhteyttä missä tahansa, täysin synkronoidun viestihistorian kautta kaikilla laitteillasi ja verkossa osoitteessa https://app.element.io.
2 changes: 1 addition & 1 deletion fastlane/metadata/android/fi/short_description.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Turvallista, hajautettua keskustelua ja VoIP-puheluita. Pidä tietosi turvassa.
Turvallista, hajautettua, keskusteluja ja VoIP-puheluita. Pidä tietosi turvassa.
3 changes: 2 additions & 1 deletion fastlane/metadata/android/it/changelogs/40100100.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
// DA FARE
Questa nuova versione contiene soprattutto correzioni di errori e miglioramenti. L'invio di messaggi ora è molto più veloce.
Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.0.10
3 changes: 2 additions & 1 deletion fastlane/metadata/android/pt_BR/changelogs/40100100.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
// A FAZER
Esta nova versão contém principalmente correções de erros e melhorias. Enviar mensagens agora é muito mais rápido.
Registro de todas as alterações: https://github.com/vector-im/element-android/releases/tag/v1.0.10
3 changes: 2 additions & 1 deletion fastlane/metadata/android/sv/changelogs/40100100.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
// ATT GÖRA
Den här nya versionen innehåller mest buggfixar och förbättringar. Det går nu mycket snabbare att skicka meddelanden.
Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.10
2 changes: 2 additions & 0 deletions fastlane/metadata/android/uk/changelogs/40100100.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Ця версія містить переважно виправлення помилок та деякі покращення. Відправлення повідомлень стало тепер ще швидшим.
Повний перелік змін: https://github.com/vector-im/element-android/releases/tag/v1.0.10
2 changes: 1 addition & 1 deletion fastlane/metadata/android/uk/full_description.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Element — це застосунок для спілкування та спі

Element ґрунтовно відрізняється від інших застосунків для спілкування та співпраці тому що він є децентралізованим та відкритоджерельним.

Element дозволяє вам розміщувати сервер в себе або обирати будь-якого з надавачів послуг, таким чином забезпечуючи вам конфіденційність і можливість володіти власними даними й бесідами та контролювати їх. Він надає вам доступ до відкритої мережі, тож ви не є обмеженими спілкуванням виключно з користувачами Element. І він є дуже надійним та безпечним.
Element дозволяє вам розміщувати сервер в себе або обирати будь-якого з надавачів послуг, таким чином забезпечуючи вам конфіденційність і можливість володіти власними даними й бесідами та контролювати їх. Він надає вам доступ до відкритої мережі, тож ви не є обмеженими спілкуванням виключно з користувачами Element. І він є дуже надійним та безпечним.

Element здатен забезпечити усе це завдяки тому, що він заснований на протоколі Matrix — стандарті для відкритого та децентралізованого спілкування.

Expand Down
3 changes: 2 additions & 1 deletion fastlane/metadata/android/zh_Hant/changelogs/40100100.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
// 待辦事項
這個新版本主要包含錯誤修復與改善。傳送訊息更快了。
完整的變更紀錄請見:https://github.com/vector-im/element-android/releases/tag/v1.0.10
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ org.gradle.jvmargs=-Xmx2048m
org.gradle.vfs.watch=true

vector.debugPrivateData=false
vector.httpLogLevel=NONE
vector.httpLogLevel=BASIC

# Note: to debug, you can put and uncomment the following lines in the file ~/.gradle/gradle.properties to override the value above
#vector.debugPrivateData=true
Expand Down
1 change: 1 addition & 0 deletions matrix-sdk-android-rx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$kotlin_coroutines_version"

// Paging
implementation "androidx.paging:paging-runtime-ktx:2.1.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,27 @@
package org.matrix.android.sdk.rx

import android.net.Uri
import io.reactivex.Completable
import io.reactivex.Observable
import io.reactivex.Single
import kotlinx.coroutines.rx2.rxCompletable
import org.matrix.android.sdk.api.query.QueryStringValue
import org.matrix.android.sdk.api.session.events.model.Event
import org.matrix.android.sdk.api.session.identity.ThreePid
import org.matrix.android.sdk.api.session.room.Room
import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
import org.matrix.android.sdk.api.session.room.model.GuestAccess
import org.matrix.android.sdk.api.session.room.model.ReadReceipt
import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
import org.matrix.android.sdk.api.session.room.model.RoomSummary
import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
import org.matrix.android.sdk.api.session.room.send.UserDraft
import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
import org.matrix.android.sdk.api.util.Optional
import org.matrix.android.sdk.api.util.toOptional
import io.reactivex.Completable
import io.reactivex.Observable
import io.reactivex.Single
import org.matrix.android.sdk.api.session.room.model.GuestAccess
import org.matrix.android.sdk.api.session.room.model.RoomJoinRules

class RxRoom(private val room: Room) {

Expand Down Expand Up @@ -121,28 +122,28 @@ class RxRoom(private val room: Room) {
room.invite3pid(threePid, it)
}

fun updateTopic(topic: String): Completable = completableBuilder<Unit> {
room.updateTopic(topic, it)
fun updateTopic(topic: String): Completable = rxCompletable {
room.updateTopic(topic)
}

fun updateName(name: String): Completable = completableBuilder<Unit> {
room.updateName(name, it)
fun updateName(name: String): Completable = rxCompletable {
room.updateName(name)
}

fun updateHistoryReadability(readability: RoomHistoryVisibility): Completable = completableBuilder<Unit> {
room.updateHistoryReadability(readability, it)
fun updateHistoryReadability(readability: RoomHistoryVisibility): Completable = rxCompletable {
room.updateHistoryReadability(readability)
}

fun updateJoinRule(joinRules: RoomJoinRules?, guestAccess: GuestAccess?): Completable = completableBuilder<Unit> {
room.updateJoinRule(joinRules, guestAccess, it)
fun updateJoinRule(joinRules: RoomJoinRules?, guestAccess: GuestAccess?): Completable = rxCompletable {
room.updateJoinRule(joinRules, guestAccess)
}

fun updateAvatar(avatarUri: Uri, fileName: String): Completable = completableBuilder<Unit> {
room.updateAvatar(avatarUri, fileName, it)
fun updateAvatar(avatarUri: Uri, fileName: String): Completable = rxCompletable {
room.updateAvatar(avatarUri, fileName)
}

fun deleteAvatar(): Completable = completableBuilder<Unit> {
room.deleteAvatar(it)
fun deleteAvatar(): Completable = rxCompletable {
room.deleteAvatar()
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import org.matrix.android.sdk.api.util.toOptional
import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription

class RxSession(private val session: Session) {

Expand Down Expand Up @@ -139,7 +140,7 @@ class RxSession(private val session: Session) {
}

fun getRoomIdByAlias(roomAlias: String,
searchOnServer: Boolean): Single<Optional<String>> = singleBuilder {
searchOnServer: Boolean): Single<Optional<RoomAliasDescription>> = singleBuilder {
session.getRoomIdByAlias(roomAlias, searchOnServer, it)
}

Expand Down
4 changes: 2 additions & 2 deletions matrix-sdk-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
jcenter()
}
dependencies {
classpath "io.realm:realm-gradle-plugin:10.0.0"
classpath "io.realm:realm-gradle-plugin:10.1.2"
}
}

Expand Down Expand Up @@ -63,7 +63,7 @@ android {

release {
buildConfigField "boolean", "LOG_PRIVATE_DATA", "false"
buildConfigField "okhttp3.logging.HttpLoggingInterceptor.Level", "OKHTTP_LOGGING_LEVEL", "okhttp3.logging.HttpLoggingInterceptor.Level.NONE"
buildConfigField "okhttp3.logging.HttpLoggingInterceptor.Level", "OKHTTP_LOGGING_LEVEL", "okhttp3.logging.HttpLoggingInterceptor.Level.BASIC"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.work.WorkManager
import com.zhuinden.monarchy.Monarchy
import org.matrix.android.sdk.BuildConfig
import org.matrix.android.sdk.api.auth.AuthenticationService
import org.matrix.android.sdk.api.auth.HomeServerHistoryService
import org.matrix.android.sdk.api.legacy.LegacySessionImporter
import org.matrix.android.sdk.api.raw.RawService
import org.matrix.android.sdk.common.DaggerTestMatrixComponent
Expand All @@ -49,6 +50,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
@Inject internal lateinit var backgroundDetectionObserver: BackgroundDetectionObserver
@Inject internal lateinit var olmManager: OlmManager
@Inject internal lateinit var sessionManager: SessionManager
@Inject internal lateinit var homeServerHistoryService: HomeServerHistoryService

private val uiHandler = Handler(Looper.getMainLooper())

Expand All @@ -71,6 +73,8 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo

fun rawService() = rawService

fun homeServerHistoryService() = homeServerHistoryService

fun legacySessionImporter(): LegacySessionImporter {
return legacySessionImporter
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
package org.matrix.android.sdk.internal.crypto.encryption

import androidx.test.ext.junit.runners.AndroidJUnit4
import kotlinx.coroutines.runBlocking
import org.amshove.kluent.shouldBe
import org.junit.FixMethodOrder
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.MethodSorters
import org.matrix.android.sdk.InstrumentedTest
import org.matrix.android.sdk.api.NoOpMatrixCallback
import org.matrix.android.sdk.api.session.events.model.EventType
import org.matrix.android.sdk.api.session.events.model.toContent
import org.matrix.android.sdk.api.session.room.Room
Expand Down Expand Up @@ -57,13 +57,14 @@ class EncryptionTest : InstrumentedTest {
@Test
fun test_EncryptionStateEvent() {
performTest(roomShouldBeEncrypted = true) { room ->
// Send an encryption Event as a State Event
room.sendStateEvent(
eventType = EventType.STATE_ROOM_ENCRYPTION,
stateKey = null,
body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent(),
callback = NoOpMatrixCallback()
)
runBlocking {
// Send an encryption Event as a State Event
room.sendStateEvent(
eventType = EventType.STATE_ROOM_ENCRYPTION,
stateKey = null,
body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
)
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class KeysBackupTest : InstrumentedTest {
assertNotNull(decryption)
// - Check decryptKeyBackupData() returns stg
val sessionData = keysBackup
.decryptKeyBackupData(keyBackupData!!,
.decryptKeyBackupData(keyBackupData,
session.olmInboundGroupSession!!.sessionIdentifier(),
cryptoTestData.roomId,
decryption!!)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class KeysBackupTestHelper(
Assert.assertTrue(keysBackup.isEnabled)

stateObserver.stopAndCheckStates(null)
return PrepareKeysBackupDataResult(megolmBackupCreationInfo, keysVersion.version!!)
return PrepareKeysBackupDataResult(megolmBackupCreationInfo, keysVersion.version)
}

/**
Expand Down
Loading