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

feat(e2ei): respect e2ei during login and mls client creation (WPB-5851) #2621

Merged
merged 36 commits into from
Jan 26, 2024

Conversation

mchenani
Copy link
Contributor

@mchenani mchenani commented Jan 25, 2024

TaskWPB-5851 [Android] Respect E2EI when Creating New MLS Client


PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Respecting E2EI state during MLS client registration and login.

Testing

Test Coverage (Optional)

WIP

  • I have added automated test to this contribution

How to Test

Have a team that has e2ei enabled, during login the user required to enroll certificate first.


PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

mchenani and others added 23 commits January 17, 2024 10:49
…om:wireapp/wire-android-reloaded into feat/e2ei/respect-e2ei-creating-mls-client
…oaded into feat/e2ei/respect-e2ei-creating-mls-client

# Conflicts:
#	kalium
…2ei/respect-e2ei-creating-mls-client-fixed-certificate-status
…oaded into feat/e2ei/respect-e2ei-creating-mls-client

# Conflicts:
#	kalium
@AndroidBob
Copy link
Collaborator

Build 2723 failed.

…oaded into feat/e2ei/respect-e2ei-creating-mls-client

# Conflicts:
#	app/src/main/kotlin/com/wire/android/feature/e2ei/OAuthUseCase.kt
#	kalium
@AndroidBob
Copy link
Collaborator

Build 2758 failed.

@mchenani mchenani changed the base branch from develop to release/candidate January 26, 2024 09:48
Copy link

Ups 🫰🟨

This PR is too big. Please try to break it up into smaller PRs.

…ndroid-reloaded into feat/e2ei/respect-e2ei-creating-mls-client

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
#	app/src/main/res/drawable/ic_launcher_wire_logo.xml
#	app/src/main/res/values-af/strings.xml
#	app/src/main/res/values-ar/strings.xml
#	app/src/main/res/values-bn/strings.xml
#	app/src/main/res/values-ca/strings.xml
#	app/src/main/res/values-cs/strings.xml
#	app/src/main/res/values-da/strings.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-el/strings.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-et/strings.xml
#	app/src/main/res/values-fa/strings.xml
#	app/src/main/res/values-fi/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-he/strings.xml
#	app/src/main/res/values-hi/strings.xml
#	app/src/main/res/values-hr/strings.xml
#	app/src/main/res/values-hu/strings.xml
#	app/src/main/res/values-id/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-ja/strings.xml
#	app/src/main/res/values-ko/strings.xml
#	app/src/main/res/values-lt/strings.xml
#	app/src/main/res/values-mk/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values-no/strings.xml
#	app/src/main/res/values-pa/strings.xml
#	app/src/main/res/values-pl/strings.xml
#	app/src/main/res/values-pt/strings.xml
#	app/src/main/res/values-ro/strings.xml
#	app/src/main/res/values-ru/strings.xml
#	app/src/main/res/values-si/strings.xml
#	app/src/main/res/values-sk/strings.xml
#	app/src/main/res/values-sl/strings.xml
#	app/src/main/res/values-sr/strings.xml
#	app/src/main/res/values-sv/strings.xml
#	app/src/main/res/values-tr/strings.xml
#	app/src/main/res/values-uk/strings.xml
#	app/src/main/res/values-vi/strings.xml
#	app/src/main/res/values-zh/strings.xml
#	app/src/test/kotlin/com/wire/android/ui/home/messagecomposer/location/LocationPickerViewModelTest.kt
@AndroidBob
Copy link
Collaborator

Build 2760 failed.

@AndroidBob
Copy link
Collaborator

Build 2762 failed.

Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@mchenani mchenani enabled auto-merge (squash) January 26, 2024 11:56
@AndroidBob
Copy link
Collaborator

Build 2768 succeeded.

The build produced the following APK's:

Copy link
Contributor

@borichellow borichellow left a comment

Choose a reason for hiding this comment

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

nice one! Just 1 small suggestion

@@ -25,6 +25,6 @@ object AndroidSdk {

object AndroidApp {
const val id = "com.wire.android"
const val versionName = "4.6.0"
const val versionName = "4.7.0"
Copy link
Member

Choose a reason for hiding this comment

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

We shouldn't change the version

app/src/main/AndroidManifest.xml Show resolved Hide resolved
@mchenani mchenani merged commit 4a50f65 into release/candidate Jan 26, 2024
15 checks passed
@mchenani mchenani deleted the feat/e2ei/respect-e2ei-creating-mls-client branch January 26, 2024 13:17
@echoes-hq echoes-hq bot added the echoes: technical-roadmap Work contributing to the Technical Roadmap, to improve our velocity or reduce the technical debt. label Aug 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
echoes: technical-roadmap Work contributing to the Technical Roadmap, to improve our velocity or reduce the technical debt. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants