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.

Sign up for GitHub

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

Jump to bottom

Refactors database #921

Merged
merged 14 commits into from
Jan 16, 2019
Merged

Refactors database #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
177b00a
Refactor database
NejcZdovc Nov 16, 2018
a2803c2
Reordered database files
NejcZdovc Nov 20, 2018
92c8ae9
Adds publisher info insert; Optimizes activity table
NejcZdovc Nov 20, 2018
a56251a
Adds getter for publisher info into the code
NejcZdovc Nov 20, 2018
35095aa
Adds publisher info save
NejcZdovc Nov 20, 2018
abc237e
Removes category from activity; Renames filters to activity
NejcZdovc Nov 20, 2018
2ff4bfb
Renames GetPublisherInfoList into GetActivityInfoList
NejcZdovc Nov 20, 2018
9a74576
Refactors restore flow
NejcZdovc Nov 20, 2018
d815fd8
Adds custom loader for the panel
NejcZdovc Nov 22, 2018
e78dbe2
Fixes merge problem
NejcZdovc Dec 5, 2018
e271498
Ports ledger cahnges from seperate repo into core
NejcZdovc Dec 17, 2018
eafb91b
PublisherInfo database tests
tmancey Dec 10, 2018
d76269c
Merge fixes
NejcZdovc Jan 3, 2019
e3c864e
Fixes tests
NejcZdovc Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions browser/ui/webui/brave_rewards_ui.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class RewardsDOMHandler : public WebUIMessageHandler,
void GetReconcileStamp(const base::ListValue* args);
void GetAddresses(const base::ListValue* args);
void SaveSetting(const base::ListValue* args);
void OnGetCurrentContributeList(
void OnContentSiteList(
std::unique_ptr<brave_rewards::ContentSiteList>,
uint32_t record);
void OnGetAllBalanceReports(
Expand Down Expand Up @@ -543,10 +543,10 @@ void RewardsDOMHandler::GetAddresses(const base::ListValue* args) {

void RewardsDOMHandler::OnAutoContributePropsReady(
std::unique_ptr<brave_rewards::AutoContributeProps> props) {
rewards_service_->GetCurrentContributeList(0, 0,
rewards_service_->GetContentSiteList(0, 0,
props->contribution_min_time, props->reconcile_stamp,
props->contribution_non_verified,
base::Bind(&RewardsDOMHandler::OnGetCurrentContributeList,
base::Bind(&RewardsDOMHandler::OnContentSiteList,
weak_factory_.GetWeakPtr()));
}

Expand Down Expand Up @@ -674,7 +674,7 @@ void RewardsDOMHandler::RestorePublishers(const base::ListValue *args) {
}
}

void RewardsDOMHandler::OnGetCurrentContributeList(
void RewardsDOMHandler::OnContentSiteList(
std::unique_ptr<brave_rewards::ContentSiteList> list,
uint32_t record) {
if (web_ui()->CanCallJavascript()) {
Expand Down
Loading