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

[PR #890] [MERGED] Soft delete feature #2646

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

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/890
Author: @cscharf
Created: 5/8/2020
Status: ✅ Merged
Merged: 5/20/2020
Merged by: @cscharf

Base: master ← Head: soft-delete

📝 Commits (3)

  • 3919252 [Soft Delete] Added trash folder to mobile (#856)
  • 986760c [Soft Delete] - Fix for iOS autofill index behavior (#859)
  • bc23cb6 Merge branch 'master' into soft-delete

📊 Changes

25 files changed (+378 additions, -40 deletions)

View changed files

📝 src/App/Pages/Vault/AddEditPageViewModel.cs (+6 -5)
📝 src/App/Pages/Vault/CiphersPage.xaml.cs (+7 -2)
📝 src/App/Pages/Vault/CiphersPageViewModel.cs (+3 -1)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs (+22 -4)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs (+11 -2)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs (+39 -6)
📝 src/App/Pages/Vault/ViewPage.xaml (+3 -2)
📝 src/App/Pages/Vault/ViewPage.xaml.cs (+26 -2)
📝 src/App/Pages/Vault/ViewPageViewModel.cs (+57 -5)
📝 src/App/Resources/AppResources.Designer.cs (+67 -0)
📝 src/App/Resources/AppResources.resx (+43 -0)
📝 src/App/Utilities/AppHelpers.cs (+5 -1)
📝 src/Core/Abstractions/IApiService.cs (+2 -0)
📝 src/Core/Abstractions/ICipherService.cs (+3 -1)
📝 src/Core/Abstractions/ISearchService.cs (+3 -3)
📝 src/Core/Enums/EventType.cs (+2 -0)
📝 src/Core/Models/Data/CipherData.cs (+2 -0)
📝 src/Core/Models/Domain/Cipher.cs (+5 -1)
📝 src/Core/Models/Response/CipherResponse.cs (+1 -0)
📝 src/Core/Models/View/CipherView.cs (+3 -0)

...and 5 more files

📄 Description

Final pull request for the soft-delete / trash feature for the mobile client, includes merge from master to catch-up the soft-delete branch and to resolve conflicts.

🔄 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/890 **Author:** [@cscharf](https://github.com/cscharf) **Created:** 5/8/2020 **Status:** ✅ Merged **Merged:** 5/20/2020 **Merged by:** [@cscharf](https://github.com/cscharf) **Base:** `master` ← **Head:** `soft-delete` --- ### 📝 Commits (3) - [`3919252`](https://github.com/bitwarden/android/commit/3919252c44f749c55c2bbf20b1a35a2fe8972740) [Soft Delete] Added trash folder to mobile (#856) - [`986760c`](https://github.com/bitwarden/android/commit/986760c9d934315d894466751b3b98e374117f1d) [Soft Delete] - Fix for iOS autofill index behavior (#859) - [`bc23cb6`](https://github.com/bitwarden/android/commit/bc23cb6c6a7202b7a4df428391a6212e95525adb) Merge branch 'master' into soft-delete ### 📊 Changes **25 files changed** (+378 additions, -40 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Vault/AddEditPageViewModel.cs` (+6 -5) 📝 `src/App/Pages/Vault/CiphersPage.xaml.cs` (+7 -2) 📝 `src/App/Pages/Vault/CiphersPageViewModel.cs` (+3 -1) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs` (+22 -4) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs` (+11 -2) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs` (+39 -6) 📝 `src/App/Pages/Vault/ViewPage.xaml` (+3 -2) 📝 `src/App/Pages/Vault/ViewPage.xaml.cs` (+26 -2) 📝 `src/App/Pages/Vault/ViewPageViewModel.cs` (+57 -5) 📝 `src/App/Resources/AppResources.Designer.cs` (+67 -0) 📝 `src/App/Resources/AppResources.resx` (+43 -0) 📝 `src/App/Utilities/AppHelpers.cs` (+5 -1) 📝 `src/Core/Abstractions/IApiService.cs` (+2 -0) 📝 `src/Core/Abstractions/ICipherService.cs` (+3 -1) 📝 `src/Core/Abstractions/ISearchService.cs` (+3 -3) 📝 `src/Core/Enums/EventType.cs` (+2 -0) 📝 `src/Core/Models/Data/CipherData.cs` (+2 -0) 📝 `src/Core/Models/Domain/Cipher.cs` (+5 -1) 📝 `src/Core/Models/Response/CipherResponse.cs` (+1 -0) 📝 `src/Core/Models/View/CipherView.cs` (+3 -0) _...and 5 more files_ </details> ### 📄 Description Final pull request for the soft-delete / trash feature for the mobile client, includes merge from `master` to catch-up the `soft-delete` branch and to resolve conflicts. --- <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:22:08 -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#2646
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?