[PR #4854] [MERGED] PM-18681 - Update Showing Coach Mark Tour Logic To Account for Org Only Policy #5258

Closed
opened 2025-11-26 23:56:32 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4854
Author: @phil-livefront
Created: 3/12/2025
Status: Merged
Merged: 3/12/2025
Merged by: @phil-livefront

Base: mainHead: phil/PM-18681-Update-Showing-Coach-Mark-Tour-Logic-To-Only-Consider-User's-Personal-Vault


📝 Commits (5)

  • 74f4df6 PM-18681 - Update Showing Coach Mark Tour Logic To Only Consider User's Personal Vault
  • 053c33f Merge branch 'main' into phil/PM-18681-Update-Showing-Coach-Mark-Tour-Logic-To-Only-Consider-User's-Personal-Vault
  • 3b3cdfe PM-18681 - add logic to handle org only policy users seeing the coachmarks
  • 6c8d020 fix lint errors
  • 2ca480b Merge branch 'main' into phil/PM-18681-Update-Showing-Coach-Mark-Tour-Logic-To-Only-Consider-User's-Personal-Vault

📊 Changes

2 files changed (+78 additions, -8 deletions)

View changed files

📝 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerImpl.kt (+13 -6)
📝 app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt (+65 -2)

📄 Description

🎟️ Tracking

PM-16881

📔 Objective

  • The first part of this ticket was merged in this PR but missed a section on taking into account the ONLY_ORG policy. This PR makes sure that a user in an organization who has access to org items but has no individual vault due to org policy does see the Tours

📸 Screenshots

Screenshot_20250312_141930

Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/4854 **Author:** [@phil-livefront](https://github.com/phil-livefront) **Created:** 3/12/2025 **Status:** ✅ Merged **Merged:** 3/12/2025 **Merged by:** [@phil-livefront](https://github.com/phil-livefront) **Base:** `main` ← **Head:** `phil/PM-18681-Update-Showing-Coach-Mark-Tour-Logic-To-Only-Consider-User's-Personal-Vault` --- ### 📝 Commits (5) - [`74f4df6`](https://github.com/bitwarden/android/commit/74f4df63c4cf5efe26e876bd1d65511475eb9f95) PM-18681 - Update Showing Coach Mark Tour Logic To Only Consider User's Personal Vault - [`053c33f`](https://github.com/bitwarden/android/commit/053c33f005d73e0bf1bd7d5e8a67da8e08feda57) Merge branch 'main' into phil/PM-18681-Update-Showing-Coach-Mark-Tour-Logic-To-Only-Consider-User's-Personal-Vault - [`3b3cdfe`](https://github.com/bitwarden/android/commit/3b3cdfedba7ca0370c559c18c1dcffa8fa335893) PM-18681 - add logic to handle org only policy users seeing the coachmarks - [`6c8d020`](https://github.com/bitwarden/android/commit/6c8d02034e5b3f7fd91c8b967f17167b02d34c49) fix lint errors - [`2ca480b`](https://github.com/bitwarden/android/commit/2ca480b0042a3ce7a2769edab8b6331517a4cba6) Merge branch 'main' into phil/PM-18681-Update-Showing-Coach-Mark-Tour-Logic-To-Only-Consider-User's-Personal-Vault ### 📊 Changes **2 files changed** (+78 additions, -8 deletions) <details> <summary>View changed files</summary> 📝 `app/src/main/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerImpl.kt` (+13 -6) 📝 `app/src/test/java/com/x8bit/bitwarden/data/platform/manager/FirstTimeActionManagerTest.kt` (+65 -2) </details> ### 📄 Description ## 🎟️ Tracking [PM-16881](https://bitwarden.atlassian.net/browse/PM-18681) ## 📔 Objective - The first part of this ticket was merged in this [PR](https://github.com/bitwarden/android/pull/4821) but missed a section on taking into account the `ONLY_ORG` policy. This PR makes sure that a user in an organization who has access to org items but has no individual vault due to org policy does see the Tours ## 📸 Screenshots ![Screenshot_20250312_141930](https://github.com/user-attachments/assets/f01c33ea-60d7-456f-afb6-495b628cc512) ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes [PM-16881]: https://bitwarden.atlassian.net/browse/PM-16881?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-26 23:56:32 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5258