Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-12-01 16:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,004 Commits 531 Branches 158 Tags 486 MiB
c0f3f394ac
Commit Graph

16004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ganfra
c0f3f394ac Format ktlint 2022-06-09 11:14:49 +02:00
ganfra
87c1d69e26 Cancel verification flow if request sending fails (after retry) 2022-06-09 10:56:41 +02:00
ganfra
e5ce77de34 Use retry through executeRequest instead of Task.executeRetry 2022-06-09 10:55:59 +02:00
ganfra
52ed7c019b
Merge pull request #12 from poljar/fga/feature/finish_backup_recovery_key 
Use backup key directly on olmMachine.
 2022-06-08 12:29:43 +02:00
ganfra
6dda30e97f
Merge pull request #11 from poljar/fga/more_fixing_cleaning 
Fga/more fixing cleaning
 2022-06-08 12:29:18 +02:00
ganfra
b6d73d872b Use backup key directly on olmMachine. 2022-06-07 19:57:44 +02:00
ganfra
abee136867 Ktlint and format 2022-06-06 15:45:06 +02:00
ganfra
327ac2e17b Ignore some failing tests because because using incompatible or unavailable method now. 2022-06-06 15:38:50 +02:00
ganfra
705788394b Fix some more E2EE tests 2022-06-06 14:54:19 +02:00
ganfra
c1961d1fda DeviceId should be non-null so we can inject it properly and OlmMachine too. 2022-06-06 14:53:56 +02:00
ganfra
e519561edf
Merge pull request #9 from poljar/feature/fga/device_verification 
Feature/fga/device verification
 2022-06-02 15:42:42 +02:00
ganfra
14ed4692dc
Merge branch 'rust' into feature/fga/device_verification 2022-06-02 15:42:25 +02:00
ganfra
022057dd6f
Merge pull request #10 from poljar/feature/fga/backup_recovery_key 
Feature/fga/backup recovery key
 2022-06-02 15:39:10 +02:00
ganfra
eb0faa3484 Fix some E2E tests 2022-06-02 15:38:28 +02:00
ganfra
47bc597b99 OKHttp: rise maxRequestsPerHost to 64 (instead of default 5) 2022-06-02 15:38:19 +02:00
ganfra
797dc9ccbb Crypto: fix tracking onRoomMembershipEvent 2022-06-02 15:36:06 +02:00
ganfra
c253f6b06f Clean more code 2022-05-31 16:16:56 +02:00
ganfra
3e116ad065 Add RequestDeviceVerification method 2022-05-30 19:55:48 +02:00
ganfra
466260bc6a Fix one test and ignore another one 2022-05-30 19:55:37 +02:00
ganfra
b0aae84727 Use BackupRecoveryKey instead of plain string 2022-05-25 14:45:31 +02:00
ganfra
7c76ba8184 Create BackupRecoveryKey wrapper class (to avoid directly expose uniffi generated classes) 2022-05-25 14:45:16 +02:00
ganfra
b57dfee77e Rename RequestProcessor 2022-05-25 14:44:23 +02:00
ganfra
1809d02541 Temporary fix tests (wait for rust) 2022-05-25 14:42:03 +02:00
ganfra
58a1c80334 Fix crash on on crypto store open/close 2022-05-20 12:47:47 +02:00
ganfra
a6bc730c32
Merge pull request #8 from poljar/feature/fga/rust_upstream_develop 
Feature/fga/rust upstream develop
 2022-05-20 11:26:34 +02:00
ganfra
21ef138e97 Add more logs on verif 2022-05-20 11:21:51 +02:00
ganfra
42e5dcd50a Use release version 0.1.0 of crypto rust component 2022-05-18 19:01:57 +02:00
ganfra
f559db62b9 Fix tests compilation 2022-05-18 18:48:37 +02:00
ganfra
a559ebad64 Some more cleanup 2022-05-13 18:52:54 +02:00
ganfra
7e49bad411 Try to clean up after merging upstream develop 2022-05-13 17:26:26 +02:00
ganfra
725e56db08 Merge branch 'develop' of https://github.com/vector-im/element-android into feature/fga/rust_upstream_develop 2022-05-12 19:39:10 +02:00
ganfra
559404f953
Merge pull request #7 from poljar/feature/fga/suspend_api 
Cleaning up some code and adding more suspend (removing most runBlocking)
 2022-05-12 12:06:42 +02:00
ganfra
677c879979 Fix some code quality 2022-05-12 11:59:21 +02:00
Benoit Marty
4309fdba7e
Merge pull request #6021 from vector-im/feature/bma/finish_remove_flair 
Remove remaining dead code about flair
 2022-05-12 11:31:42 +02:00
Adam Brown
e56f6e910c
Merge pull request #6030 from vector-im/dependabot/gradle/mockk-1.12.4 
Bump mockk from 1.12.3 to 1.12.4
 2022-05-12 08:42:33 +01:00
dependabot[bot]
d3ecc8e5c3
Bump mockk from 1.12.3 to 1.12.4 
Bumps `mockk` from 1.12.3 to 1.12.4.

Updates `mockk` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

Updates `mockk-android` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-11 23:11:45 +00:00
Benoit Marty
cd509accdb
Merge pull request #5936 from hanthor/develop 
Added themed icon for Android 13
 2022-05-11 17:34:38 +02:00
Benoit Marty
deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0 
Bump preference-ktx from 1.1.1 to 1.2.0
 2022-05-11 16:17:17 +02:00
Benoit Marty
1ef5416b50 Use the correct lint rule to ignore. 2022-05-11 15:02:01 +02:00
Benoit Marty
a963596a59
Merge pull request #6022 from vector-im/feature/bma/gh_pages 
Gh pages
 2022-05-11 14:28:19 +02:00
Michael Kaye
3769dad30e Github action should refer to result is 'success', not status is "success". 2022-05-11 11:09:01 +01:00
Valere
304cb07858
Merge pull request #5559 from vector-im/feature/bca/crypto_better_key_share 
Update/Revise SDK to implement reference flowchart for key sharing/forwarding + use backup
 2022-05-11 12:05:58 +02:00
Benoit Marty
79982af8d1 Revert "Temporary trigger the doc generation on pull request to check the workflow" 
This reverts commit 7f2484ca4c.
 2022-05-11 11:47:36 +02:00
Valere
3948f263df fix method visibility 2022-05-11 11:16:00 +02:00
Benoit Marty
7f2484ca4c Temporary trigger the doc generation on pull request to check the workflow 2022-05-11 11:15:46 +02:00
Benoit Marty
27dcb6ef9c Add a note when generated from this project. 
A change will have to be done on the SDK project to remove this line before generated the documentation.
 2022-05-11 11:14:45 +02:00
Benoit Marty
a7d85cf9fd Setup GitHub action to generate the documentation of the SDK from develop branch 2022-05-11 11:00:24 +02:00
Valere
992f477ab1 use clock time instead of system 2022-05-11 10:58:13 +02:00
Benoit Marty
2ec86fe9e6 Remove remaining dead code about flair 
Finish the work started at #5664
 2022-05-11 10:52:55 +02:00
Valere
546d6fe56d post merge fix 2022-05-11 10:42:02 +02:00