Rebase against Element Android v1.5.2 #770

appndigital · 2022-11-11T18:46:12Z

Type of change

Feature
Bugfix
Technical
Other : rebase

Content

Fix conflicts from rebase 1.4.36

Tested devices

Physical
Emulator
OS version(s): Android 13

Checklist

gitguardian · 2022-11-11T18:46:16Z

⚠️ GitGuardian has uncovered 2 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
4304253	Generic High Entropy Secret	`1ccd080`	vector-config/src/main/java/im/vector/app/config/Config.kt	View secret
4304468	Generic High Entropy Secret	`1ccd080`	vector-config/src/main/java/im/vector/app/config/Config.kt	View secret

🛠 Guidelines to remediate hardcoded secrets

Revoke and rotate the secret.
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!}

vector/src/main/java/im/vector/app/features/home/HomeActivity.kt

vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt

vector/build.gradle

vector-app/build.gradle

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt

Florian14 · 2022-11-14T08:42:20Z

library/ui-strings/src/main/res/values/strings.xml

    <string name="encryption_never_send_to_unverified_devices_in_room">Never send encrypted messages to unverified sessions in this room.</string>
    <string name="some_devices_will_not_be_able_to_decrypt">⚠ There are unverified devices in this room, they won’t be able to decrypt messages you send.</string>
    <string name="room_settings_global_block_unverified_info_text">🔒 You have enabled encrypt to verified sessions only for all rooms in Security Settings.</string>


In Tchap, we replace session with device, please can you update these new strings (we should consider in the future if we want to switch back to session)

I check in the current tchap version : sometimes it uses session, sometimes device.
How do we know which term to use ?
How can I identify new strings ?

coverage.gradle

CONTRIBUTING.md

giomfo · 2022-11-16T18:17:09Z

related to #764

vector/src/main/java/im/vector/app/features/home/HomeActivity.kt

vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt

Florian14

Just two small remarks and it should be fine then

.github/workflows/tests.yml

tchap-danger-bot · 2022-12-01T20:16:15Z

	Warnings
⚠️	Please add a changelog. See instructions here

Generated by 🚫 dangerJS against 9e6902b

tchap-danger-bot · 2022-12-01T20:56:05Z

	Warnings
⚠️	vector/src/main/AndroidManifest.xml#L195 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L195 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L198 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L198 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L252 - Expecting `android:screenOrientation="unspecified"` or `"fullSensor"` for this activity so the user can use the application in any orientation and provide a great experience on Chrome OS devices
⚠️	vector/src/main/AndroidManifest.xml#L252 - Expecting `android:screenOrientation="unspecified"` or `"fullSensor"` for this activity so the user can use the application in any orientation and provide a great experience on Chrome OS devices
⚠️	vector/src/main/AndroidManifest.xml#L261 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L261 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L268 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L268 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L274 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L274 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L396 - Exported receiver does not require permission
⚠️	vector/src/main/AndroidManifest.xml#L396 - Exported receiver does not require permission

Generated by 🚫 dangerJS against 9e6902b

update code from Florian's feedbacks klint fix LFS test Change for S_V2 and small fix on homeactivity Remove snapshot Snapshot back Update contributing Update contributing update contributing Reset contributing Update menu try to fix not runing CI Remove unnecessary test Remove verifyScreenshots Try fixing emulator API Version Try with another api-level Test latest android Test with API 31 Back to api 28 but using MacOS latest Comment failing test back to initial config New test with macos Reset screenshots tests Re-add screenschots test to build.gradle Remove screenshots Comment continue-on-error Try API 29 Try api 33 Add continue on error Reduce CI workers to github VM limit Unit tests - specify variant for every module Ignore flaky test Fix search tests. Add a test for incomplete word. Switch to buildjet Remove emulator build

tchap-danger-bot · 2022-12-04T20:23:06Z

	Warnings
⚠️	Please add a changelog. See instructions here

Generated by 🚫 dangerJS against 1ccd080

tchap-danger-bot · 2022-12-04T21:10:52Z

	Warnings
⚠️	vector/src/main/AndroidManifest.xml#L195 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L195 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L198 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L198 - Consider splitting data tag into multiple tags with individual attributes to avoid confusion
⚠️	vector/src/main/AndroidManifest.xml#L252 - Expecting `android:screenOrientation="unspecified"` or `"fullSensor"` for this activity so the user can use the application in any orientation and provide a great experience on Chrome OS devices
⚠️	vector/src/main/AndroidManifest.xml#L252 - Expecting `android:screenOrientation="unspecified"` or `"fullSensor"` for this activity so the user can use the application in any orientation and provide a great experience on Chrome OS devices
⚠️	vector/src/main/AndroidManifest.xml#L261 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L261 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L268 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L268 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L274 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L274 - Attribute `supportsPictureInPicture` is only used in API level 24 and higher (current min is 21)
⚠️	vector/src/main/AndroidManifest.xml#L396 - Exported receiver does not require permission
⚠️	vector/src/main/AndroidManifest.xml#L396 - Exported receiver does not require permission

Generated by 🚫 dangerJS against 1ccd080

appndigital requested review from Florian14 and giomfo November 11, 2022 18:46

Florian14 reviewed Nov 14, 2022

View reviewed changes

giomfo changed the title ~~Fix conflicts from merge~~ Rebase against Element Android v1.5.2 Nov 16, 2022

tchapgouv deleted a comment from tchap-danger-bot bot Nov 18, 2022

Florian14 reviewed Nov 18, 2022

View reviewed changes

vector/src/main/java/im/vector/app/features/home/HomeActivity.kt Show resolved Hide resolved

Florian14 reviewed Nov 18, 2022

View reviewed changes

vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt Show resolved Hide resolved

Florian14 reviewed Nov 18, 2022

View reviewed changes

appndigital requested a review from Florian14 November 21, 2022 13:16

tchapgouv deleted a comment from tchap-danger-bot bot Nov 23, 2022

This comment was marked as duplicate.

Sign in to view

tchapgouv deleted a comment from tchap-danger-bot bot Nov 25, 2022

tchapgouv deleted a comment from tchap-danger-bot bot Nov 28, 2022

This comment was marked as duplicate.

Sign in to view

Florian14 force-pushed the appndigital/fix-conflicts-1.5.2 branch from 3278947 to b8b8da9 Compare November 29, 2022 20:05

This comment was marked as duplicate.

Sign in to view

Florian14 force-pushed the appndigital/fix-conflicts-1.5.2 branch from 8bac982 to 6cb62bc Compare November 30, 2022 10:27

This comment was marked as duplicate.

Sign in to view

Florian14 reviewed Dec 1, 2022

View reviewed changes

.github/workflows/tests.yml Outdated Show resolved Hide resolved

Florian14 approved these changes Dec 2, 2022

View reviewed changes

appndigital force-pushed the appndigital/fix-conflicts-1.5.2 branch from 9e6902b to 1ccd080 Compare December 4, 2022 20:21

appndigital merged commit 44fbff4 into rebase/element-android-1.5.2 Dec 5, 2022

appndigital deleted the appndigital/fix-conflicts-1.5.2 branch December 5, 2022 08:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebase against Element Android v1.5.2 #770

Rebase against Element Android v1.5.2 #770

appndigital commented Nov 11, 2022

gitguardian bot commented Nov 11, 2022 •

edited

Loading

Florian14 Nov 14, 2022

appndigital Nov 16, 2022

giomfo commented Nov 16, 2022

Florian14 left a comment •

edited

Loading

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

tchap-danger-bot bot commented Dec 1, 2022

tchap-danger-bot bot commented Dec 1, 2022

tchap-danger-bot bot commented Dec 4, 2022

tchap-danger-bot bot commented Dec 4, 2022

Rebase against Element Android v1.5.2 #770

Rebase against Element Android v1.5.2 #770

Conversation

appndigital commented Nov 11, 2022

Type of change

Content

Tested devices

Checklist

gitguardian bot commented Nov 11, 2022 • edited Loading

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

Florian14 Nov 14, 2022

Choose a reason for hiding this comment

appndigital Nov 16, 2022

Choose a reason for hiding this comment

giomfo commented Nov 16, 2022

Florian14 left a comment • edited Loading

Choose a reason for hiding this comment

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

This comment was marked as duplicate.

tchap-danger-bot bot commented Dec 1, 2022

tchap-danger-bot bot commented Dec 1, 2022

tchap-danger-bot bot commented Dec 4, 2022

tchap-danger-bot bot commented Dec 4, 2022

gitguardian bot commented Nov 11, 2022 •

edited

Loading

Florian14 left a comment •

edited

Loading