Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15738 from brave/emerick-rewards-remove-restore-tab-from-manage-rewards-dialog

Browse Source 
Remove Restore tab from Manage Brave Rewards dialog
This commit is contained in:
Emerick Rogul
2022-11-02 12:58:19 -04:00
committed by GitHub
parent c5e679a774 8094c3930c
commit 320dd99991
60 changed files with 24 additions and 1849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java
-15
View File
@@ -468,13 +468,6 @@ public class BraveRewardsNativeWorker {
}
}
public void RecoverWallet(String passPhrase) {
synchronized (lock) {
BraveRewardsNativeWorkerJni.get().recoverWallet(
mNativeBraveRewardsNativeWorker, passPhrase);
}
}
public void getAdsAccountStatement() {
synchronized (lock) {
BraveRewardsNativeWorkerJni.get().getAdsAccountStatement(
@@ -489,13 +482,6 @@ public class BraveRewardsNativeWorker {
}
}
@CalledByNative
public void OnRecoverWallet(int errorCode) {
for (BraveRewardsObserver observer : mObservers) {
observer.OnRecoverWallet(errorCode);
}
}
public void RefreshPublisher(String publisherKey) {
synchronized (lock) {
BraveRewardsNativeWorkerJni.get().refreshPublisher(
@@ -770,7 +756,6 @@ public class BraveRewardsNativeWorker {
String getCountryCode(long nativeBraveRewardsNativeWorker);
void getAvailableCountries(long nativeBraveRewardsNativeWorker);
void disconnectWallet(long nativeBraveRewardsNativeWorker);
void recoverWallet(long nativeBraveRewardsNativeWorker, String passPhrase);
void refreshPublisher(long nativeBraveRewardsNativeWorker, String publisherKey);
void createRewardsWallet(long nativeBraveRewardsNativeWorker, String countryCode);
void getRewardsParameters(long nativeBraveRewardsNativeWorker);
android/java/org/chromium/chrome/browser/BraveRewardsObserver.java
-1
View File
@@ -27,7 +27,6 @@ public interface BraveRewardsObserver {
default public void OnClaimPromotion(int error_code){};
default public void onUnblindedTokensReady() {}
default public void onReconcileComplete(int resultCode, int rewardsType, double amount) {}
default public void OnRecoverWallet(int errorCode){};
default public void OnRefreshPublisher(int status, String publisherKey){};
default public void OnOneTimeTip(int result){};
default public void OnPendingContributionSaved(int result){};
android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java
-53
View File
@@ -64,7 +64,6 @@ public class BraveQAPreferences extends BravePreferenceFragment
private static final String QA_ADS_PER_HOUR = "qa_ads_per_hour";
private static final String QA_IMPORT_REWARDS_DB = "qa_import_rewards_db";
private static final String QA_EXPORT_REWARDS_DB = "qa_export_rewards_db";
private static final String QA_RESTORE_WALLET = "qa_restore_wallet";
private static final int CHOOSE_FILE_FOR_IMPORT_REQUEST_CODE = STORAGE_PERMISSION_IMPORT_REQUEST_CODE + 1;
@@ -79,7 +78,6 @@ public class BraveQAPreferences extends BravePreferenceFragment
private ChromeSwitchPreference mDebugNTP;
private ChromeSwitchPreference mVlogRewards;
private Preference mCommandLine;
private Preference mRestoreWallet;
private Preference mImportRewardsDb;
private Preference mExportRewardsDb;
@@ -140,55 +138,12 @@ public class BraveQAPreferences extends BravePreferenceFragment
mExportRewardsDb = findPreference(QA_EXPORT_REWARDS_DB);
setRewardsDbClickListeners();
mRestoreWallet = findPreference(QA_RESTORE_WALLET);
setRestoreClickListener();
mCommandLine = findPreference(PREF_QA_COMMAND_LINE);
setCommandLineClickListener();
checkQACode();
}
private void setRestoreClickListener() {
if (mRestoreWallet != null) {
mRestoreWallet.setOnPreferenceClickListener(preference -> {
LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
View view = inflater.inflate(R.layout.qa_code_check, null);
EditText input = (EditText) view.findViewById(R.id.qa_code);
input.setInputType(InputType.TYPE_CLASS_TEXT);
DialogInterface.OnClickListener onClickListener =
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int button) {
if (button == AlertDialog.BUTTON_POSITIVE) {
String restorePhrase = input.getText().toString();
if (!restorePhrase.isEmpty()) {
BraveRewardsNativeWorker.getInstance().RecoverWallet(
restorePhrase);
}
}
}
};
AlertDialog.Builder alert = new AlertDialog.Builder(
getActivity(), R.style.ThemeOverlay_BrowserUI_AlertDialog);
AlertDialog.Builder alertDialog =
alert.setTitle("Enter Wallet restore phrase")
.setView(view)
.setPositiveButton(R.string.ok, onClickListener)
.setNegativeButton(R.string.cancel, onClickListener)
.setCancelable(false);
Dialog dialog = alertDialog.create();
dialog.setCanceledOnTouchOutside(false);
dialog.show();
return true;
});
}
}
private void setRewardsDbClickListeners() {
if (mImportRewardsDb != null) {
mImportRewardsDb.setOnPreferenceClickListener( preference -> {
@@ -428,14 +383,6 @@ public class BraveQAPreferences extends BravePreferenceFragment
@Override
public void onCreatePreferences(Bundle bundle, String s) {}
@Override
public void OnRecoverWallet(int errorCode) {
Context context = ContextUtils.getApplicationContext();
String msg =
(0 == errorCode) ? "Wallet is successfully restored" : "Wallet recovery failed";
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
}
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
android/java/res/xml/qa_preferences.xml
-4
View File
@@ -64,8 +64,4 @@
android:key="qa_export_rewards_db"
android:title="Export Rewards Database" />
<Preference
android:key="qa_restore_wallet"
android:title="Restore Wallet"/>
</PreferenceScreen>