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

[AI Chat]: Android history setting #26988

Merged
merged 3 commits into from
Dec 18, 2024

Conversation

fallaciousreasoning
Copy link
Contributor

@fallaciousreasoning fallaciousreasoning commented Dec 11, 2024

Resolves brave/brave-browser#42847

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

  1. Go to Leo settings
  2. There should be no History setting
  3. Enable brave://flags/#brave-ai-chat-history
  4. Go to Leo settings
  5. It you should be able to enable/disable the setting
  6. When enabled, conversations should be stored

@@ -15,7 +15,8 @@ namespace ai_chat::prefs {

inline constexpr char kLastAcceptedDisclaimer[] =
"brave.ai_chat.last_accepted_disclaimer";
inline constexpr char kStorageEnabled[] = "brave.ai_chat.storage_enabled";
inline constexpr char kBraveChatStorageEnabled[] =
Copy link
Member

Choose a reason for hiding this comment

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

we're already in the ai_chat namespace so do we need to add the prefix again? IF we do, perhaps kBraveChat -> kBraveAIChat...

Copy link
Contributor Author

@fallaciousreasoning fallaciousreasoning Dec 11, 2024

Choose a reason for hiding this comment

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

Yeah, I added it because this isn't in the namespace in android so without this its BravePrefs.STORAGE_ENABLED

I went with kBraveChat because that's what everything else is using

Copy link
Member

Choose a reason for hiding this comment

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

That's a shame they were kBraveChat instead of at least kBraveAIChat 🤷 and also it's strange that if anything is used on android then we need to make a globally-unique name, but that's something to sort out another time.

Actually I think we should at least keep this as kBraveAIChatStorageEnabled and then we'll get to renaming the rest. I don't want to introduce more inconsistent Chat references as it sounds like a different feature.

Copy link
Member

@petemill petemill left a comment

Choose a reason for hiding this comment

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

As discussed, it needs to prompt the user before disabling since disabling deletes all conversations

Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

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

++

@fallaciousreasoning fallaciousreasoning force-pushed the aichat-android-history-toggle branch from ebdc11a to 00244e8 Compare December 12, 2024 22:27
@@ -794,6 +794,7 @@ brave_java_resources = [
"java/res/layout/brave_custom_tabs_toolbar.xml",
"java/res/layout/brave_dialog_preference.xml",
"java/res/layout/brave_exit_confirmation.xml",
"java/res/layout/brave_leo_clear_history_dialog.xml",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bridiver would it be okay if we landed this brave_java_resources addition? I'm not an Android expert, so it'll take me a while to work out the proper way of doing this and I'm going on PTO on Monday

Copy link
Collaborator

Choose a reason for hiding this comment

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

this is fine for now

@fallaciousreasoning fallaciousreasoning force-pushed the aichat-android-history-toggle branch from 00244e8 to a29fae9 Compare December 15, 2024 21:45
@@ -15,7 +15,8 @@ namespace ai_chat::prefs {

inline constexpr char kLastAcceptedDisclaimer[] =
"brave.ai_chat.last_accepted_disclaimer";
inline constexpr char kStorageEnabled[] = "brave.ai_chat.storage_enabled";
inline constexpr char kBraveChatStorageEnabled[] =
Copy link
Member

Choose a reason for hiding this comment

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

That's a shame they were kBraveChat instead of at least kBraveAIChat 🤷 and also it's strange that if anything is used on android then we need to make a globally-unique name, but that's something to sort out another time.

Actually I think we should at least keep this as kBraveAIChatStorageEnabled and then we'll get to renaming the rest. I don't want to introduce more inconsistent Chat references as it sounds like a different feature.

@fallaciousreasoning fallaciousreasoning enabled auto-merge (squash) December 15, 2024 23:07
Copy link
Contributor

@deeppandya deeppandya left a comment

Choose a reason for hiding this comment

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

LGTM

@fallaciousreasoning fallaciousreasoning merged commit e1a3daa into master Dec 18, 2024
18 checks passed
@fallaciousreasoning fallaciousreasoning deleted the aichat-android-history-toggle branch December 18, 2024 18:41
@github-actions github-actions bot added this to the 1.75.x - Nightly milestone Dec 18, 2024
@brave-builds
Copy link
Collaborator

Released in v1.75.110

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[AI Chat]: We should add a setting for disabling/enabling AI Chat History on Android
7 participants