Benoit Marty
d3f50ee6c3
Fix a crash that would occur if it was not dead code
2020-08-27 22:46:30 +02:00
Benoit Marty
ef4f930ba2
Don't pause the sync thread if there is an active or pending call.
...
But pause the sync thread when there is no active call and the app is the background.
Authors: Onuray, I just rebased and squashed all the commit
2020-08-27 18:20:06 +02:00
Benoit Marty
0f1e348ac4
Merge pull request #2010 from vector-im/feature/fix_send_room_v6
...
Feature/fix send room v6
2020-08-27 18:14:58 +02:00
Benoit Marty
67bde947f9
Merge pull request #2009 from vector-im/feature/joining_room
...
Feature/joining room
2020-08-27 18:11:42 +02:00
ganfra
28a1cf6982
Join room: clean up after benoit's remarks
2020-08-27 11:44:21 +02:00
ganfra
9c1c9f96e1
Room v6: finish cleaning up
2020-08-27 10:34:40 +02:00
Marcelo Filho
90e580245a
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (235 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/pt_BR/
2020-08-26 20:42:44 +00:00
ganfra
dc4135b506
Remove unnecessary code now we have an other way to keep number types
2020-08-26 19:21:41 +02:00
ganfra
cefdbe1d08
Add CheckNumberType in json to fix sending in room v6
2020-08-26 19:21:14 +02:00
Benoit Marty
013f51f0c4
Merge branch 'develop' into feature/mention_display_name
2020-08-26 17:35:16 +02:00
Benoit Marty
7ef08579ef
Merge branch 'develop' into feature/switch_language
2020-08-26 17:34:17 +02:00
ganfra
b39a86edbd
Merge branch 'develop' into feature/joining_room
2020-08-26 17:06:31 +02:00
ganfra
b986bfd509
Permalink: handle via parameters
2020-08-26 16:37:48 +02:00
Benoit Marty
6376ba2516
Improve wording (visible in debug screen)
2020-08-25 17:48:12 +02:00
Benoit Marty
5e0fc3e17f
Rename class
2020-08-25 17:34:43 +02:00
Benoit Marty
1a068ee191
Add more tests
2020-08-25 17:34:02 +02:00
Benoit Marty
8226f60fad
Refactor test to avoid duplicated code
2020-08-25 17:31:51 +02:00
Benoit Marty
2e618999d9
Words containing my name should not trigger notifications ( Fixes #1781 )
...
It adds a specific behavior for rule with id RuleIds.RULE_ID_CONTAIN_USER_NAME
2020-08-25 17:26:54 +02:00
Benoit Marty
bf7a096a18
Refactor: Remove duplicated declaration for Actions
2020-08-25 17:01:55 +02:00
Benoit Marty
0d9885a1e0
Refactor: Remove duplicated declaration for RuleIds
2020-08-25 16:53:12 +02:00
Benoit Marty
aca8fd7f3d
Refactor: Kotlin style
2020-08-25 16:18:44 +02:00
Benoit Marty
f5ea4fb6ac
Refactor: Extract method to dedicated files
2020-08-25 16:15:42 +02:00
Benoit Marty
7b5c74f81c
Refactor: Condition is now an interface
2020-08-25 16:14:14 +02:00
Benoit Marty
558e11a364
Refactor: move Kind to its own file
2020-08-25 16:01:34 +02:00
Weblate
3d5b3c65de
Merge branch 'origin/develop' into Weblate.
2020-08-25 11:15:37 +00:00
ziriSut
51893fff09
Translated using Weblate (Kabyle)
...
Currently translated at 99.1% (233 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-24 17:42:31 +00:00
Kahina Messaoudi
25d8ba2699
Translated using Weblate (Kabyle)
...
Currently translated at 99.1% (233 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-24 17:42:31 +00:00
Slavi Pantaleev
ee7f79b40c
Translated using Weblate (Bulgarian)
...
Currently translated at 72.3% (170 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/bg/
2020-08-24 17:42:28 +00:00
Tobias Preuss
ed98613b2d
Use File extension functions to make code more concise.
...
+ This change replaces a few usages of ByteArrayInputStream, FileInputStream,
FileOutputStream with their equivalent Kotlin extension functions.
2020-08-24 18:01:30 +02:00
Benoit Marty
69e9a79ac1
Inject StringProvider instead of Context
2020-08-24 14:49:42 +02:00
SpiritCroc
b1d96ebba9
Setting for unread badge / room summary event visibility
...
- All previewable like in Element
- Exclude member state changes
- Exclude member state changes and reactions
Replaces commit 72d2b1c9f1e5bb642c72e9c8e5ef73b0aa88ab7f.
Also fix marking rooms as unread when no previewable event is available
compared to above commit.
Related issue:
https://github.com/vector-im/element-android/issues/588
Change-Id: Id76b73829a719de88f9c07c492e78736e1f3d7db
2020-08-24 11:29:38 +02:00
Benoit Marty
328dc9ea5b
Merge pull request #1979 from vector-im/feature/update_dependencies
...
Update some dependencies, including coroutines for working debugging
2020-08-24 10:11:57 +02:00
Kahina Messaoudi
8b41b014ee
Translated using Weblate (Kabyle)
...
Currently translated at 96.6% (227 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 15:46:17 +00:00
ziriSut
601cf10fb4
Translated using Weblate (Kabyle)
...
Currently translated at 96.6% (227 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 15:46:16 +00:00
Kahina Messaoudi
f02ee2af27
Translated using Weblate (Kabyle)
...
Currently translated at 72.3% (170 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 14:38:55 +00:00
ziriSut
c490d6bcd1
Translated using Weblate (Kabyle)
...
Currently translated at 72.3% (170 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 14:38:55 +00:00
ziriSut
64b6b069a4
Translated using Weblate (Kabyle)
...
Currently translated at 69.4% (163 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 14:32:38 +00:00
Kahina Messaoudi
edd455a772
Translated using Weblate (Kabyle)
...
Currently translated at 69.4% (163 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 14:32:38 +00:00
Kahina Messaoudi
a54c1af7cc
Translated using Weblate (Kabyle)
...
Currently translated at 39.6% (93 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 12:09:01 +00:00
ziriSut
9e1fe22c19
Translated using Weblate (Kabyle)
...
Currently translated at 39.6% (93 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 12:09:01 +00:00
Kahina Messaoudi
bd033ed5f4
Translated using Weblate (Kabyle)
...
Currently translated at 7.2% (17 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 06:37:58 +00:00
Slimane Selyan AMIRI
2fd9333fb0
Translated using Weblate (Kabyle)
...
Currently translated at 7.2% (17 of 235 strings)
Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-08-23 06:37:57 +00:00
Slimane Selyan AMIRI
385de03f40
Added translation using Weblate (Kabyle)
2020-08-22 18:05:34 +00:00
SpiritCroc
3ea56d5e53
Remove temporary downstream translation
2020-08-22 11:38:16 +02:00
SpiritCroc
7b4b5be759
Merge tag 'v1.0.5' into sc
...
Conflicts:
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_file_stub.xml
vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
vector/src/main/res/values-v21/styles_login.xml
vector/src/main/res/values/theme_dark.xml
vector/src/main/res/values/theme_light.xml
vector/src/main/res/values/theme_status.xml
2020-08-22 11:23:45 +02:00
SpiritCroc
27a6b3c79e
Merge commit '11b5512cb86369a9c3b50e5b469a8182cce79f52' into sc
...
Merge v1.0.5 pt. 6
Conflicts:
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
2020-08-22 11:00:23 +02:00
SpiritCroc
28f65ec0e8
Merge commit 'e3bf4c1e7bce8c752b4fef54be9a76893561a24a' into sc
...
Merge v1.0.5 pt. 5
Conflicts:
README.md
vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
2020-08-22 10:54:14 +02:00
SpiritCroc
c2e1a33864
Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc
...
Merge v1.0.5 pt. 1
Conflicts:
vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
vector/src/main/res/layout/fragment_login_server_selection.xml
vector/src/main/res/values/theme_dark.xml
vector/src/main/res/values/theme_light.xml
2020-08-22 09:52:54 +02:00
Benoit Marty
20e2b3beb8
Merge pull request #1978 from vector-im/feature/ttl
...
Improve #1971 , especially be robust about system time change
2020-08-21 18:12:35 +02:00
ganfra
1f890324b4
Update some dependencies, including coroutines for working debugging
2020-08-21 17:17:51 +02:00