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

9137 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
e727e40434 Automatic upstream merge postprocessing 
Change-Id: I8e50e62543163888a8919fa7552c7b095388222e
 2021-05-02 12:13:16 +02:00
SpiritCroc
fb2c41cb21 Automatic color correction 
Change-Id: I3c041cc23e768ed2479143ec573e9d9243228f42
 2021-05-02 12:13:16 +02:00
SpiritCroc
39359f7d24 Merge remote-tracking branch 'upstream/develop' into spaces 
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
	sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.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/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
 2021-05-02 12:12:52 +02:00
SpiritCroc
0d06914efc [TMP] Automatic upstream merge preparation 
Change-Id: I2586ef477e9e1dc31e16abd7ca535d03a0115fe7
 2021-05-02 10:13:16 +02:00
SpiritCroc
a70d94c81e Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I47b13444500e027ab4f6f560c9c529549e9f355b
 2021-05-02 10:13:16 +02:00
SpiritCroc
ca21a3fc43 Increment version 
Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba
 2021-05-02 10:03:17 +02:00
SpiritCroc
35a9c8a12f Fix updating read marker automatically 
Change-Id: I84a51127dc7b434622ecdcab350c788ee3d623be
 2021-05-01 11:56:03 +02:00
SpiritCroc
2605c6ac9b Properly sort rooms according to events previewed in summary 
Change-Id: Id17385a4d17869b0356aa7242407581e2193845e
 2021-05-01 11:56:03 +02:00
SpiritCroc
3ee98f3c94 Fix missing sender information after edits 
Fixes https://github.com/vector-im/element-android/issues/3184

Change-Id: I27de01c29b31fbd49c8d2b0d4dacf13ba932d5b9
 2021-05-01 11:56:03 +02:00
Benoit Marty
8edbd323de
Merge pull request #3266 from SpiritCroc/missing_sender 
Fix missing sender information after edits
 2021-05-01 10:53:59 +02:00
SpiritCroc
47aa787ecb Fix missing sender information after edits 
Fixes https://github.com/vector-im/element-android/issues/3184
 2021-05-01 10:11:15 +02:00
Benoit Marty
c4a4a5d41c
Merge pull request #3258 from vector-im/feature/bma/fix_3250 
Delete and react to stickers (#3250)
 2021-04-30 18:11:55 +02:00
Benoit Marty
aa9f4c2e6e
Merge pull request #3166 from tobymurray/patch-1 
Related to #1793, allow cleartext to LAN domains
 2021-04-30 18:09:07 +02:00
Benoit Marty
589be8b15f
Update vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt 2021-04-30 11:56:45 +02:00
Benoit Marty
6180076512 Delete and react to stickers (#3250) 2021-04-30 11:14:36 +02:00
Toby Murray
33337bd772 Allow cleartext to some LAN domains 
This functionality exists in the desktop client, so hoping to mirror that as much as Android allows

This addresses a number of the use cases touched on in #1793. Enabling clear text to various official and standard LAN-only domains means it's easier to develop the Android application, as a Matrix server can be deployed locally without much fuss anywhere on the developer's LAN. This can reduce the reliance on a DNS or SSL certificates when neither are really relevant to the functionality of the client/server. In particular, managing SSL certs without a public domain is a pain in the butt.

At the same time, this does not significantly diminish the security of Element Android, as at the current time these domains are either explicitly not valid TLDs or conventionally not TLDs (so would be an unexpected change if they were to become so). In the event e.g. `.home` becomes a TLD, it would be appropriate to remove it from this list.
 2021-04-30 00:47:57 -04:00
Benoit Marty
38e83e1f35
Merge pull request #3249 from vector-im/feature/bma/fixwl 
Feature/bma/fixwl
 2021-04-29 20:55:22 +02:00
Benoit Marty
5d9d984c73
Merge pull request #3235 from vector-im/feature/bca/spaces_justme_beta 
Just me spaces support
 2021-04-29 17:47:19 +02:00
Benoit Marty
90f4a9490d Fix lint issues 2021-04-29 17:33:14 +02:00
Benoit Marty
d28c6039c0 Fix issue in string template 2021-04-29 17:06:46 +02:00
Benoit Marty
bea9abd9a6
Merge pull request #3248 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-04-29 17:05:00 +02:00
Benoit Marty
ab68903d7f Fix wording issue (#3242) 2021-04-29 15:47:31 +02:00
Weblate
79f125cccd Merge branch 'origin/develop' into Weblate. 2021-04-29 13:38:14 +00:00
Benoit Marty
98177da6b1
Merge pull request #3197 from vector-im/feature/bma/crashfix 
WIP - introduce sessionScope
 2021-04-29 15:34:42 +02:00
Benoit Marty
659d012e13
Merge pull request #3247 from vector-im/feature/bma/master_main 
`master` branch has been renamed to `main`
 2021-04-29 14:29:49 +02:00
Benoit Marty
55f1f56fec master branch has been renamed to main 
Also in project vector-im/jitsi_libre_maven
 2021-04-29 12:29:52 +02:00
Valere
30d7c73b2d code review 2021-04-29 11:56:57 +02:00
Valere
f89a7496aa Add action to create new room 2021-04-29 11:51:07 +02:00
Valere
31ffa65fd0 Update add room screen as per design 2021-04-29 11:51:07 +02:00
Valere
7465ac2ef6 Add just me space flow Initial commit 2021-04-29 11:51:07 +02:00
Benoit Marty
264eb3b0a2
Merge pull request #3246 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.22 
Bump libphonenumber from 8.12.21 to 8.12.22
 2021-04-29 11:12:29 +02:00
Benoit Marty
e073563a67 Cleanup 2021-04-29 11:10:41 +02:00
ganfra
80b155e042 Refact coroutine session scope 2021-04-29 11:10:41 +02:00
Benoit Marty
bd0fcce572 Return Job 2021-04-29 11:10:41 +02:00
Benoit Marty
a5c0c23bae Inject constructor... 2021-04-29 11:10:41 +02:00
Benoit Marty
e5d0a8f3d8 Cleanup 2021-04-29 11:10:41 +02:00
Benoit Marty
dc69d5c68a Create a holder 2021-04-29 11:10:41 +02:00
Benoit Marty
ecd2d0fb76 Use session scope 2021-04-29 11:10:41 +02:00
Benoit Marty
c33da38ddb GlobalScope -> sessionScope 2021-04-29 11:10:41 +02:00
Benoit Marty
0e563596dd Remove useless call to parent method 2021-04-29 11:10:41 +02:00
Benoit Marty
8afa697591 GlobalScope -> sessionScope 2021-04-29 11:10:41 +02:00
Benoit Marty
82ee2567b7 Provide a session scope, to launch coroutines without using the ViewModelScope 
It could be used elsewhere, will change other location in another commit.
 2021-04-29 11:10:41 +02:00
Benoit Marty
95639927a7 Catch Throwable on not only Exception 2021-04-29 11:10:41 +02:00
Benoit Marty
4acc308864
Merge pull request #3190 from vector-im/feature/bma/fix_troubleshoot 
Fix a race condition
 2021-04-29 11:08:00 +02:00
Benoit Marty
751efb57fc
Merge pull request #2840 from vector-im/feature/bca/spaces_sdk 
Spaces support - beta
 2021-04-29 10:18:31 +02:00
dependabot[bot]
7593c3f03d
Bump libphonenumber from 8.12.21 to 8.12.22 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.21 to 8.12.22.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.21...v8.12.22)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 07:18:14 +00:00
Vivek K J
cacc83bf17 Translated using Weblate (Malayalam) 
Currently translated at 38.7% (915 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
 2021-04-28 16:34:44 +00:00
Line
c043e6e958 Translated using Weblate (Latvian) 
Currently translated at 86.8% (2052 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
 2021-04-28 16:34:33 +00:00
Benoit Marty
4d3a02f71f Translated using Weblate (French) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-04-28 16:34:26 +00:00
Juhana Uuttu
ea645d147d Translated using Weblate (Finnish) 
Currently translated at 79.3% (1875 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
 2021-04-28 16:34:25 +00:00