filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,835 Commits 7 Branches 121 Tags 228 MiB
Commit Graph

17835 Commits

Author SHA1 Message Date
Maxime NATUREL bad4eba153 Remove non necessary @MainThread annotations 2022-07-19 14:05:13 +02:00
Maxime NATUREL e26759fa89 Adding changelog entry 2022-07-19 14:05:13 +02:00
Maxime NATUREL c095cc73ce Introducing use case to check if an event can be redacted 2022-07-19 14:05:13 +02:00
Maxime NATUREL 9c619001a5 Updating string value for redacted event to be more consistent 2022-07-19 14:04:09 +02:00
Maxime NATUREL 4a5fe3c0f9 Fix the criteria to start merging redacted events 2022-07-19 14:04:09 +02:00
Maxime NATUREL fe4174f005 Small improvements in code 2022-07-19 14:04:08 +02:00
Maxime NATUREL c9794d8280 Small fixes in comments 2022-07-19 14:04:08 +02:00
Maxime NATUREL b412b9f4e9 Merging redacted events by reusing existing mechanism for same type events 2022-07-19 14:04:08 +02:00
Maxime NATUREL 8d8ee051eb Improve readability of merged Header factory code 2022-07-19 14:04:08 +02:00
Maxime NATUREL 578d90e463 Adding changelog entry 2022-07-19 14:04:08 +02:00
Onuray Sahin c408f824d3 Code review fixes. 2022-07-19 14:58:00 +03:00
ericdecanini 6f9b5c010d Deletes migration test 2022-07-19 13:49:21 +02:00
Eric Decanini 221cb24de8
Merge pull request #6584 from vector-im/task/eric/new_layout_feature_flag 
Adds NewAppLayoutEnabled Feature Flag
 2022-07-19 12:24:16 +01:00
Benoit Marty 246307ab98
Merge pull request #6592 from vector-im/feature/bma/fix_nightly 
Fix error when building `./gradlew assembleGplayNightly`
 2022-07-19 12:59:51 +02:00
Benoit Marty 758f0398bd Fix error when building ``./gradlew assembleGplayNightly`. Just reordering lines... 
Error was `No matching client found for package name 'im.vector.app'`
 2022-07-19 12:50:47 +02:00
Onuray Sahin 493dc57a29 Code review fixes. 2022-07-19 13:41:00 +03:00
Benoit Marty 4d4dbc958b
Merge pull request #6590 from vector-im/bugfix/nfe/missing_font_scale_setting 
fixed crash when system font scale setting isn't set
 2022-07-19 12:30:38 +02:00
Onuray Sahin 8b6e4dd4d4
Merge pull request #6579 from vector-im/feature/ons/fix_remove_live_location_logs 
Do not log the live location of the user (PSG-63)
 2022-07-19 12:18:58 +03:00
ericdecanini e926871570 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
 2022-07-19 11:17:14 +02:00
ericdecanini 2f408656a7 Changes vector override to vector feature 2022-07-19 10:43:55 +02:00
NIkita Fedrunov f37e3b71eb fixed crash when system font scale setting isn't set 2022-07-19 10:40:14 +02:00
Benoit Marty ade1b7be8c Add some punctuation to please detekt. 2022-07-19 09:49:34 +02:00
Benoit Marty ba9c1dde32
Merge pull request #6551 from vector-im/dependabot/gradle/kotlinCoroutines-1.6.4 
Bump kotlinCoroutines from 1.6.3 to 1.6.4
 2022-07-18 18:27:54 +02:00
Onuray Sahin 5fb10ab287 Changelog added. 2022-07-18 18:52:37 +03:00
Onuray Sahin e2cd75284f Check user power level before sharing live location. 2022-07-18 18:46:03 +03:00
Benoit Marty b0237a4e22
Merge pull request #6538 from vector-im/feature/bma/more_migration_log 
More DB migration log
 2022-07-18 17:24:25 +02:00
Benoit Marty 428942d407 Changelog 2022-07-18 17:22:49 +02:00
Benoit Marty 3f8cbd1b9c Create a parent `MatrixRealmMigration` and improve the logs. 2022-07-18 17:22:49 +02:00
Benoit Marty ae8f977d6b Log the end of the migration and it's duration 2022-07-18 17:21:49 +02:00
ericdecanini b769eafcc3 Adds changelog file 2022-07-18 16:57:54 +02:00
ericdecanini fbd1763dcf Adds new app layout enabled feature flag 2022-07-18 16:49:42 +02:00
Kat Gerasimova 069c0c7cb4
Update issue automation for the design team (#6577) 
* Update issue automation for the design team

The design team would like to see all of their issues on their board for triage now

* Update triage-labelled.yml
 2022-07-18 17:14:34 +03:00
ericdecanini bc5c53b70d Fixes copyright lint error 2022-07-18 15:53:51 +02:00
ericdecanini e6475a3f83 Fixes copyright lint error 2022-07-18 15:47:19 +02:00
ericdecanini 7bb7a085a8 Fixes copyright lint error 2022-07-18 15:38:03 +02:00
ganfra 0a4595df5b
Merge pull request #6552 from vector-im/dependabot/gradle/flipper-0.154.0 
Bump flipper from 0.153.0 to 0.154.0
 2022-07-18 15:35:37 +02:00
ericdecanini 7d29fbc68c Fixes post merge errors 2022-07-18 15:06:25 +02:00
ericdecanini c73c36eb26 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
 2022-07-18 15:05:04 +02:00
ericdecanini 67dd250f83 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-18 15:03:42 +02:00
ericdecanini 1ae5965632 Fixes import order 2022-07-18 14:48:10 +02:00
ericdecanini 13b9b5b5d6 Changes string into plural 2022-07-18 14:47:09 +02:00
Benoit Marty 4ed24b5571
Merge pull request #6478 from vector-im/feature/bma/nightly 
Nightly build published on Firebase
 2022-07-18 14:22:15 +02:00
Onuray Sahin 55a5752e3b Remove unused import. 2022-07-18 14:40:44 +03:00
Onuray Sahin 82fed20145 Changelog added. 2022-07-18 13:53:18 +03:00
Onuray Sahin ac3285001f Do not log the live location of the user. 2022-07-18 13:50:35 +03: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
Benoit Marty cdbc197426
Merge pull request #6549 from vector-im/feature/bma/fix_6514 
Just go back to the timeline if the user is already viewing the DM with the other user.
 2022-07-18 09:48:44 +02:00
Maxime NATUREL cedeb8fa50 Adding changelog entry 2022-07-18 09:43:33 +02:00
Maxime NATUREL cda100e596 Using same string key for stop + fix insets in button styles 2022-07-18 09:43:33 +02:00