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

19714 Commits

Author SHA1 Message Date
Hugh Nimmo-Smith 7e24f6a2b0 Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-17 13:40:42 +01:00
Onuray Sahin d3a24fec9b Lint fix. 2022-10-17 15:35:21 +03:00
Hugh Nimmo-Smith e89774e160 Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-17 13:26:35 +01:00
Hugh Nimmo-Smith eb30ef166a Improve 404 handling 2022-10-17 12:32:40 +01:00
Hugh Nimmo-Smith 1976451c81 Lint 2022-10-17 12:23:14 +01:00
Onuray Sahin 91bb86d3c6 Code review fixes. 2022-10-17 14:16:29 +03:00
Hugh Nimmo-Smith fb86ab70a2 Comments and error mapping 2022-10-17 12:05:32 +01:00
Hugh Nimmo-Smith 4306c57236 Thread safe use of OlmSAS 2022-10-17 12:01:12 +01:00
Hugh Nimmo-Smith 506fa729ea Cleanup 2022-10-17 11:50:56 +01:00
Hugh Nimmo-Smith 48de8f4e34 Fix bad merge 2022-10-17 11:48:35 +01:00
Hugh Nimmo-Smith 3be4a0ca21 Remove unused val 2022-10-17 11:25:09 +01:00
Hugh Nimmo-Smith 33be5c257d Refactor into dedicated files and companion objects 2022-10-17 11:24:48 +01:00
Hugh Nimmo-Smith ed6bc01bef Resolve TODO 2022-10-17 10:54:28 +01:00
Hugh Nimmo-Smith d979b50b2c Logging cleanup 2022-10-17 10:52:24 +01:00
Onuray Sahin 8547fee562 Enable qr code login by default. 2022-10-17 12:44:25 +03:00
Hugh Nimmo-Smith a3fc785945 Fix missing param 2022-10-14 18:52:42 +01:00
Hugh Nimmo-Smith bfe3daa37f Fix compile error from bad merge 2022-10-14 17:25:06 +01:00
Hugh Nimmo-Smith fdc55965ca Linting 2022-10-14 17:23:26 +01:00
Hugh Nimmo-Smith dc9b41d19a Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-14 17:12:08 +01:00
Onuray Sahin 6c10a9bf2d Code review fixes. 2022-10-14 18:10:18 +03:00
Onuray Sahin e83bdc3779 Use correct homeserver url to check qr code login support. 2022-10-14 17:46:14 +03:00
Hugh Nimmo-Smith 6426ff40d3 Linting 2022-10-14 14:18:50 +01:00
Hugh Nimmo-Smith 411b766890 Refactor to camelcase 2022-10-14 14:17:19 +01:00
Hugh Nimmo-Smith f999e72759 Changelog 2022-10-14 14:01:13 +01:00
Hugh Nimmo-Smith 4325600d27 Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-14 13:57:04 +01:00
Hugh Nimmo-Smith e439b72e48 Handle master key trust during E2EE set up 2022-10-14 13:46:57 +01:00
Onuray Sahin b04ad4915f Add changelog. 2022-10-14 15:38:28 +03:00
Onuray Sahin 5953346b3d Merge branch 'develop' into feature/ons/qr_code_login_ui 
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
 2022-10-14 15:17:55 +03:00
Hugh Nimmo-Smith 626e3dbd10
Merge pull request #7358 from vector-im/feature/hughns/qr_code_login_task 2022-10-14 09:38:07 +01:00
dependabot[bot] 989d4a6ed2
Bump flipper from 0.169.0 to 0.170.0 (#7348) 
Bumps `flipper` from 0.169.0 to 0.170.0.

Updates `flipper` from 0.169.0 to 0.170.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.169.0...v0.170.0)

Updates `flipper-network-plugin` from 0.169.0 to 0.170.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.169.0...v0.170.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-14 10:37:11 +02:00
Jorge Martin Espinosa 81ef1415dc
Apply design changes to WYSIWYG editor (#7354) 
* Apply design changes to WYSIWYG editor

* Add changelog

* Remove unneeded attribute in RichTextComposerLayout

* Fix lint issues

* Fix style naming issue.

* Change rich text editor border radius depending on the number of lines.

* Replace standby voice recorder icon.
 2022-10-14 09:59:43 +02:00
dependabot[bot] b679727246
Bump dokka-gradle-plugin from 1.7.10 to 1.7.20 (#7329) 
Bumps dokka-gradle-plugin from 1.7.10 to 1.7.20.

---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:dokka-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-14 09:48:15 +02:00
Hugh Nimmo-Smith de4232dff5 Fix logic for showing confirm button 2022-10-14 06:17:48 +01:00
Hugh Nimmo-Smith d72371906e Add flag to allow QR login on all servers + split flag for showing in device manager 2022-10-14 06:17:48 +01:00
Hugh Nimmo-Smith efa70fa0ff Revert "Retry scanning if not a QR code" 
This reverts commit 87956e9438.
 2022-10-14 06:17:48 +01:00
Hugh Nimmo-Smith 4c7c86100f Fix logic for showing confirm button 2022-10-14 02:04:08 +01:00
Hugh Nimmo-Smith 343cf74871 Add flag to allow QR login on all servers + split flag for showing in device manager 2022-10-14 01:45:03 +01:00
Hugh Nimmo-Smith c00ce91214 Linting 2022-10-14 01:11:25 +01:00
Hugh Nimmo-Smith c18439f99b Refactor code into api from internal 2022-10-14 01:07:19 +01:00
Hugh Nimmo-Smith 5abb786b6b Fix copyright on SDK 2022-10-14 00:59:31 +01:00
Hugh Nimmo-Smith 385140aaf1 Merge branch 'feature/hughns/qr_code_login' of https://github.com/vector-im/element-android into feature/hughns/qr_code_login 2022-10-14 00:44:09 +01:00
Hugh Nimmo-Smith f04f0e6fac Revert "Revert "Partial implementation of QR login logic"" 
This reverts commit e305478dda.
 2022-10-13 22:42:58 +01:00
Hugh Nimmo-Smith 370652c04b Revert "Revert "Implementations of MSC3886 and MSC3903"" 
This reverts commit 489dfd7354.
 2022-10-13 22:37:19 +01:00
Hugh Nimmo-Smith 958ee2d356 Revert "Revert "Retry scanning if not a QR code"" 
This reverts commit 9429a4f22a.
 2022-10-13 22:32:02 +01:00
Hugh Nimmo-Smith 6399032312 Fix bad merge 2022-10-13 22:23:26 +01:00
Hugh Nimmo-Smith 7bc0bd3b57 Reduce logging 2022-10-13 22:15:07 +01:00
Hugh Nimmo-Smith dd47297dfd QR login + E2EE set up 2022-10-13 22:14:55 +01:00
Hugh Nimmo-Smith 9a72d6529b Support for navigation to home screen 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith 991eeb1de6 Map for soft logout 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith bc0843eddf Another default value fix 2022-10-13 22:13:56 +01:00