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

16119 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericdecanini
d5432cd0e7 Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt
 2022-05-26 10:37:19 +02:00
Adam Brown
0675b7c16c
Merge pull request #5995 from vector-im/feature/adm/ftue-sign-in 
FTUE - Sign in
 2022-05-25 17:30:03 +01:00
ericdecanini
927f526c6c Post merge conflict reformatting 2022-05-25 17:35:54 +02:00
ericdecanini
8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
 2022-05-25 17:35:31 +02:00
Valere
8b2d6c8dc2
Merge pull request #6148 from vector-im/feature/bca/fix_decrypt_redacted_event 
Fix decrypting redacted event
 2022-05-25 17:26:54 +02:00
Valere
d7c8abbe98 quick format 2022-05-25 16:52:56 +02:00
Valere
abb335c43d Improve redaction test 2022-05-25 16:52:56 +02:00
Valere
136d2e330a added change log 2022-05-25 16:52:56 +02:00
Valere
755da616ed Fix decrypting redacted event 2022-05-25 16:52:56 +02:00
Valere
52eb48d808
Merge pull request #6077 from vector-im/feature/aris/crypto_replay_attack 
Feature/aris/crypto replay attack
 2022-05-25 16:20:26 +02:00
Michael Kaye
f5b4e897fa
Merge pull request #6099 from vector-im/michaelk/retry_keys_backup_test 
Track number of retries of tests,retry KeysBackupTest, Ignore E2eeSanityTests
 2022-05-25 14:16:47 +01:00
Maxime NATUREL
c8fb034c57
Merge pull request #6128 from vector-im/feature/mna/PSF-999-auto-refresh-db 
[Location sharing] - Update DB entity when a live is timed out (PSF-999)
 2022-05-25 14:59:54 +02:00
Johannes Marbach
f5a621a6d5
Merge pull request #6140 from vector-im/johannes/widget-screen-rotation 
Prevent widget web view from reloading on screen / orientation change (PSF-1034)
 2022-05-25 13:42:24 +02:00
Adam Brown
8c44c9828c fixing listener import 2022-05-25 10:22:27 +01:00
Adam Brown
8b2132c6dd fixing detekt/formatting issues 2022-05-25 10:22:27 +01:00
Adam Brown
137fe89938 hiding username/password fields when the homeserver doesn't support them and showing SSO options when available 2022-05-25 10:22:27 +01:00
Adam Brown
bc2a99c3cf matching variable name with type 2022-05-25 10:22:27 +01:00
Adam Brown
b76899a6e0 adding changelog entry 2022-05-25 10:22:27 +01:00
Adam Brown
610c1d1150 extracting sso buttons render method to reduce duplication 2022-05-25 10:22:27 +01:00
Adam Brown
d86c12dc7a extracting duplicated field resetting logic 2022-05-25 10:22:27 +01:00
Adam Brown
fb1a686f90 extracting the login error handling to its own class 2022-05-25 10:22:27 +01:00
Adam Brown
d1bafc531e removing input footer fields, they're only needed for sign up, not login 2022-05-25 10:22:27 +01:00
Adam Brown
b2af918969 using correct copy for the login validation errors 
- extracts helpers to make the logic more declarative
 2022-05-25 10:22:27 +01:00
Adam Brown
25b81c2952 creating subtype for register/login authentication types 2022-05-25 10:22:26 +01:00
Adam Brown
c3ce887e33 minor refactors 
- extracting login fields validation
- renaming xml fields to login
- renaming direct login property to matrixId
 2022-05-25 10:17:51 +01:00
Adam Brown
b3bbb0329e directing to the combined login after homeserver check 
- also removes the subtitle view which is not needed for login
 2022-05-25 10:17:51 +01:00
Adam Brown
4b6f74364d adding dedicated login action 2022-05-25 10:17:51 +01:00
Adam Brown
34e97112a4 adding feature flag and redirecting the sign in flow 
- temporarily to the combined register fragment
 2022-05-25 10:17:51 +01:00
Adam Brown
fdaaed430e
Merge pull request #6131 from vector-im/dependabot/gradle/vanniktechEmoji-0.13.0 
Bump vanniktechEmoji from 0.9.0 to 0.13.0
 2022-05-25 10:14:56 +01:00
Maxime NATUREL
791d4fb1e8 Improve computation of the work name to limit its length 2022-05-25 11:10:54 +02:00
Maxime NATUREL
8864a3cf2c Using replace instead of keep strategy for the worker 2022-05-25 11:06:02 +02:00
Maxime NATUREL
cfdc18d421 Improve code readability in aggregation processor 2022-05-25 11:05:28 +02:00
Maxime NATUREL
b081429725 Replace getOrCreate() by get() in worker 2022-05-25 10:59:08 +02:00
Adam Brown
ae9922a731
Merge pull request #6136 from vector-im/feature/adm/foss-avoid-gms-location-provider 
Excluding the gms play-service-location from maplibre for fdroid builds
 2022-05-25 08:59:18 +01:00
Michael Kaye
e1dde0cef1
Merge pull request #6141 from vector-im/michaelk/downgrade_gradle_dependency 
Downgrade gradle from 7.2.0 to 7.1.3
 2022-05-24 18:02:40 +01:00
Michael Kaye
5faa2ff205 Add comment linking to an issue 2022-05-24 16:53:17 +01:00
Michael Kaye
20422a5451 towncrier 2022-05-24 16:40:03 +01:00
Michael Kaye
5766414d79 Downgrade gradle from 7.2.0 to 7.1.3 2022-05-24 16:36:14 +01:00
dependabot[bot]
d4af2a7a87
Bump vanniktechEmoji from 0.9.0 to 0.13.0 
Bumps `vanniktechEmoji` from 0.9.0 to 0.13.0.

Updates `emoji-material` from 0.9.0 to 0.13.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.13.0)

Updates `emoji-google` from 0.9.0 to 0.13.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.13.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-24 15:26:52 +00:00
Adam Brown
b4b2b97eb1
Merge pull request #6068 from vector-im/dependabot/gradle/vanniktechEmoji-0.12.0 
Bump vanniktechEmoji from 0.9.0 to 0.12.0
 2022-05-24 16:26:06 +01:00
Johannes Marbach
7913a42664 Add changelog file 2022-05-24 16:36:26 +02:00
Johannes Marbach
f95853a7b3 Prevent widget web view from reloading on screen / orientation change (PSF-1034) 
Signed-off-by: Johannes Marbach <johannesm@element.io>
 2022-05-24 16:29:38 +02:00
ericdecanini
c3209d7049 Manually fixes more formatting issues 2022-05-24 15:31:20 +02:00
ericdecanini
6c21a6b48d Separates some method parameters 2022-05-24 15:26:24 +02:00
Adam Brown
bec72264cd excluding the gms play-service-location optional transistive dependency for the fdroid variant 
- fixes fdroid being unable to compile the project due to a non foss dependency
 2022-05-24 10:10:03 +01:00
Adam Brown
a59b8bf50c
Merge pull request #6065 from vector-im/feature/adm/matrix-org-ordering 
FTUE - Only override sign up steps for `matrix.org`
 2022-05-23 21:24:48 +01:00
Maxime NATUREL
b05fc763ae Rely only on isActive field on UI side 2022-05-23 17:34:52 +02:00
Maxime NATUREL
683a9cdfff Schedule work during aggregation 2022-05-23 17:34:52 +02:00
Maxime NATUREL
47eb7173f0 Creation of a worker to deactivate a live after timeout 2022-05-23 17:34:52 +02:00
Maxime NATUREL
d76b93ced3 Adding comment on isActive field 2022-05-23 17:34:51 +02:00