mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-30 16:07:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
15977 commits 161 branches 158 tags 270 MiB
Commit graph

15977 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Benoit Marty
ff386c3de6 Fix lint internal issue: remove object Params. 
GetTurnServerTask.kt: Error: Unexpected failure during lint analysis of GetTurnServerTask.kt (this is a bug in lint or one of the libraries it depends on)
 2022-05-11 10:22:07 +02:00
Travis Ralston
019ec6c1c8
Merge pull request #5997 from vector-im/travis/spec/v1.3-edit/nothreads 
Remove spec v1.3 check for threads
 2022-05-10 14:47:48 -06:00
Travis Ralston
8570a1e0ad Fix missed test 2022-05-10 14:05:06 -06:00
Travis Ralston
f1de116eff add changelog 2022-05-10 13:18:12 -06:00
Valere
12ab4787f1 Merge branch 'develop' into feature/bca/crypto_better_key_share 2022-05-10 19:30:52 +02:00
Benoit Marty
04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21 
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
 2022-05-10 18:23:51 +02:00
Benoit Marty
a3b6bb3ec3 Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 17:46:59 +02:00
Benoit Marty
f54aa60803 Fix test compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 17:00:54 +02:00
Benoit Marty
fe8648c7f8 Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 16:19:53 +02:00
Benoit Marty
67cd82385a Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead 2022-05-10 16:07:24 +02:00
Benoit Marty
5c7ee5ef58 Fix compilation warning after bump kotlin-gradle-plugin from 1.6.0 to 1.6.21 2022-05-10 16:05:46 +02:00
Benoit Marty
5ad2567633 Fix compilation error after bump preference-ktx from 1.1.1 to 1.2.0 2022-05-10 15:00:44 +02:00
Benoit Marty
eafe65b417
Merge pull request #5831 from emotionalamoeba/develop 
Updated copy and moved override in profile screen
 2022-05-10 14:40:40 +02:00
dependabot[bot]
e65d3ee993
Bump dagger from 2.41 to 2.42 (#5998) 
* Bump dagger from 2.41 to 2.42

Bumps `dagger` from 2.41 to 2.42.

Updates `hilt-android-gradle-plugin` from 2.41 to 2.42
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.41...dagger-2.42)

Updates `dagger` from 2.41 to 2.42
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.41...dagger-2.42)

Updates `dagger-compiler` from 2.41 to 2.42
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.41...dagger-2.42)

Updates `hilt-android` from 2.41 to 2.42
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.41...dagger-2.42)

Updates `hilt-compiler` from 2.41 to 2.42
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.41...dagger-2.42)

---
updated-dependencies:
- dependency-name: com.google.dagger:hilt-android-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:hilt-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* maven central url added to element-android/buld.gradle to buildscript configuration

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NIkita Fedrunov <fedrunov@element.io>
 2022-05-10 14:11:04 +02:00
Adam Brown
ece48baa9d
Merge pull request #5965 from vector-im/feature/adm/matrix-id-certificate 
Handling SSL/TLS errors during WellKnown lookup
 2022-05-10 12:17:48 +01:00
Onuray Sahin
185cd316c9
Merge pull request #5911 from vector-im/feature/ons/voip_screen_sharing 
Screen sharing over WebRTC
 2022-05-10 13:06:33 +03:00
Benoit Marty
a8c39e1d36
Merge pull request #6011 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.4.1 
Bump fragment-ktx from 1.4.0 to 1.4.1
 2022-05-10 11:23:04 +02:00
Onuray Sahin
bb862cc509 Lower alpha of video button while screen sharing. 2022-05-10 11:35:38 +03:00
Benoit Marty
3906ee371b
Merge pull request #6002 from vector-im/dependabot/gradle/lifecycle-2.4.1 
Bump lifecycle from 2.4.0 to 2.4.1
 2022-05-10 10:01:11 +02:00
dependabot[bot]
b566e15438
Bump fragment-ktx from 1.4.0 to 1.4.1 
Bumps fragment-ktx from 1.4.0 to 1.4.1.

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-10 07:59:21 +00:00
Benoit Marty
1e5a53e5c5
Merge pull request #5999 from vector-im/dependabot/gradle/androidx.appcompat-appcompat-1.4.1 
Bump appcompat from 1.4.0 to 1.4.1
 2022-05-10 09:58:57 +02:00
Benoit Marty
396d13c3f9
Merge pull request #6001 from vector-im/dependabot/gradle/androidx.media-media-1.6.0 
Bump media from 1.4.3 to 1.6.0
 2022-05-10 09:58:06 +02:00
Benoit Marty
42513265cf
Merge pull request #6004 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.3 
Bump constraintlayout from 2.1.2 to 2.1.3
 2022-05-10 09:56:50 +02:00
Benoit Marty
e05684d078
Merge pull request #6007 from vector-im/dependabot/gradle/com.google.android.material-material-1.6.0 
Bump material from 1.5.0 to 1.6.0
 2022-05-10 09:55:43 +02:00
Benoit Marty
dbcbf2e711
Merge pull request #6008 from vector-im/dependabot/gradle/org.matrix.android-olm-sdk-3.2.11 
Bump olm-sdk from 3.2.10 to 3.2.11
 2022-05-10 09:53:25 +02:00
Benoit Marty
272135ddf3
Merge pull request #6009 from vector-im/dependabot/gradle/androidx.emoji2-emoji2-1.1.0 
Bump emoji2 from 1.0.1 to 1.1.0
 2022-05-10 09:53:05 +02:00
Benoit Marty
c74edffc36
Merge pull request #6003 from vector-im/dependabot/gradle/com.android.tools.build-gradle-7.2.0 
Bump gradle from 7.0.4 to 7.2.0
 2022-05-10 09:52:48 +02:00