mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-23 16:23:57 +03:00
Code Issues Projects Releases Packages Wiki Activity
7231 commits 7 branches 125 tags 235 MiB
Commit graph

4514 commits

Author SHA1 Message Date
Dominic Fischer
0da4ff7b02 Run ktlint 2020-11-06 19:20:23 +00:00
Dominic Fischer
35768ff7e8 Convert AccountService to suspend functions 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
 2020-11-06 16:49:51 +00:00
ganfra
6dfdc77ebd Use room member instead of user when it makes sense 2020-11-06 14:41:43 +01:00
SpiritCroc
10e67bd5df Remember expand status for all categories except invite 
We did remember low priority before. We might want to remember other
categories as well, but let's better keep the invite category expanded
by default.

Change-Id: Ia351de35751ce5a13f3739ed5f7a3528e315261f
 2020-11-06 14:24:03 +01:00
Jeff Huang
2a22d71e7c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2020-11-06 02:49:59 +00:00
Marcelo Filho
eaa7fb7100 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.7% (1929 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2020-11-06 02:49:58 +00:00
Priit Jõerüüt
9755dd73eb Translated using Weblate (Estonian) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2020-11-06 02:49:58 +00:00
Auri B. P
4c2e62031a Translated using Weblate (Catalan) 
Currently translated at 58.9% (1140 of 1933 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2020-11-06 02:49:58 +00:00
Benoit Marty
51a95554d7 Remove useless code. We can now inject element in the Fragment constructors 2020-11-05 18:30:00 +01:00
Benoit Marty
12d8bd1743 Cleanup after rebase - avoid computing twice the existing roomId 2020-11-05 17:34:10 +01:00
Onuray Sahin
458b4259fe Change menu action title for existing rooms. 2020-11-05 17:02:13 +01:00
Onuray Sahin
e7714da8e8 Navigate to an existing DM instead of creating a new one. 2020-11-05 17:02:13 +01:00
Benoit Marty
de39a17247 Fix issue on setting avatar on a room. 
We deleted the just added avatar because `withState {}` is asynchronous
 2020-11-05 16:09:04 +01:00
Benoit Marty
5c7a5fab94 Improve API: rename the method and return empty list instead of null 2020-11-05 15:47:28 +01:00
Benoit Marty
c9e0aff839 DRY 2020-11-05 15:42:44 +01:00
Benoit Marty
b7a1f96294 Append to file but before the extension 2020-11-05 15:40:12 +01:00
Benoit Marty
15ad351579 Some fixes from Valere about verification 2020-11-05 15:33:28 +01:00
Benoit Marty
6cb4645514 Add a key to the category, to be able to hide it 2020-11-05 15:28:13 +01:00
SpiritCroc
eecbdde2fb Fix some colors (and fix compile) 
Change-Id: I2cb3d144afbb9af306774bf3d763d1f299133517
 2020-11-05 13:58:41 +01:00
SpiritCroc
2590f8f690 Resolve required manual intervention in german strings 
This reverts commit 85b77f6555.

Change-Id: I4f0056cdfd099205899f46b19962799052a6b461
 2020-11-05 13:27:39 +01:00
SpiritCroc
5a4907362a Automatic SchildiChat string correction 
Change-Id: I2b19a9bd837a14a3aaf5830bcde6af5026ff9c05
 2020-11-05 13:16:03 +01:00
SpiritCroc
58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
 2020-11-05 13:15:55 +01:00
SpiritCroc
3837ce4204 Revert "Automatic SchildiChat string correction" 
This reverts commit 835bde286c.
 2020-11-05 13:14:16 +01:00
SpiritCroc
85b77f6555 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings""""""""" 
This reverts commit bde0020305.
 2020-11-05 13:14:16 +01:00
Benoit Marty
17fed39b27 Version++ 2020-11-04 16:00:16 +01:00
Weblate
f3b8bb066c Merge branch 'origin/develop' into Weblate. 2020-11-04 13:43:47 +00:00
LinAGKar
b879be2b02 Translated using Weblate (Swedish) 
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/sv/
 2020-11-04 13:43:37 +00:00
Hivaa
52e699e125 Translated using Weblate (Persian) 
Currently translated at 98.4% (1899 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2020-11-04 13:43:36 +00:00
Benoit Marty
b15fa7c0d7 Two elements in the task switcher (#2299) 2020-11-04 14:32:54 +01:00
Benoit Marty
d1d2c5f117
Merge pull request #2327 from vector-im/feature/bma/keysbackupcrash 
Feature/bma/keysbackupcrash
 2020-11-04 00:02:48 +01:00
SpiritCroc
600674e871 Room topic: tweak collapse behaviour some more 
One could argue that collapsing is only useful if we have more than 2
lines to hide.
Also, @su-ex wants more lines, so let's go for 5+3.

Change-Id: I5f3580171d4b1544fd8f91f1de48cea85023b60a
 2020-11-03 10:46:25 +01:00
Benoit Marty
0db1095373
Merge pull request #2334 from vector-im/feature/bca/crypto_db_clean 
Feature/bca/crypto db clean
 2020-11-03 10:31:53 +01:00
SpiritCroc
56b84a5201 Move footer time slighlty down in the bubble 
Change-Id: I0d61691ca56a44a6c8efb01d2c447bac9d50c9cb
 2020-11-03 09:49:53 +01:00
Benoit Marty
d4963dfb31 Use the same name for the 2 db log methods 2020-11-03 09:17:07 +01:00
Valere
3c7f61e45c Clean oldest gossiping entries on open 
Add a dump of DB size on bug report
 2020-11-02 17:45:08 +01:00
Corentin Noël
ac0418c796 Translated using Weblate (French) 
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/fr/
 2020-11-02 15:49:57 +00:00
Alexia Ŭerner
86b0094cdb Translated using Weblate (Esperanto) 
Currently translated at 99.1% (1913 of 1929 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
 2020-11-02 15:49:56 +00:00
zeritti
c0f07bc0a5 Translated using Weblate (Czech) 
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/cs/
 2020-11-02 15:49:56 +00:00
Valere
c3b8ed223d Increase log level of file logger 2020-11-02 16:39:06 +01:00
Benoit Marty
51ae2ce1e0
Merge branch 'develop' into feature/fix_sync_after_call_invite 2020-11-02 14:45:05 +01:00
Benoit Marty
9ff78051a9 Cleanup 2020-11-02 14:15:27 +01:00
Benoit Marty
0f21d80154
Merge branch 'develop' into fix_2100_2 2020-11-02 14:03:40 +01:00
SpiritCroc
07e6cf2a8d Increment version 
Change-Id: I4a7d9c5fdd0cfa93a614fb214ddd953de6bbffaa
 2020-11-02 13:20:05 +01:00
SpiritCroc
4d269c586d Room summary: Increase number of topic lines before collapsing 
Change-Id: I1e86a5a14a5598b25ef315e23d6752540eaeac4e
 2020-11-02 12:30:39 +01:00
SpiritCroc
65c365a157 Don't crash language selection just because we are in debug 
Change-Id: I429dfee9ad08bd2578a9e24d0662ad60cdd7c917
 2020-11-02 12:25:10 +01:00
SpiritCroc
44355109d7 Improve direct chat handling 
We show less information in direct chats in dual chat bubble layout, as
we assume that the senders know themselves, and see the chat partner
from  the action bar at the top.

However, there are some limitations:
- A directChat might actually include more members, due to helper bots,
  multiple accounts, or misconfigurations
- Even if a direct chat has exactly two members, there might have been
  some membership changes in the past

To account for this, we do the following:
- Only enable the direct message layout if there are exactly two members
  in the room currently (in addition to the isDirect-flag being set)
- Before hiding sender information, check if the sender is actually the
  expected chat partner. If not, fallback to showing avatar and name for
  this message.

Possible improvement for the future: if we have a message in a direct
chat by a non-member, following messages by the dm chat partner might
benefit from showing member name either way.

Change-Id: Ie4a204510990301175339e60469048b06669d36b
 2020-11-02 12:25:10 +01:00
SpiritCroc
be2983053a For bottom timestamps, we can hide member names also when hiding avatars 
Member names not really important in direct chats or for outgoing
messages.

Change-Id: I1d3328444daf571488b1d9b4d2d188d695c515b3
 2020-11-02 12:25:09 +01:00
SpiritCroc
0b2d98b116 Don't reserve space for the expand text button if we need just one more line 
Test: view Room summary with 1, 2, 3, 4 lines

Change-Id: Ic8a5e197f78ffeb8c1410d6ac3c859fd522decaa
 2020-11-02 12:25:09 +01:00
SpiritCroc
12e97fbed2 Hide redactions by default 
Change-Id: I498ca35464f7f42b70e21ca451b94702aefee8d6
 2020-11-02 12:25:09 +01:00
SpiritCroc
d538ee4dcb Fix ic_send for attachments on fab 
Floating action button has accent color background, so better not have
the icon accent color as well.

Change-Id: Ie5cd49a3e4631425c14183e022a16dde76d40004
 2020-11-02 12:25:09 +01:00