mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 19:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
6441 commits 6 branches 120 tags 229 MiB
Commit graph

3940 commits

Author SHA1 Message Date
Hakim Oubouali
e3eccf48a3 Added translation using Weblate (Central Atlas Tamazight) 2020-10-31 07:37:35 +00:00
Benoit Marty
0bcf42dbb8 KeysBackup: some API parameters are mandatory, so stop considering them as optional and avoid using !! 
Also fix an issue with Json name: `hash` -> `etag`
Add some `internal` modifier (not as much as I would like to)
var -> val
Remove unused code
 2020-10-30 16:14:33 +01:00
Benoit Marty
0d8a845a21
Merge pull request #2324 from vector-im/feature/bma/search_highlight 
Feature/bma/search highlight
 2020-10-30 13:57:02 +01:00
Valere
1de1ddd496 Fix / bg sync for received by other session + dismiss full screen intent 2020-10-30 11:53:20 +01:00
Onuray Sahin
33a962b721 Start sync when receive m.call.invite. 2020-10-30 11:53:20 +01:00
Benoit Marty
4791eb85af
Merge pull request #2283 from vector-im/feature/bca/crypto_perf 
Crypto cleaning and perf improvement
 2020-10-30 11:11:34 +01:00
Benoit Marty
47a9074695 Cleanup 2020-10-30 10:59:11 +01:00
Onuray Sahin
8b7c2b3607 Remove hardcoded size. 2020-10-30 12:13:44 +03:00
Benoit Marty
78170b7052 Self-review 2020-10-30 09:44:47 +01:00
Benoit Marty
46e5d23f7e Fix refresh screen issue 2020-10-30 09:36:58 +01:00
Benoit Marty
316f26ec82 Search: Add "No more results" item (iso Element Web) 2020-10-30 09:33:13 +01:00
Benoit Marty
225a5d4e59 Search Result | scroll jumps after pagination (#2238) 2020-10-30 09:02:29 +01:00
Onuray Sahin
4f41d8b21b
Merge branch 'develop' into feature/ons/fix_emoji_dark_theme 2020-10-29 22:08:33 +03:00
Benoit Marty
5f99eb8c97 Highlight text in the body of the displayed result (#2200) 2020-10-29 19:22:40 +01:00
Benoit Marty
403e18c1b7 Search result: take new content for edited message 2020-10-29 17:30:25 +01:00
Benoit Marty
077bcb3f2a Export the key share trail in rageshake (opt-in) 2020-10-29 16:04:07 +01:00
Benoit Marty
e8dcdc7182 Format date in the exported trail 2020-10-29 15:00:47 +01:00
Valere
909ee2cc85 Fix / bad format of trail item 2020-10-29 14:57:17 +01:00
Onuray Sahin
04126fb0c6 Fix background color of reactions. 2020-10-29 16:44:08 +03:00
aWeinzierl
d46452c580 Translated using Weblate (German) 
Currently translated at 100.0% (1929 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-29 13:28:26 +00:00
@a2sc:matrix.org
18f87924ad Translated using Weblate (German) 
Currently translated at 100.0% (1929 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-29 13:28:25 +00:00
Benoit Marty
f48d4c021a Cleanup and split long lines 2020-10-29 14:10:41 +01:00
Valere
794a0bb14b Fix / bad ref to json in filename, it's txt 2020-10-29 12:55:26 +01:00
Valere
a1ed9bb377 Fix / missing new line in secret trail 2020-10-29 12:55:26 +01:00
Valere
c2027be0ee Fix audit freeze, add export, and buffer gossip saves 2020-10-29 12:55:26 +01:00
Valere
5a111af2fe Fix / add close to IncomingRequestManager 2020-10-29 12:55:26 +01:00
Valere
bb000f77f8 Offload self verif todevice off crypto thread 2020-10-29 12:55:26 +01:00
Benoit Marty
a393c4dfae Do not open again the DM if the user is already seeing it 2020-10-29 11:05:09 +01:00
Benoit Marty
d9723387eb We only need the roomId in many cases, so update the API 2020-10-29 11:00:01 +01:00
Benoit Marty
4433436416 Room member profile: Add action to create (or open) a DM (#2310) 2020-10-28 18:13:36 +01:00
Benoit Marty
802f4ea5d8 cleanup 2020-10-28 16:53:45 +01:00
Benoit Marty
fffc8addcf Ask for confirmation if the user quit the screen before creating the room 2020-10-28 15:38:14 +01:00
Benoit Marty
489bddec5b Delete temporary file once the room avatar is uploaded 2020-10-28 15:27:30 +01:00
Benoit Marty
f5e46df309 Delete temporary file if user change again the room avatar 2020-10-28 15:27:30 +01:00
Benoit Marty
4887f678c5 Delete temporary file if user cancel room setting change 2020-10-28 15:27:30 +01:00
Benoit Marty
be2c4597de Fix issue after rebase 2020-10-28 15:27:30 +01:00
Benoit Marty
cd56059a77 Fix a few details 2020-10-28 15:27:30 +01:00
Benoit Marty
03d925b5ab Use new way to start Activity with uCrop - other case 2020-10-28 15:27:30 +01:00
Benoit Marty
487e82df3f Cleanup 2020-10-28 15:27:30 +01:00
Benoit Marty
72bf2f9c1a Use new way to start Activity with uCrop 2020-10-28 15:27:30 +01:00
Benoit Marty
1555c06b21 Use colorProvider instead of context 2020-10-28 15:27:30 +01:00
Benoit Marty
7bebd6151e
Merge pull request #2308 from vector-im/feature/bma/wl 
Fix lint issue
 2020-10-28 15:27:01 +01:00
Benoit Marty
1e60d6f6e8
Merge pull request #2282 from vector-im/feature/bma/room_settings 
Feature/bma/room settings
 2020-10-28 13:54:08 +01:00
Benoit Marty
8091e224f7
Merge branch 'develop' into feature/bma/low_priority 2020-10-28 13:53:19 +01:00
Benoit Marty
e84eba23a1 Fix lint issue 2020-10-28 13:49:16 +01:00
Benoit Marty
042c8abac1 Kotlin optimization 2020-10-28 11:22:37 +01:00
Benoit Marty
5c62f29c6f Add a "discard change" warning 2020-10-28 11:22:37 +01:00
Benoit Marty
7a37db84d8 Room profile: BigImageViewerActivity now only display the image. Use the room setting to change or delete the room Avatar - fix bugs 2020-10-28 11:22:37 +01:00
Benoit Marty
b78dac20c0 Room profile: BigImageViewerActivity now only display the image. Use the room setting to change or delete the room Avatar 2020-10-28 11:22:37 +01:00
Weblate
de33f7b3f5 Merge branch 'origin/develop' into Weblate. 2020-10-28 10:09:29 +00:00
Benoit Marty
89fa345140 Revert "Fix issue in Greek resource (also fixed on Weblate)" 
This reverts commit c2a81c52
 2020-10-28 11:09:04 +01:00
Tirifto
555b9854ef Translated using Weblate (Esperanto) 
Currently translated at 99.1% (1902 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
 2020-10-28 10:06:06 +00:00
Tirifto
3ca9c769c6 Translated using Weblate (Esperanto) 
Currently translated at 98.3% (1886 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
 2020-10-27 19:50:13 +00:00
Slavi Pantaleev
4c03a2e98a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
 2020-10-27 19:49:56 +00:00
Graeme Power
013cc53cc0 Make edit image and remove image icons visible in attachments preview menu 
Signed-off-by: Graeme Power <gjpower@tcd.ie>
 2020-10-27 17:40:27 +01:00
Valere
0399677a01 Add preference to send with enter + keyboard support 2020-10-27 13:47:45 +01:00
Nikita Epifanov
c0c8c67228 Translated using Weblate (Russian) 
Currently translated at 99.7% (1914 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2020-10-26 11:51:04 +00:00
Tirifto
00a64bce45 Translated using Weblate (Esperanto) 
Currently translated at 81.5% (1564 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
 2020-10-26 11:51:03 +00:00
John
08f1dc7f9e Translated using Weblate (Greek) 
Currently translated at 16.1% (309 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/el/
 2020-10-26 11:50:01 +00:00
aWeinzierl
0a627e9d0f Translated using Weblate (German) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-26 11:49:59 +00:00
Slavi Pantaleev
ba9908e777 Translated using Weblate (Bulgarian) 
Currently translated at 95.2% (1826 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
 2020-10-26 11:49:59 +00:00
Corentin Noël
d86190404d Translated using Weblate (French) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-10-24 03:49:51 +00:00
Samu Voutilainen
d764540526 Translated using Weblate (Finnish) 
Currently translated at 81.0% (1554 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2020-10-24 03:49:50 +00:00
Corentin Noël
1ff3969cfb Fix missing newline in strings.xml 
This leads to wrongly escaped string

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
 2020-10-23 16:06:29 +02:00
Benoit Marty
8d73e8c905 Low priority and favorite are exclusive (iso Element Web) 2020-10-23 15:20:26 +02:00
Benoit Marty
5a6683574c Toggle Low priority tag (#1490) 2020-10-23 14:58:31 +02:00
Besnik Bleta
636f419be1 Translated using Weblate (Albanian) 
Currently translated at 99.4% (1908 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2020-10-22 21:49:57 +00:00
Vladislav Povalyaev
8b6a8b45ed Translated using Weblate (Russian) 
Currently translated at 99.3% (1906 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2020-10-22 21:49:55 +00:00
call_xz
89b6de0323 Translated using Weblate (Japanese) 
Currently translated at 48.3% (928 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2020-10-22 21:49:54 +00:00
Priit Jõerüüt
445dfceb2a Translated using Weblate (Estonian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2020-10-22 21:49:53 +00:00
@a2sc:matrix.org
788d1ed7b0 Translated using Weblate (German) 
Currently translated at 99.9% (1917 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-22 21:49:53 +00:00
Slavi Pantaleev
0df4cf70de Translated using Weblate (Bulgarian) 
Currently translated at 87.3% (1676 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
 2020-10-22 21:49:52 +00:00
Benoit Marty
60556d0fa0 Version code: apply workaround from https://issuetracker.google.com/issues/171133218 2020-10-22 16:10:08 +02:00
Benoit Marty
6b04e25954 Remove unused resource 2020-10-22 10:26:33 +02:00
Benoit Marty
723a833845 Better formatting 2020-10-22 10:26:33 +02:00
Benoit Marty
f567f92d8f Reset form when user press back 2020-10-22 10:26:33 +02:00
Benoit Marty
613573931e Fix room name reset issue when rotating the screen 2020-10-22 10:26:33 +02:00
Benoit Marty
dc8668b222 Code quality 2020-10-22 10:26:33 +02:00
Benoit Marty
def6758aaa UI tweak 2020-10-22 10:25:53 +02:00
Benoit Marty
c2a81c528f Fix issue in Greek resource (also fixed on Weblate) 2020-10-22 10:25:53 +02:00
Benoit Marty
4b8c31d806 Add Avatar: SDK 
Also add remove avatar action, and add Crop UX
 2020-10-22 10:25:53 +02:00
Benoit Marty
1f9712d8a2 Add Avatar: UI 2020-10-22 10:25:53 +02:00
Benoit Marty
3276da3912 Fix submit title 2020-10-22 10:25:53 +02:00
Benoit Marty
a969aef582 Use GalleryOrCameraDialogHelper 2020-10-22 10:25:53 +02:00
Benoit Marty
77c5b320d1 Create GalleryOrCameraDialogHelper to factorize code 2020-10-22 10:25:53 +02:00
Benoit Marty
02d3893b6b Cleanup 2020-10-22 10:25:53 +02:00
Benoit Marty
aaa772c749 Android style to validate form 2020-10-22 10:25:53 +02:00
Benoit Marty
99e8f9c6cd Room creation: add topic (#2078) 2020-10-22 10:25:53 +02:00
Benoit Marty
0667c0ce49 Never show the green gear in production 2020-10-22 10:25:53 +02:00
aethralis
0a2b0842b0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2020-10-22 07:45:11 +00:00
Knugi
f71f717e51 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2020-10-21 10:04:59 +00:00
D4708
191fbf1c9e Translated using Weblate (Ukrainian) 
Currently translated at 43.1% (828 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2020-10-21 10:04:59 +00:00
LinAGKar
434b4b5b13 Translated using Weblate (Swedish) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2020-10-21 10:04:56 +00:00
Ricardo Subtil
5a2df8e038 Translated using Weblate (Portuguese) 
Currently translated at 41.5% (797 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt/
 2020-10-21 10:04:56 +00:00
Denise Almeida
2ac2711210 Translated using Weblate (Portuguese) 
Currently translated at 41.5% (797 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt/
 2020-10-21 10:04:56 +00:00
Corentin Noël
a213ecdc43 Translated using Weblate (French) 
Currently translated at 99.2% (1903 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-10-21 10:04:55 +00:00
Samu Voutilainen
b49d9ff9c6 Translated using Weblate (Finnish) 
Currently translated at 81.0% (1554 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2020-10-21 10:04:55 +00:00
Danial Behzadi
0e0588665d Translated using Weblate (Persian) 
Currently translated at 70.9% (1360 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2020-10-21 10:04:54 +00:00
dipeve
95786dc9d6 Translated using Weblate (Spanish (Mexico)) 
Currently translated at 28.9% (555 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es_MX/
 2020-10-21 10:04:46 +00:00
Benoit Marty
7bb2899414 Translated using Weblate (Greek) 
Currently translated at 14.4% (278 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/el/
 2020-10-21 10:04:46 +00:00
@a2sc:matrix.org
94f5b7b987 Translated using Weblate (German) 
Currently translated at 99.6% (1912 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-21 10:04:46 +00:00
Slavi Pantaleev
f8762da246 Translated using Weblate (Bulgarian) 
Currently translated at 84.3% (1618 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
 2020-10-21 10:04:44 +00:00
Valere
ace412f9e3 cleaning 2020-10-20 21:41:48 +02:00
Valere
47746d6997 Add event sender in app thread 2020-10-20 21:41:48 +02:00
Markus
42fc47685c Merge tag 'v1.0.9' into fix_2100_2 2020-10-19 14:07:17 +02:00
Benoit Marty
c05147a019 Merge branch 'hotfix/bma/versionCode' into develop 2020-10-19 12:31:35 +02:00
Benoit Marty
a59c92f55a Fix issue with VersionCode 2020-10-19 12:29:20 +02:00
inthepan
2026d93934 Translated using Weblate (German) 
Currently translated at 96.9% (1860 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-18 00:04:46 +00:00
Corentin Noël
85747d2ed4 Translated using Weblate (French) 
Currently translated at 98.1% (1883 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2020-10-18 00:04:46 +00:00
Slavi Pantaleev
c0cea9448f Translated using Weblate (Bulgarian) 
Currently translated at 74.3% (1426 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
 2020-10-18 00:04:36 +00:00
Benoit Marty
1b7158a61d Version++ 2020-10-16 17:34:10 +02:00
Benoit Marty
ca0af0f342 Fix bad cases 2020-10-16 16:38:33 +02:00
Benoit Marty
aa91c41082 Fix lint issue 2020-10-16 16:36:09 +02:00
Weblate
dea994c1fb Merge branch 'origin/develop' into Weblate. 2020-10-16 14:02:54 +00:00
ganfra
9bf615e90c Fix composer: update constraints layout and fix some glitches 2020-10-16 11:24:59 +02:00
Samu Voutilainen
003bffe463 Translated using Weblate (Finnish) 
Currently translated at 80.3% (1541 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2020-10-16 09:04:53 +00:00
Marcelo Filho
021c23cd19 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2020-10-16 09:04:53 +00:00
random
821b9dc187 Translated using Weblate (Italian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2020-10-16 09:04:50 +00:00
TR_SLimey
ab8c9bd269 Translated using Weblate (Polish) 
Currently translated at 79.7% (1529 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2020-10-16 09:04:47 +00:00
linsui
1692a52e0a Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2020-10-16 09:04:46 +00:00
Nikita Epifanov
a086b2001b Translated using Weblate (Russian) 
Currently translated at 99.4% (1907 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
 2020-10-16 09:04:43 +00:00
Priit Jõerüüt
98086f1b6b Translated using Weblate (Estonian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2020-10-16 09:04:41 +00:00
ginnyTheCat
c1ea4bc1a7 Translated using Weblate (German) 
Currently translated at 96.5% (1852 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-16 09:04:38 +00:00
@a2sc:matrix.org
7f48604820 Translated using Weblate (German) 
Currently translated at 96.5% (1852 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-16 09:04:38 +00:00
LinAGKar
572b0942ba Translated using Weblate (Swedish) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2020-10-16 09:04:38 +00:00
Jeff Huang
63dff842f6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2020-10-16 09:04:35 +00:00
Benoit Marty
93683d026b
Merge pull request #2260 from vector-im/feature/bma/fix_issue 
Feature/bma/fix issue
 2020-10-15 18:14:17 +02:00
Benoit Marty
6fcfd259b7
Merge pull request #2211 from ginnyTheCat/rainbow-color 
Changed rainbow algorithm
 2020-10-15 18:13:24 +02:00
Benoit Marty
6c335c7df1
Merge pull request #2257 from ginnyTheCat/share 
Ability to share text
 2020-10-15 18:12:27 +02:00
Benoit Marty
95142274fa Clear alerts if user sign out 2020-10-15 15:55:55 +02:00
Benoit Marty
f68eb449bd Be robust against StrandHogg task injection 2020-10-15 15:55:55 +02:00
Benoit Marty
7158f49fcb
Merge pull request #2244 from ginnyTheCat/direct_share 
Direct share support
 2020-10-14 14:27:08 +02:00
Benoit Marty
95df786227 Add a click action at the top of the drawer to open the general settings 2020-10-14 12:21:27 +02:00
Benoit Marty
2b026b6bc6 Fix vector tint compilation error. Tint at runtime. 
Also remove unused icon.
 2020-10-13 23:15:06 +02:00
Constantin Wartenburger
afe55ae57e
Merge remote-tracking branch 'upstream/develop' into direct_share 2020-10-13 20:26:07 +02:00
Constantin Wartenburger
7bee558e01
Using ApplicationId from BuildConfig 2020-10-13 20:17:56 +02:00
Benoit Marty
35b94d70e2 Fix compilation issue introduced when formatting code :/ 2020-10-13 16:04:44 +02:00
Benoit Marty
55a94d9888 Optimize import 2020-10-13 15:04:50 +02:00
Benoit Marty
ede5bb0e90 Format files, in particular align -> 2020-10-13 14:57:45 +02:00
Benoit Marty
ff56414695 Cleanup and log onResume and onPause for VectorAttachmentViewerActivity 2020-10-13 14:44:04 +02:00
Benoit Marty
ca99a52545 Remove dead code 2020-10-13 14:40:23 +02:00
Benoit Marty
0345ca47dd protected 2020-10-13 14:35:33 +02:00
Benoit Marty
db1f129034 Improve detection of encrypted rooms 2020-10-13 11:27:46 +02:00
Benoit Marty
e6d5d0f9c6 There is no more menu in this Fragment 2020-10-12 21:09:28 +02:00
Benoit Marty
b1625838ed Move the attibute to the correct View 2020-10-12 21:09:28 +02:00
Benoit Marty
4ac62bcf51 Display filter only if there are more than 2 members in this room 2020-10-12 21:09:28 +02:00
Benoit Marty
5ef97362cb Fix gravity on topic 2020-10-12 21:09:28 +02:00
Benoit Marty
d0cb5f4212
Merge pull request #2248 from vector-im/feature/bca/detect_reset 
Fix / reset cross signing not well supported
 2020-10-12 20:49:15 +02:00
Benoit Marty
17e7aedcba Move store data to /fastlane/metadata/android (#812) 2020-10-12 19:09:04 +02:00
Benoit Marty
648462f7f4 Remove unused string labs_merge_e2e_in_timeline 2020-10-12 19:02:54 +02:00