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 v1.6.22 #1109

Draft
wants to merge 37 commits into
base: develop
Choose a base branch
from

Conversation

yostyle
Copy link
Contributor

@yostyle yostyle commented Sep 26, 2024

Type of change

  • Feature
  • Bugfix
  • Technical
  • Other :

Content

Motivation and context

Screenshots / GIFs

Tests

  • Step 1
  • Step 2
  • Step ...

Tested devices

  • Physical
  • Emulator
  • OS version(s):

Checklist

ganfra and others added 30 commits July 25, 2024 11:37
"See and managed addresses" typo fixed.
Bumps [org.matrix.rustcomponents:crypto-android](https://github.com/matrix-org/matrix-rust-components-kotlin) from 0.4.1 to 0.4.3.
- [Release notes](https://github.com/matrix-org/matrix-rust-components-kotlin/releases)
- [Commits](matrix-org/matrix-rust-components-kotlin@crypto-v0.4.1...crypto-v0.4.3)

---
updated-dependencies:
- dependency-name: org.matrix.rustcomponents:crypto-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Update strings.xml to fix the "see and managed addresses[…]" typo.
@yostyle yostyle self-assigned this Sep 26, 2024
Copy link

gitguardian bot commented Sep 26, 2024

⚠️ GitGuardian has uncovered 9 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 GitGuardian status Secret Commit Filename
867363 Triggered Generic Password 5908cd5 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt View secret
867363 Triggered Generic Password ac01523 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt View secret
867363 Triggered Generic Password 9a4602b matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt View secret
867363 Triggered Generic Password c8ab88b matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt View secret
13948537 Triggered Generic High Entropy Secret 9585262 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtilsTest.kt View secret
13948537 Triggered Generic High Entropy Secret 797a4f9 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtilsTest.kt View secret
13948537 Triggered Generic High Entropy Secret 6a8e978 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtilsTest.kt View secret
13948537 Triggered Generic High Entropy Secret 9a4602b matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtilsTest.kt View secret
13948537 Triggered Generic High Entropy Secret c8ab88b matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/contentscanner/ScanEncryptorUtilsTest.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.

@tchap-danger-bot
Copy link

Warnings
⚠️

Please add a changelog. See instructions here

⚠️ You seem to have made changes to views. Please consider adding screenshots.
Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against 1b813f5

@tchap-danger-bot
Copy link

Warnings
⚠️

Please add a changelog. See instructions here

⚠️ You seem to have made changes to views. Please consider adding screenshots.
Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against 0724f27

@yostyle yostyle force-pushed the rebase/element-android-1.6.22 branch from 0724f27 to fc3943b Compare September 27, 2024 06:49
@tchap-danger-bot
Copy link

Warnings
⚠️

Please add a changelog. See instructions here

⚠️ You seem to have made changes to views. Please consider adding screenshots.
Messages
📖 This pull request seems relatively large. Please consider splitting it into multiple smaller ones.

Generated by 🚫 dangerJS against fc3943b

@yostyle yostyle changed the title Rebase/element android 1.6.22 Rebase against Element Android v1.6.22 Oct 1, 2024
Copy link
Contributor

@NicolasBuquet NicolasBuquet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Le rebase est ok.
Le code de migration me semble ok.

Un changelog STP.

TODO :

  • mettre en place un waiting screen durant la migration.
  • que se passe-t-il si la migration échoue ?

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.

5 participants