Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase against element android 1.6.8 #998

Merged
merged 71 commits into from
Dec 18, 2023
Merged

Conversation

yostyle
Copy link
Contributor

@yostyle yostyle commented Dec 13, 2023

Type of change

  • Feature
  • Bugfix
  • Technical
  • Other :

Content

Rebase against element android 1.6.8

Motivation and context

Screenshots / GIFs

Tests

  • Step 1
  • Step 2
  • Step ...

Tested devices

  • Physical
  • Emulator
  • OS version(s):

Checklist

bmarty and others added 30 commits October 2, 2023 00:19
…ot ended by another way (#8178)

Add a safe 2 minutes timer.
…ngCall

Ensure the incoming call will not ring forever, in case the call is not ended by another way
…AILED

e: file:///home/runner/actions-runner/_work/element-android/element-android/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersServiceTest.kt:55:5 No value passed for parameter 'homeServerCapabilitiesDataSource'
… ensure that the config is retrieved.

The add pusher worker can be configured before the .well-known config is retrieved.
bmarty and others added 14 commits November 14, 2023 14:32
Update regex for email address to be aligned on RFC 5322
…is testing

When the Unified Push is enabled, the application checks the potential custom gateway before applying it. If an SSL error happens, the application may ignore this error and keep using this custom gateway. The actual SSL check will be done server side where this gateway is actually used.
Unified Push: Ignore the potential SSL error when the custom gateway is testing
It was happening since the application is foregrounded when VectorCallActivity is displayed.
Ensure Background sync is not stopped when there is an active call.
@yostyle yostyle self-assigned this Dec 13, 2023
@tchap-danger-bot
Copy link

Warnings
⚠️

Please add a changelog. See instructions here

Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against 9da0464

@yostyle yostyle changed the title Rebase/element android 1.6.8 Rebase against element android 1.6.8 Dec 13, 2023
@tchap-danger-bot
Copy link

Warnings
⚠️

Please add a changelog. See instructions here

Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against f1b65ae

Copy link

gitguardian bot commented Dec 15, 2023

⚠️ GitGuardian has uncovered 8 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id Secret Commit Filename
7196668 Generic Password 979324d matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt View secret
7196668 Generic Password 77a5767 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt View secret
7196668 Generic Password 552b143 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt View secret
7196668 Generic Password 979324d matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt View secret
7196668 Generic Password 77a5767 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt View secret
7196668 Generic Password 552b143 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt View secret
7196668 Generic Password cd98953 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt View secret
7196668 Generic Password cd98953 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Revoke and rotate the secret.

  2. If possible, rewrite git history with git commit --amend and git push --force.


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@tchap-danger-bot
Copy link

Warnings
⚠️

Please add a changelog. See instructions here

Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against 3f0a923

@tchap-danger-bot
Copy link

Warnings
⚠️

Please add a changelog. See instructions here

Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against 5c96092

@tchap-danger-bot
Copy link

Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against 77fa43d

@tchap-danger-bot
Copy link

Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against 306729c

@tchap-danger-bot
Copy link

Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against cd98953

@yostyle yostyle merged commit 1dff86c into develop Dec 18, 2023
14 of 16 checks passed
@yostyle yostyle deleted the rebase/element-android-1.6.8 branch December 18, 2023 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants