filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,959 Commits 7 Branches 127 Tags
Commit Graph

20959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxime NATUREL
e986d7805e Fixing after rebase issues 2022-09-29 14:06:44 +02:00
Maxime NATUREL
d1bc7d591f Revert changes to translations 2022-09-29 14:06:44 +02:00
Maxime NATUREL
87e1b53c6e Fix coding style 2022-09-29 14:06:44 +02:00
Maxime NATUREL
51532687b9 Learn more in session overview screen 2022-09-29 14:06:44 +02:00
Maxime NATUREL
400b1b0697 Adding handle at top 2022-09-29 14:06:44 +02:00
Maxime NATUREL
97cdda45d6 Adding close button 2022-09-29 14:06:44 +02:00
Maxime NATUREL
648311e2b1 Show basic bottom sheet when pressing learn more link from other sessions section 2022-09-29 14:06:44 +02:00
Maxime NATUREL
1d11eae0cc Removing learn more link from security header 2022-09-29 14:06:44 +02:00
Maxime NATUREL
70a5093e3d Adding string resources 2022-09-29 14:06:44 +02:00
Maxime NATUREL
6eb5d98180 Add changelog entry 2022-09-29 14:06:43 +02:00
SpiritCroc
4b32e30cff Update LinearLayoutManager from upstream androidx 
From https://android.googlesource.com/platform/frameworks/support

Current changes after 1.2.0:
09993fadf2b02004c3fb907266f20519fee154b7..1c6478826f160c1bb67cf5c219083fbc79d2da36

Particularly interesting from the commit history:
"Fixed anchor bug when stack from end."

Change-Id: I8dc69d8e9ac74a5c5e1ba5f59e0b6223b275f1eb
 2022-09-29 13:54:15 +02:00
SpiritCroc
3e8b320fef Emoji verification: green instead of accent to accept 
Change-Id: I4fe7e8e8ec8c11447cbcb97aa0feabfb3f92aa48
 2022-09-29 12:50:16 +02:00
Onuray Sahin
38cd2be332 Fix broken tests. 2022-09-29 13:28:46 +03:00
Onuray Sahin
1238f31cdf
Merge pull request #7209 from vector-im/feature/ons/extend_user_agent 
[Device Manager] Extend user agent to include device information (PSG-755)
 2022-09-29 13:11:20 +03:00
Benoit Marty
214867ad0e
Merge pull request #7248 from vector-im/feature/bca/hotfix_1.5.1_merge 
Feature/bca/hotfix 1.5.1 merge back from main
 2022-09-29 11:58:36 +02:00
Maxime NATUREL
75a381ea0d
Merge pull request #7243 from vector-im/feature/mna/device-manager-signout-session 
[Device management] Sign out a session (PSG-742)
 2022-09-29 11:43:56 +02:00
Benoit Marty
11cdf8ea9c
Merge pull request #7223 from vector-im/feature/bca/fix_new_layout_list_flickering 
Fix new layout flicker/leaks
 2022-09-29 11:39:34 +02:00
Onuray Sahin
8663fe8c74 Add tests for unknown user agents. 2022-09-29 12:35:15 +03:00
Onuray Sahin
0f0ec54ed1 Code review fixes. 2022-09-29 12:20:01 +03:00
Onuray Sahin
4c173a79ae Lint fixes. 2022-09-29 11:40:15 +03:00
Onuray Sahin
c16b5d674c Add more user agent support. 2022-09-29 11:36:38 +03:00
Maxime NATUREL
082fa1e69e Adding confirmation dialog for all type of sessions 2022-09-29 10:27:13 +02:00
Valere
803eff9ad1 Fix not exhaustive when 2022-09-29 09:45:18 +02:00
Benoit Marty
f4674b17d6 Fix compilation warning. The Jitsi library does not include these permissions anymore. 2022-09-29 09:44:46 +02:00
Valere
8132a7902b post merge code quality 2022-09-29 09:21:06 +02:00
Valere
ce86e29122 Merge branch 'main' into develop 2022-09-28 18:16:39 +02:00
Onuray Sahin
7a36b10d40 Add changelog. 2022-09-28 18:22:24 +03:00
Onuray Sahin
5666383134 Add unit test for desktop and web user agents. 2022-09-28 18:19:25 +03:00
SpiritCroc
bf78ec8964 Increment version 
Change-Id: I2bc1e70cf0eaec2180b569e608f724d3ef145c26
sc_v1.5.1.sc60 		2022-09-28 17:05:14 +02:00
Maxime NATUREL
e47bf2b200 Adding unit tests for reAuth needed case 2022-09-28 16:45:06 +02:00
Valere
aa42746034 version 1.5.1 2022-09-28 16:28:43 +02:00
Valere
5c442296ef Security fix CVE-2022-39246 CVE-2022-39248 2022-09-28 16:26:47 +02:00
SpiritCroc
bee145f951 [merge] Add missed MessageActions shield 
Change-Id: I3cf37f8ecac6c8b581c28f39fb4bc008435d34cb
 2022-09-28 15:19:07 +02:00
Onuray Sahin
41643ffb53 Add unit test for iOS user agents. 2022-09-28 15:00:16 +03:00
Onuray Sahin
2bcf0c307d Add unit test for Android user agents. 2022-09-28 14:59:56 +03:00
Onuray Sahin
04a305b403 Refactor user agent parsing. 2022-09-28 14:32:20 +03:00
SpiritCroc
0b917fc935 [sec-merge related] Render encryption warnings for all layouts again 
Change-Id: I3af2a350af2988803f7114d1652a85dd3f75681d
 2022-09-28 11:58:01 +02:00
Adam Brown
5f778fff01 re-enabling the jetifier, it's required by the autocomplete library 
- the upstream library source doesn't require the jetifier however it hasn't been released
 2022-09-28 10:09:13 +01:00
SpiritCroc
97d0dbcfb8 [merge] Fix NoticeItem compile 
Change-Id: I536e759913715c0aa627fc60cda9a5453bc8a243
 2022-09-28 10:52:17 +02:00
SpiritCroc
833bb110d8 Automatic SchildiChat string correction 
Change-Id: I6a3d058924b84ab17f4cc548dc09937343488630
 2022-09-28 10:41:17 +02:00
SpiritCroc
b1971fcae3 Automatic upstream merge postprocessing 
Change-Id: Ie55a039e5367f704efa30ccf19d020459bd1b491
 2022-09-28 10:41:16 +02:00
SpiritCroc
87eaf85224 Security patch v1.5.1 
Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt

Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
 2022-09-28 10:41:00 +02:00
SpiritCroc
479b6ae004 [TMP] Automatic upstream merge preparation 
Change-Id: I17e23cf7e1efb0d04021a57a137954ab6238c082
 2022-09-28 10:25:21 +02:00
SpiritCroc
ca11f4c4dd Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I761ae27a08413c6da4e586d013fdcc802643acf2
 2022-09-28 10:25:21 +02:00
Benoit Marty
0c4510250b
Merge pull request #7241 from vector-im/feature/bma/gradle_doctor 
Set up Gradle doctor
 2022-09-27 18:48:05 +02:00
dependabot[bot]
0d6cbbdb5d
Bump dependency-check-gradle from 7.2.0 to 7.2.1 
Bumps dependency-check-gradle from 7.2.0 to 7.2.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-27 16:41:13 +00:00
dependabot[bot]
8ca390a2a8
Bump google-services from 4.3.13 to 4.3.14 (#7150) 
Bumps google-services from 4.3.13 to 4.3.14.

---
updated-dependencies:
- dependency-name: com.google.gms:google-services
  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-09-27 17:40:13 +01:00
Benoit Marty
a381f9fc52
Merge pull request #7216 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.56 
Bump libphonenumber from 8.12.55 to 8.12.56
 2022-09-27 18:10:14 +02:00
Nikita Fedrunov
337dce7d9e
tests workflow will now update gradle cache when run against develop (#7238) 2022-09-27 17:45:50 +02:00
dependabot[bot]
d44ad6c351
Bump libphonenumber from 8.12.55 to 8.12.56 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.55 to 8.12.56.
- [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.55...v8.12.56)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-27 14:25:35 +00:00