-
Notifications
You must be signed in to change notification settings - Fork 892
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12493 from brave/21457-option-to-reset-transactii…
…on-and-nonce feat(wallet): add reset transaction & nonce setting
- Loading branch information
Showing
6 changed files
with
172 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
...ava/org/chromium/chrome/browser/settings/BraveWalletResetTxHistoryAndNoncePreference.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| /* Copyright (c) 2022 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| package org.chromium.chrome.browser.settings; | ||
|
|
||
| import android.content.Context; | ||
| import android.content.DialogInterface; | ||
| import android.text.Editable; | ||
| import android.text.TextUtils; | ||
| import android.text.TextWatcher; | ||
| import android.util.AttributeSet; | ||
| import android.view.LayoutInflater; | ||
| import android.view.View; | ||
| import android.widget.Button; | ||
| import android.widget.EditText; | ||
| import android.widget.TextView; | ||
|
|
||
| import androidx.appcompat.app.AlertDialog; | ||
| import androidx.preference.Preference; | ||
|
|
||
| import org.chromium.brave_wallet.mojom.TxService; | ||
| import org.chromium.chrome.R; | ||
| import org.chromium.chrome.browser.crypto_wallet.TxServiceFactory; | ||
| import org.chromium.mojo.bindings.ConnectionErrorHandler; | ||
| import org.chromium.mojo.system.MojoException; | ||
| import org.chromium.ui.KeyboardVisibilityDelegate; | ||
|
|
||
| /** | ||
| * The preference used to reset transaction and nonce history in Brave Wallet. | ||
| */ | ||
| public class BraveWalletResetTxHistoryAndNoncePreference | ||
| extends Preference implements Preference.OnPreferenceClickListener, ConnectionErrorHandler { | ||
| private String TAG = "BraveWalletResetTxHistoryAndNoncePreference"; | ||
|
|
||
|
|
||
| private TxService mTxService; | ||
| private final String mConfirmationPhrase; | ||
|
|
||
| public BraveWalletResetTxHistoryAndNoncePreference(Context context, AttributeSet attrs) { | ||
| super(context, attrs); | ||
|
|
||
| setOnPreferenceClickListener(this); | ||
| mConfirmationPhrase = | ||
| getContext().getResources().getString(R.string.brave_wallet_reset_settings_confirmation_phrase); | ||
| initTxService(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onPreferenceClick(Preference preference) { | ||
| showBraveWalletResetTxHistoryAndNonceDialog(); | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void onDetached() { | ||
| super.onDetached(); | ||
| if (mTxService != null) { | ||
| mTxService.close(); | ||
| } | ||
| } | ||
|
|
||
| private void showBraveWalletResetTxHistoryAndNonceDialog() { | ||
| LayoutInflater inflater = | ||
| (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); | ||
| View view = inflater.inflate(R.layout.brave_wallet_preference_confirmation_text_layout, null); | ||
| TextView textView = view.findViewById(R.id.brave_wallet_preference_confirmation_dialog_tv_message); | ||
| textView.setText(getContext().getResources().getString(R.string.brave_wallet_clear_tx_and_nonce_dialog_confirmation, mConfirmationPhrase)); | ||
| final EditText input = view.findViewById(R.id.brave_wallet_preference_confirmation_dialog_edittext); | ||
|
|
||
| DialogInterface.OnClickListener onClickListener = (dialog, button) -> { | ||
| if (button == AlertDialog.BUTTON_POSITIVE) { | ||
| mTxService.reset(); | ||
| } else { | ||
| dialog.dismiss(); | ||
| } | ||
| }; | ||
|
|
||
| AlertDialog.Builder alert = | ||
| new AlertDialog.Builder(getContext(), R.style.Theme_Chromium_AlertDialog); | ||
| AlertDialog alertDialog = | ||
| alert.setTitle(R.string.brave_wallet_clear_tx_and_nonce_setting_title) | ||
| .setView(view) | ||
| .setPositiveButton(R.string.brave_wallet_confirm_text, onClickListener) | ||
| .setNegativeButton(R.string.cancel, onClickListener) | ||
| .create(); | ||
| alertDialog.getDelegate().setHandleNativeActionModesEnabled(false); | ||
| alertDialog.setOnShowListener(new DialogInterface.OnShowListener() { | ||
| @Override | ||
| public void onShow(DialogInterface dialog) { | ||
| KeyboardVisibilityDelegate.getInstance().showKeyboard(input); | ||
| } | ||
| }); | ||
| alertDialog.show(); | ||
| final Button okButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); | ||
| okButton.setEnabled(false); | ||
|
|
||
| input.addTextChangedListener(new TextWatcher() { | ||
| @Override | ||
| public void afterTextChanged(Editable s) { | ||
| } | ||
|
|
||
| @Override | ||
| public void beforeTextChanged(CharSequence s, int start, int count, int after) { | ||
| } | ||
|
|
||
| @Override | ||
| public void onTextChanged(CharSequence s, int start, int before, int count) { | ||
| // Disable ok button if input is invalid | ||
| String inputText = s.toString().trim(); | ||
|
|
||
| okButton.setEnabled(TextUtils.equals(inputText, mConfirmationPhrase)); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public void onConnectionError(MojoException e) { | ||
| mTxService.close(); | ||
| mTxService = null; | ||
| initTxService(); | ||
| } | ||
|
|
||
| private void initTxService() { | ||
| if (mTxService != null) { | ||
| return; | ||
| } | ||
|
|
||
| mTxService = TxServiceFactory.getInstance().getTxService(this); | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
android/java/res/layout/brave_wallet_preference_confirmation_text_layout.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!--* Copyright (c) 2022 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> | ||
|
|
||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:orientation="vertical" | ||
| style="@style/AlertDialogContent"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/brave_wallet_preference_confirmation_dialog_tv_message" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" /> | ||
|
|
||
| <org.chromium.components.browser_ui.widget.text.AlertDialogEditText | ||
| android:id="@+id/brave_wallet_preference_confirmation_dialog_edittext" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:inputType="textNoSuggestions" /> | ||
|
|
||
| </LinearLayout> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters