github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-09 03:33:36 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #4798] [MERGED] [PM-18434] Welcome Authenticator app! #5222

New Issue
Closed
opened 2025-11-26 23:55:51 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:55:51 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/4798
Author: @vvolkgang
Created: 2/26/2025
Status: ✅ Merged
Merged: 2/27/2025
Merged by: @vvolkgang

Base: main ← Head: bwa-monorepo

📝 Commits (10+)

📊 Changes

472 files changed (+41782 additions, -23 deletions)

View changed files

➕ .github/codecov.yml (+2 -0)
📝 .github/workflows/build-authenticator.yml (+280 -4)
📝 .github/workflows/crowdin-pull-authenticator.yml (+48 -5)
📝 .github/workflows/crowdin-push-authenticator.yml (+22 -5)
📝 .github/workflows/scan-authenticator.yml (+67 -4)
📝 .github/workflows/test-authenticator.yml (+74 -5)
➕ .husky/pre-commit (+1 -0)
➕ README-bwa.md (+61 -0)
➕ authenticator/.gitignore (+1 -0)
➕ authenticator/build.gradle.kts (+329 -0)
➕ authenticator/libs/authenticatorbridge-1.0.0-release.aar (+0 -0)
➕ authenticator/proguard-rules.pro (+112 -0)
➕ authenticator/schemas/com.bitwarden.authenticator.data.authenticator.datasource.disk.database.AuthenticatorDatabase/1.json (+82 -0)
➕ authenticator/schemas/com.bitwarden.authenticator.data.authenticator.datasource.disk.database.AuthenticatorDatabase/2.json (+89 -0)
➕ authenticator/src/debug/AndroidManifest.xml (+20 -0)
➕ authenticator/src/debug/google-services.json (+29 -0)
➕ authenticator/src/main/AndroidManifest.xml (+60 -0)
➕ authenticator/src/main/kotlin/com/bitwarden/authenticator/AuthenticatorApplication.kt (+18 -0)
➕ authenticator/src/main/kotlin/com/bitwarden/authenticator/MainActivity.kt (+121 -0)
➕ authenticator/src/main/kotlin/com/bitwarden/authenticator/MainViewModel.kt (+142 -0)

...and 80 more files

📄 Description

🎟️ Tracking

PM-18434

📔 Objective

Brings the Authenticator repo full git history.

Warning

Merge Strategy has to be set to Merge before merging this PR

Both repos were prepared ahead of time with the goal of reducing conflicts, for the remaining files where conflicts were expected the Android repo files were updated so we could just choose this repo version without the need to actually merge lines. This was how each conflict was handled:

Conflict File Resolution
.checkmarx/config.yml Keep Android
.github/CODEOWNERS Keep Android
.github/ISSUE_TEMPLATE/bug.yml Keep Android
.github/ISSUE_TEMPLATE/config.yml Keep Android
.github/renovate.json Keep Android
.gitignore Keep Android
Gemfile Keep Android
Gemfile.lock Keep Android
README.md Keep Android
build.gradle.kts Keep Android
fastlane/Fastfile Keep Android
gradle.properties Keep Android
gradle/libs.versions.toml Keep Android
gradle/wrapper/gradle-wrapper.properties Keep Android
gradlew.bat Keep Android
settings.gradle.kts Keep Android plus the include(:authenticator) from authenticator-android
.github/workflows/build-authenticator.yml Keep authenticator-android
.github/workflows/crowdin-pull-authenticator.yml Keep authenticator-android
.github/workflows/crowdin-push-authenticator.yml Keep authenticator-android
.github/workflows/scan-authenticator.yml Keep authenticator-android
.github/workflows/test-authenticator.yml Keep authenticator-android

⏰ 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/4798 **Author:** [@vvolkgang](https://github.com/vvolkgang) **Created:** 2/26/2025 **Status:** ✅ Merged **Merged:** 2/27/2025 **Merged by:** [@vvolkgang](https://github.com/vvolkgang) **Base:** `main` ← **Head:** `bwa-monorepo` --- ### 📝 Commits (10+) - [`b59814a`](https://github.com/bitwarden/android/commit/b59814aa833941aa71a88d1714f044fc625f2a91) [deps]: Update kotlin (#66) - [`61d8079`](https://github.com/bitwarden/android/commit/61d80793e793d832f1f6753f174f7098f7801882) [deps]: Update ruby to v3.3.1 (#30) - [`51c3f2b`](https://github.com/bitwarden/android/commit/51c3f2b04a77e29d2ef53ee6444d7a9071b37e0d) Add README and code style guidelines (#75) - [`f7ea3a7`](https://github.com/bitwarden/android/commit/f7ea3a7972f825f2f3185dbb0c14167784061a7c) Fix screenshot dimensions in readme (#76) - [`de9aebb`](https://github.com/bitwarden/android/commit/de9aebbda9b7f574dcceb06d20f6d6f43e4de35c) Remove nulab password strength library (#73) - [`26c2229`](https://github.com/bitwarden/android/commit/26c22295fc76b3c93a7773c8dfea351e2accdc8f) Use valid authenticators on Android Q and below (#77) - [`d32ed06`](https://github.com/bitwarden/android/commit/d32ed065160481ad807998f71e33f9d8c76dc2f6) Build release bundles and publish to Firebase (#50) - [`f546bd2`](https://github.com/bitwarden/android/commit/f546bd2640726acaee86d54d496fa278cf6898a7) Fix version name generation (#78) - [`6da31f7`](https://github.com/bitwarden/android/commit/6da31f797d371839e1a732a718276d2c06bc5c69) Declare ruby version globally (#80) - [`9b5449f`](https://github.com/bitwarden/android/commit/9b5449f657844b3f154d706e8f50ca911784e850) Enforce Base32 key values (#82) ### 📊 Changes **472 files changed** (+41782 additions, -23 deletions) <details> <summary>View changed files</summary> ➕ `.github/codecov.yml` (+2 -0) 📝 `.github/workflows/build-authenticator.yml` (+280 -4) 📝 `.github/workflows/crowdin-pull-authenticator.yml` (+48 -5) 📝 `.github/workflows/crowdin-push-authenticator.yml` (+22 -5) 📝 `.github/workflows/scan-authenticator.yml` (+67 -4) 📝 `.github/workflows/test-authenticator.yml` (+74 -5) ➕ `.husky/pre-commit` (+1 -0) ➕ `README-bwa.md` (+61 -0) ➕ `authenticator/.gitignore` (+1 -0) ➕ `authenticator/build.gradle.kts` (+329 -0) ➕ `authenticator/libs/authenticatorbridge-1.0.0-release.aar` (+0 -0) ➕ `authenticator/proguard-rules.pro` (+112 -0) ➕ `authenticator/schemas/com.bitwarden.authenticator.data.authenticator.datasource.disk.database.AuthenticatorDatabase/1.json` (+82 -0) ➕ `authenticator/schemas/com.bitwarden.authenticator.data.authenticator.datasource.disk.database.AuthenticatorDatabase/2.json` (+89 -0) ➕ `authenticator/src/debug/AndroidManifest.xml` (+20 -0) ➕ `authenticator/src/debug/google-services.json` (+29 -0) ➕ `authenticator/src/main/AndroidManifest.xml` (+60 -0) ➕ `authenticator/src/main/kotlin/com/bitwarden/authenticator/AuthenticatorApplication.kt` (+18 -0) ➕ `authenticator/src/main/kotlin/com/bitwarden/authenticator/MainActivity.kt` (+121 -0) ➕ `authenticator/src/main/kotlin/com/bitwarden/authenticator/MainViewModel.kt` (+142 -0) _...and 80 more files_ </details> ### 📄 Description ## 🎟️ Tracking PM-18434 ## 📔 Objective Brings the Authenticator repo full git history. > [!WARNING] > Merge Strategy has to be set to Merge before merging this PR Both repos were prepared ahead of time with the goal of reducing conflicts, for the remaining files where conflicts were expected the Android repo files were updated so we could just choose this repo version without the need to actually merge lines. This was how each conflict was handled: | Conflict File | Resolution | |--------------|------------| | .checkmarx/config.yml | Keep Android | | .github/CODEOWNERS | Keep Android | | .github/ISSUE_TEMPLATE/bug.yml | Keep Android | | .github/ISSUE_TEMPLATE/config.yml | Keep Android | | .github/renovate.json | Keep Android | | .gitignore | Keep Android | | Gemfile | Keep Android | | Gemfile.lock | Keep Android | | README.md | Keep Android | | build.gradle.kts | Keep Android | | fastlane/Fastfile | Keep Android | | gradle.properties | Keep Android | | gradle/libs.versions.toml | Keep Android | | gradle/wrapper/gradle-wrapper.properties | Keep Android | | gradlew.bat | Keep Android | | settings.gradle.kts | Keep Android plus the `include(:authenticator)` from authenticator-android | | .github/workflows/build-authenticator.yml | Keep authenticator-android | | .github/workflows/crowdin-pull-authenticator.yml | Keep authenticator-android | | .github/workflows/crowdin-push-authenticator.yml | Keep authenticator-android | | .github/workflows/scan-authenticator.yml | Keep authenticator-android | | .github/workflows/test-authenticator.yml | Keep authenticator-android | ## ⏰ 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 --- <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:55:51 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#5222
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?