[PR #3236] [MERGED] fix: only encrypt if enable #5633

New issue

Closed

opened 2026-03-23 22:19:36 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 22:19:36 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/3236
Author: @appflowy
Created: 8/18/2023
Status: ✅ Merged
Merged: 8/18/2023
Merged by: @appflowy

Base: main ← Head: opti_doc_not_upload

📝 Commits (5)

b3f564a fix: error page display issue
e529949 fix: override document with empty data
53e96a2 chore: add logs
dc490bb fix: encrypt errors
f60fb90 fix: encrypt errors

📊 Changes

20 files changed (+171 additions, -106 deletions)

View changed files

📝 frontend/appflowy_flutter/lib/user/application/auth/supabase_auth_service.dart (+3 -0)
📝 frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/error_page.dart (+4 -1)
📝 frontend/rust-lib/flowy-core/src/integrate/server.rs (+4 -13)
📝 frontend/rust-lib/flowy-core/src/lib.rs (+13 -2)
📝 frontend/rust-lib/flowy-database2/src/manager.rs (+1 -1)
📝 frontend/rust-lib/flowy-document2/src/manager.rs (+4 -18)
📝 frontend/rust-lib/flowy-error/src/code.rs (+2 -2)
📝 frontend/rust-lib/flowy-error/src/errors.rs (+1 -0)
📝 frontend/rust-lib/flowy-folder2/src/manager.rs (+2 -2)
📝 frontend/rust-lib/flowy-server/src/supabase/api/database.rs (+3 -2)
📝 frontend/rust-lib/flowy-server/src/supabase/api/document.rs (+6 -1)
📝 frontend/rust-lib/flowy-server/src/supabase/api/request.rs (+31 -7)
📝 frontend/rust-lib/flowy-server/src/supabase/server.rs (+15 -8)
📝 frontend/rust-lib/flowy-user-deps/src/cloud.rs (+23 -1)
📝 frontend/rust-lib/flowy-user/src/entities/user_setting.rs (+1 -1)
📝 frontend/rust-lib/flowy-user/src/event_handler.rs (+23 -25)
📝 frontend/rust-lib/flowy-user/src/event_map.rs (+3 -1)
📝 frontend/rust-lib/flowy-user/src/manager.rs (+8 -4)
📝 frontend/rust-lib/flowy-user/src/services/cloud_config.rs (+23 -16)
📝 frontend/rust-lib/flowy-user/src/services/user_encryption.rs (+1 -1)

📄 Description

PR Checklist

My code adheres to the AppFlowy Style Guide
I've listed at least one issue that this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

_{🔄 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/AppFlowy-IO/AppFlowy/pull/3236 **Author:** [@appflowy](https://github.com/appflowy) **Created:** 8/18/2023 **Status:** ✅ Merged **Merged:** 8/18/2023 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `main` ← **Head:** `opti_doc_not_upload` --- ### 📝 Commits (5) - [`b3f564a`](https://github.com/AppFlowy-IO/AppFlowy/commit/b3f564a356b432f80e71c2af9758b6b12e616bd3) fix: error page display issue - [`e529949`](https://github.com/AppFlowy-IO/AppFlowy/commit/e52994956f921ffb7239f1820177f37691cd1ac0) fix: override document with empty data - [`53e96a2`](https://github.com/AppFlowy-IO/AppFlowy/commit/53e96a24b883fbe1dc4e2c8a8d6bf85dd27bc5af) chore: add logs - [`dc490bb`](https://github.com/AppFlowy-IO/AppFlowy/commit/dc490bb1a6466b7c4c74979381890025e554076f) fix: encrypt errors - [`f60fb90`](https://github.com/AppFlowy-IO/AppFlowy/commit/f60fb9069530fd2da91bac8922a10cc742146d76) fix: encrypt errors ### 📊 Changes **20 files changed** (+171 additions, -106 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/lib/user/application/auth/supabase_auth_service.dart` (+3 -0) 📝 `frontend/appflowy_flutter/packages/flowy_infra_ui/lib/widget/error_page.dart` (+4 -1) 📝 `frontend/rust-lib/flowy-core/src/integrate/server.rs` (+4 -13) 📝 `frontend/rust-lib/flowy-core/src/lib.rs` (+13 -2) 📝 `frontend/rust-lib/flowy-database2/src/manager.rs` (+1 -1) 📝 `frontend/rust-lib/flowy-document2/src/manager.rs` (+4 -18) 📝 `frontend/rust-lib/flowy-error/src/code.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-error/src/errors.rs` (+1 -0) 📝 `frontend/rust-lib/flowy-folder2/src/manager.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-server/src/supabase/api/database.rs` (+3 -2) 📝 `frontend/rust-lib/flowy-server/src/supabase/api/document.rs` (+6 -1) 📝 `frontend/rust-lib/flowy-server/src/supabase/api/request.rs` (+31 -7) 📝 `frontend/rust-lib/flowy-server/src/supabase/server.rs` (+15 -8) 📝 `frontend/rust-lib/flowy-user-deps/src/cloud.rs` (+23 -1) 📝 `frontend/rust-lib/flowy-user/src/entities/user_setting.rs` (+1 -1) 📝 `frontend/rust-lib/flowy-user/src/event_handler.rs` (+23 -25) 📝 `frontend/rust-lib/flowy-user/src/event_map.rs` (+3 -1) 📝 `frontend/rust-lib/flowy-user/src/manager.rs` (+8 -4) 📝 `frontend/rust-lib/flowy-user/src/services/cloud_config.rs` (+23 -16) 📝 `frontend/rust-lib/flowy-user/src/services/user_encryption.rs` (+1 -1) </details> ### 📄 Description #### PR Checklist - [ ] My code adheres to the [AppFlowy Style Guide](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/software-contributions/submitting-code/style-guides) - [ ] I've listed at least one issue that this PR fixes in the description above. - [ ] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [ ] All existing tests are passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>