mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 20:06:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
19456 commits 161 branches 158 tags 270 MiB
Commit graph

459 commits

Author SHA1 Message Date
Priit Jõerüüt
6bb0e68e78 Translated using Weblate (Estonian) 
Currently translated at 99.6% (2378 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-09-17 19:32:46 +00:00
Benoit Marty
518ec738f3 Reduce level API check, this seems not necessary. 2022-09-16 23:00:39 +02:00
Benoit Marty
e17f009566 Reduce level API check, this seems not necessary. 2022-09-16 23:00:39 +02:00
Benoit Marty
536b9cf926 Move @Suppress("DEPRECATION") closer to the deprecated usage. Will help to detect other deprecated API usage. 2022-09-16 23:00:39 +02:00
Adam Brown
9a298a6e3e
Merge pull request #7157 from vector-im/feature/adm/cache-misses 
Fix build cache misses
 2022-09-16 17:19:49 +01:00
Adam Brown
739a513f89 moving external library modules to an external directory 2022-09-16 15:15:32 +01:00
Adam Brown
e83fa9c81f removing dialpad reliance on the legacy support library 2022-09-16 15:15:32 +01:00
Adam Brown
abd70d953b disabling lint for the pulled in module 2022-09-16 15:15:32 +01:00
Adam Brown
5058f942af manually including the im.dlg:android-dialer:1.2.5 
- avoids using appcompat
- avoids using an artifact without a source repository
 2022-09-16 15:15:32 +01:00
Adam Brown
bbdac9d1ba fix build cache misses 
- forcing the stem string template generator to be cachable, without this the templates are regenerated causing the vector module to recompile its sources (our slowest task!)
 2022-09-16 14:57:11 +01:00
Onuray Sahin
61f5f81305 Merge branch 'develop' into feature/ons/device_manager_filter 
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_settings_devices.xml
 2022-09-16 15:25:09 +03:00
Adam Brown
1d8b4ce63b excluding support annotations from jsonviewer module dependency 2022-09-16 11:37:39 +01:00
Onuray Sahin
e3ee59f6c1 Refactor naming of strings. 2022-09-15 15:34:59 +03:00
Onuray Sahin
81cc8ab98b Code review fixes. 2022-09-15 15:14:46 +03:00
Benoit Marty
8623b85ac8 Add support to /devtools command 2022-09-14 17:49:55 +02:00
Maxime NATUREL
fb3fdf097c Reusing some existing strings 2022-09-14 10:31:22 +02:00
Maxime NATUREL
bf88c16c9d Show basic details info 2022-09-14 10:31:21 +02:00
Maxime NATUREL
a661f9c3fb Navigation from session overview to session details 2022-09-14 10:31:21 +02:00
Maxime NATUREL
4a89fcea14 Adding basic structure for the new screen 2022-09-14 10:31:21 +02:00
Onuray Sahin
2763ebdd5a Merge branch 'develop' into feature/ons/device_manager_filter 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
 2022-09-13 17:20:44 +03:00
Onuray Sahin
0ec67c1ab8 Implement clear filter. 2022-09-13 13:10:03 +03:00
Jeff Huang
44b6563376 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2022-09-11 09:33:11 +00:00
Ihor Hordiichuk
aa4e830cb5 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-09-11 09:33:10 +00:00
Jozef Gaal
84eb71d63f Translated using Weblate (Slovak) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-09-11 09:33:08 +00:00
lvre
05483d9ca0 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-09-11 09:33:06 +00:00
Philip Goto
4b980e85f4 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2022-09-11 09:33:05 +00:00
random
2f94162236 Translated using Weblate (Italian) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2022-09-11 09:33:02 +00:00
Linerly
596f2d993d Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-09-11 09:33:00 +00:00
Szimszon
7645992cf1 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2382 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-09-11 09:32:58 +00:00
Danial Behzadi
c858d31761 Translated using Weblate (Persian) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2022-09-11 09:32:57 +00:00
Priit Jõerüüt
fd76bdfa4d Translated using Weblate (Estonian) 
Currently translated at 98.7% (2355 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-09-11 09:32:55 +00:00
Deleted User
118fc2ffc1 Translated using Weblate (Spanish) 
Currently translated at 97.3% (2322 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-09-11 09:32:54 +00:00
Vri
904c4e44b2 Translated using Weblate (German) 
Currently translated at 98.9% (2362 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-09-11 09:32:47 +00:00
waclaw66
f53cdbb167 Translated using Weblate (Czech) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-09-11 09:32:46 +00:00
Auri B. P
2f6f52c25a Translated using Weblate (Catalan) 
Currently translated at 100.0% (2386 of 2386 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-09-11 09:32:45 +00:00
Onuray Sahin
41ca662dcc Update device list according to the filter type. 2022-09-08 18:28:17 +03:00
Benoit Marty
de17c47a7d
Merge pull request #7038 from vector-im/feature/eric/new-layout-labs 
New Layout - Labs Flag (to replace feature flag)
 2022-09-08 14:35:38 +02:00
Maxime NATUREL
6c2bf35d60
Merge pull request #7005 from vector-im/feature/mna/session-overview-screen 
[Devices Management] Session overview screen (PSG-691, PSG-693)
 2022-09-08 09:18:31 +02:00
Benoit Marty
418a48de18 Deleting translations of 2 strings. They will have to be translated again due to the addition of %s in the original strings. 2022-09-07 18:24:13 +02:00
Onuray Sahin
8dcbd3710d Merge branch 'feature/mna/session-overview-screen' into feature/ons/device_manager_filter 
* feature/mna/session-overview-screen: (57 commits)
  Fix missing mapper in CryptoStoreHelper for tests
  Fix unused string warning
  Update unit tests
  Rendering inactive status in SessionInfoView
  Adding comment with examples of some parametrized strings
  Fix post rebase
  Fixing wrong copyright title
  Adding last seen details + fix observation of wrong deviceId in ViewModel
  Adding learn more link in verification status details
  Unit tests for computing trust level of device
  Unit tests for GetCurrentSessionCrossSigningInfoUseCase
  Updating existing unit tests
  Navigation from other session item
  Show info in overview screen
  Renaming CurrentSessionView into SessionInfoView to be more generic
  Introducing some reusable usecases
  Adding unit tests for viewModel
  Adding unit tests for mapper
  Adding unit tests for the new use case
  Adding use case to get full device info for a given device id
  ...

# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigator.kt
 2022-09-07 16:33:35 +03:00
Weblate
d1776a04c0 Merge branch 'origin/develop' into Weblate. 2022-09-07 12:12:04 +00:00
Przemysław Romanik
36ba1c5491 Translated using Weblate (Polish) 
Currently translated at 99.8% (2358 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-09-07 12:11:54 +00:00
ericdecanini
64c8789ef2 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 10:35:44 +02:00
Maxime NATUREL
682905df25 Fix unused string warning 2022-09-07 09:32:48 +02:00
Maxime NATUREL
6e9b2baf6f Rendering inactive status in SessionInfoView 2022-09-07 09:32:48 +02:00
Maxime NATUREL
0b105e2a7a Adding comment with examples of some parametrized strings 2022-09-07 09:32:48 +02:00
Maxime NATUREL
1ad585e154 Adding last seen details + fix observation of wrong deviceId in ViewModel 2022-09-07 09:32:47 +02:00
Maxime NATUREL
f4865df50c Show info in overview screen 2022-09-07 09:32:47 +02:00
Maxime NATUREL
ebf707dca9 Navigation from current session 2022-09-07 09:32:45 +02:00
Maxime NATUREL
969663786b Renaming header list view to be consistent 2022-09-07 09:32:09 +02:00
Onuray Sahin
604b7dafbd Create other sessions fragment. 2022-09-06 17:09:07 +03:00
ericdecanini
593a04ea25 Adds missing space list header 2022-09-06 15:41:30 +02:00
ericdecanini
31a3552e26 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2022-09-06 15:32:00 +02:00
Onuray Sahin
5485b9a530 Implement device manager filter bottom sheet. 2022-09-06 15:56:50 +03:00
Benoit Marty
1c35e5ae9c
Merge pull request #6986 from vector-im/feature/nfe/invites_empty_state 
empty state for new invites screen
 2022-09-06 14:56:06 +02:00
Onuray Sahin
83990b6a0b Add string resources. 2022-09-06 14:48:39 +03:00
phardyle
250633ec67 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.7% (2356 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-09-06 11:32:54 +00:00
Anonimas
fea0c27bdd Translated using Weblate (Lithuanian) 
Currently translated at 25.0% (592 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lt/
 2022-09-06 11:32:53 +00:00
waclaw66
59f8753c6a Translated using Weblate (Czech) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2022-09-06 11:32:43 +00:00
ericdecanini
24509543b9 Replaces feature flag with labs flag 2022-09-06 12:48:03 +02:00
Nikita Fedrunov
7cc7444bd5
applayout release experience (#7003) 2022-09-06 11:32:11 +02:00
ericdecanini
05f7850a01 Adds space name to expand / collapse chevron content description in space bottom sheet 2022-09-05 20:28:11 +02:00
Nikita Fedrunov
efe5eb0501
App layout Home screen empty states (#7007) 2022-09-05 18:11:25 +02:00
Nikita Fedrunov
b37996e4c3
space switcher empty spaces (#6988) 2022-09-05 16:11:50 +02:00
NIkita Fedrunov
8314eb71c0 Merge branch 'develop' into feature/nfe/invites_empty_state 2022-09-05 12:32:01 +02:00
Maxime NATUREL
eb59a534e0 Fix unused string warning 2022-09-05 10:54:38 +02:00
Maxime NATUREL
af484813b5 Rendering inactive status in SessionInfoView 2022-09-05 09:40:02 +02:00
Maxime NATUREL
1c501a0083 Adding comment with examples of some parametrized strings 2022-09-05 09:19:14 +02:00
Maxime NATUREL
bbe238e9c6 Adding last seen details + fix observation of wrong deviceId in ViewModel 2022-09-05 09:13:13 +02:00
Maxime NATUREL
b626a1e4f9 Show info in overview screen 2022-09-05 09:13:12 +02:00
Maxime NATUREL
ba1549048d Navigation from current session 2022-09-05 09:13:12 +02:00
Maxime NATUREL
ed3bd871ea Renaming header list view to be consistent 2022-09-05 09:13:12 +02:00
Jozef Gaal
511c6a2ae1 Translated using Weblate (Slovak) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-09-04 14:32:50 +00:00
lvre
a147d8623b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-09-04 14:32:49 +00:00
random
34a424678d Translated using Weblate (Italian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2022-09-04 14:32:48 +00:00
Linerly
b13546b096 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-09-04 14:32:47 +00:00
Emese Tóth
db29ebb93d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-09-04 14:32:46 +00:00
Glandos
287e890f60 Translated using Weblate (French) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-09-04 14:32:43 +00:00
Danial Behzadi
c3bac2f0cf Translated using Weblate (Persian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2022-09-04 14:32:42 +00:00
Vri
054802c02b Translated using Weblate (German) 
Currently translated at 99.3% (2346 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-09-04 14:32:41 +00:00
Maxime NATUREL
5791a4d3cd Using plurals when needed 2022-09-02 15:00:53 +02:00
Onuray Sahin
8d378408c5 Code review fixes. 2022-09-02 14:28:28 +02:00
Onuray Sahin
ed1244aa8f Fix description of inactive sessions. 2022-09-02 14:28:27 +02:00
Onuray Sahin
e6c9409156 Create generic security recommendations view. 2022-09-02 14:28:01 +02:00
Onuray Sahin
7e8bbda856 Create security recommendations view layout. 2022-09-02 14:28:01 +02:00
Onuray Sahin
55d0a06fc1 Create security recommendations section header. 2022-09-02 14:27:59 +02:00
Jeff Huang
e0e9fbc820 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2022-09-02 08:38:01 +00:00
phardyle
ec260fac16 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.7% (2356 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-09-02 08:38:00 +00:00
Ihor Hordiichuk
cad23d1477 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2022-09-02 08:37:59 +00:00
Priit Jõerüüt
578ff6bd44 Translated using Weblate (Estonian) 
Currently translated at 99.6% (2353 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2022-09-02 08:37:57 +00:00
Auri B. P
8535e30937 Translated using Weblate (Catalan) 
Currently translated at 100.0% (2361 of 2361 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-09-02 08:37:56 +00:00
Adam Brown
22ce829645 moving all the strings to a dedicated libray/strings module 2022-09-01 14:58:07 +01:00
Onuray Sahin
6c65b0a9e0
Merge pull request #6807 from vector-im/feature/mna/device-management-header-list 
[Devices Management] Header view for sessions lists in new layout (PSG-668)
 2022-08-15 23:09:53 +03:00
Nikita Fedrunov
e0e21d4282
filtered room list at home (#6724) 2022-08-11 16:26:24 +02:00
Maxime NATUREL
8f218ce773 Custom header view without "Learn more" 2022-08-11 12:11:14 +02:00
ericdecanini
1bf36dce92 Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab 2022-08-05 17:11:00 +02:00
Maxime NATUREL
6972622bc6 Handling map loading error in timeline 2022-08-04 16:58:28 +02:00
Eric Decanini
e2ed4b4ae1
Merge pull request #6655 from vector-im/feature/eric/app-layout-toolbar 
New App Layout Toolbar
 2022-08-02 17:44:53 +02:00
Maxime NATUREL
c616229d53 Missing renaming of stylable file 2022-08-02 09:09:19 +02:00
Maxime NATUREL
be696f5a5c Align naming of components for the live location feature 2022-08-02 09:09:19 +02:00
ericdecanini
d49f104332 Adds fab buttons 2022-07-28 15:09:57 +02:00
ericdecanini
7334d909d5 Adds options menu 2022-07-26 16:00:46 +02:00
ericdecanini
5958559186 Styles collapsed title text 2022-07-26 14:31:02 +02:00
ericdecanini
3df337fa07 Adds new layout toolbar 2022-07-26 12:38:29 +02:00
Maxime NATUREL
e1ea10e0a2 Adding attribute to set the start margin of icon 2022-07-25 14:17:07 +02:00
Maxime NATUREL
5e59eb474a Adding attribute to control alpha of the banner background 2022-07-25 10:36:28 +02:00
Maxime NATUREL
6b403ec224
Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text 
[Location Share] - Standardise "Stop" texts for live (PSG-622)
 2022-07-18 10:43:43 +02:00
Nikita Fedrunov
79762d9133
font scale setting screen (#6453) 2022-07-18 09:49:57 +02:00
Maxime NATUREL
cda100e596 Using same string key for stop + fix insets in button styles 2022-07-18 09:43:33 +02:00
Benoit Marty
e3b3617b1a Add dependency to opusencoder and remove module from this project 2022-07-06 17:54:57 +02:00
Benoit Marty
7616912411
Merge pull request #6436 from vector-im/feature/bma/activity_fragment_1_5_0 
Upgrade androidx activity and fragment to 1.5.0
 2022-07-06 11:44:22 +02:00
Cadence Ember
b8734a23a9 Gallery picker can pick external images 2022-07-04 16:42:43 +12:00
Benoit Marty
aae6e20f9c Migration to activity 1.5.0. Rework menu management 2022-07-01 17:06:02 +02:00
Adam Brown
72c4af0026
Merge pull request #6263 from vector-im/feature/adm/ftue-forgot-password 
[FTUE] Forgot password
 2022-06-30 15:40:09 +01:00
Adam Brown
c603b780cf extracting common breaker background selection to ftue extensions 2022-06-29 17:47:28 +01:00
Adam Brown
d2fbe26182 removing no longer needed butterknife dependency 2022-06-29 17:22:57 +01:00
Adam Brown
33ca5753f1 replacing epoxy item annotation layout references with getDefaultLayoutId override 2022-06-29 17:21:05 +01:00
Benoit Marty
29d4916a2e
Cleanup of #5187 (#6326) 
Update design and behaviour on widget permission bottom sheet
 2022-06-22 15:04:02 +02:00
Jorge Martín
b5aedd4626 Re-implement lock screen feature using our own implementation. 2022-06-20 17:38:05 +02:00
Jorge Martín
2fbec133b6 Address review comments, fix quality check issues. 2022-06-15 11:34:23 +02:00
Jorge Martín
155842f8bc Add some doc comments 2022-06-15 11:34:23 +02:00
Jorge Martín
fa2d9e90ed Fix copyright in C++ files 2022-06-15 11:34:23 +02:00
Jorge Martín
6fc278eb2b Replace ffmpeg-kit with libopus and libopusenc. 2022-06-15 11:34:23 +02:00
Benoit Marty
990a6832bd
Merge pull request #6247 from vector-im/feature/ons/fix_static_map_copyright_size 
Fix copyright attributions of map views [PSF-1058] - [PSF-1072]
 2022-06-10 13:56:24 +02:00
Onuray Sahin
b455bf04aa Create new styles for map view copyright text. 2022-06-07 15:07:41 +03:00
ericdecanini
5cc7deea4e Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
#	vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
#	vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
#	vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
#	vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationShareMessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
#	vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
 2022-06-03 12:06:23 +02:00
ericdecanini
e6e05317e1 Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
 2022-05-31 14:21:16 +02:00
Onuray Sahin
4ccd242cbf
Merge pull request #6170 from vector-im/feature/ons/live_location_bottom_sheet 
Live Location Sharing - User List Bottom Sheet [PSF-890]
 2022-05-30 21:07:25 +03:00
Onuray Sahin
453aa28380 Add required resources. 2022-05-27 15:25:59 +03:00
Olivér Falvai
9ce9ad6d3a Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-26 14:04:39 +02:00
ericdecanini
8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
 2022-05-25 17:35:31 +02:00
Benoit Marty
fd252dbaff
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale 
Use fixed text size in read receipt counter
 2022-05-23 13:41:03 +02:00
ericdecanini
b3fdb5ed17 Changes code style when arrow alignment 2022-05-23 12:57:57 +02:00
ericdecanini
3f3662e605 Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
Adam Brown
8a53eafa72 adding gradient background to the waiting for verification screen, matching designs 
- renames drawable which redirects to the attribute colorBackground
 2022-05-20 12:11:44 +01:00
Olivér Falvai
f036d35829 Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
Benoit Marty
38641c88b7 Fix usage of System.currentTimeMillis(). 
This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
 2022-05-18 20:51:41 +02:00
Benoit Marty
12644e9915
Merge pull request #5947 from vector-im/feature/bma/renaming 
Small changes
 2022-05-18 16:27:48 +02:00
Maxime NATUREL
738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view 
[Location sharing] - Message for live sharing in timeline (PSF-884)
 2022-05-18 15:39:51 +02:00
Olivér Falvai
388e35e828 Remove even more deps 2022-05-18 14:19:11 +02:00
Olivér Falvai
2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup 
# Conflicts:
#	build.gradle
#	dependencies.gradle
 2022-05-18 11:47:21 +02:00
Benoit Marty
57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing 
Feature/bma/fix typing
 2022-05-17 15:34:15 +02:00
Benoit Marty
2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00
ariskotsomitopoulos
324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-05-17 11:55:07 +03:00
Benoit Marty
afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view 2022-05-16 14:42:38 +02:00
Benoit Marty
12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period 2022-05-16 13:14:37 +02:00
ariskotsomitopoulos
72a945ac13 PR remarks 2022-05-16 13:32:30 +03:00
Benoit Marty
90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away 
add presence indicator busy and away
 2022-05-16 11:26:11 +02:00
Benoit Marty
4c95aafe10 Detekt: enable and fix EndOfSentenceFormat 2022-05-16 08:54:07 +02:00
chagai95
9f033ed623
add presence indicator busy and away 2022-05-13 13:55:10 +02:00