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

Fix crash in fetchPrices method (#19914)

Browse Source
This commit is contained in:
Simone Arpe
2023-08-30 11:26:42 +02:00
committed by GitHub
parent 19b006d13c
commit 17c9a12407
2 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/crypto_wallet/modal/BraveWalletPanel.java
+79 -65
View File
@@ -27,6 +27,7 @@ import android.widget.PopupWindow;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.view.menu.MenuBuilder;
@@ -75,7 +76,7 @@ public class BraveWalletPanel implements DialogInterface {
private final PopupWindow mPopupWindow;
private final AppCompatActivity mActivity;
private ViewGroup mPopupView;
private OnDismissListener mOnDismissListener;
private final OnDismissListener mOnDismissListener;
private ImageView mExpandWalletImage;
private ImageView mOptionsImage;
private Button mBtnConnectedStatus;
@@ -87,35 +88,19 @@ public class BraveWalletPanel implements DialogInterface {
private TextView mAmountFiat;
private View mCvSolConnectionStatus;
private HashSet<AccountInfo> mAccountsWithPermissions;
private ExecutorService mExecutor;
private Handler mHandler;
private BraveWalletPanelServices mBraveWalletPanelServices;
private final ExecutorService mExecutor;
private final Handler mHandler;
private final BraveWalletPanelServices mBraveWalletPanelServices;
private ImageView mAccountChangeAnchor;
private View mContainerConstraintLayout;
private WalletModel mWalletModel;
private AllAccountsInfo mAllAccountsInfo;
private AccountInfo mSelectedAccount;
private NetworkInfo mSelectedNetwork;
private Context mContext;
private final Observer<AllAccountsInfo> mAllAccountsInfoObserver = allAccountsInfo -> {
mAllAccountsInfo = allAccountsInfo;
mSelectedAccount = mAllAccountsInfo.selectedAccount;
private final Context mContext;
private final Observer<AllAccountsInfo> mAllAccountsInfoObserver;
AccountsPermissionsHelper accountsPermissionsHelper =
new AccountsPermissionsHelper(mBraveWalletPanelServices.getBraveWalletService(),
Utils.filterAccountsByCoin(
mAllAccountsInfo.accounts, mSelectedAccount.accountId.coin)
.toArray(new AccountInfo[0]));
accountsPermissionsHelper.checkAccounts(() -> {
mAccountsWithPermissions = accountsPermissionsHelper.getAccountsWithPermissions();
updateSelectedAccountInfo();
});
};
private final Observer<NetworkInfo> mDefaultNetworkObserver = networkInfo -> {
mSelectedNetwork = networkInfo;
mBtnSelectedNetwork.setText(Utils.getShortNameOfNetwork(networkInfo.chainName));
};
private final Observer<NetworkInfo> mDefaultNetworkObserver;
public interface BraveWalletPanelServices {
AssetRatioService getAssetRatioService();
@@ -124,9 +109,18 @@ public class BraveWalletPanel implements DialogInterface {
JsonRpcService getJsonRpcService();
}
public BraveWalletPanel(View anchorViewHost, OnDismissListener onDismissListener,
BraveWalletPanelServices braveWalletPanelServices) {
mAccountsWithPermissions = new HashSet<AccountInfo>();
public BraveWalletPanel(@NonNull final View anchorViewHost,
@NonNull final OnDismissListener onDismissListener,
@NonNull final BraveWalletPanelServices braveWalletPanelServices) {
try {
mWalletModel = BraveActivity.getBraveActivity().getWalletModel();
// Update network model to use network per origin
getNetworkModel().updateMode(NetworkModel.Mode.PANEL_MODE);
} catch (BraveActivity.BraveActivityNotFoundException e) {
Log.e(TAG, "BraveWalletPanel Constructor", e);
}
mAccountsWithPermissions = new HashSet<>();
mExecutor = Executors.newSingleThreadExecutor();
mHandler = new Handler(Looper.getMainLooper());
mAnchorViewHost = anchorViewHost;
@@ -135,6 +129,31 @@ public class BraveWalletPanel implements DialogInterface {
mActivity = BraveActivity.getChromeTabbedActivity();
mBraveWalletPanelServices = braveWalletPanelServices;
mDefaultNetworkObserver = networkInfo -> {
mSelectedNetwork = networkInfo;
mBtnSelectedNetwork.setText(Utils.getShortNameOfNetwork(networkInfo.chainName));
};
mAllAccountsInfoObserver = allAccountsInfo -> {
mAllAccountsInfo = allAccountsInfo;
mSelectedAccount = mAllAccountsInfo.selectedAccount;
final BraveWalletService braveWalletService =
mBraveWalletPanelServices.getBraveWalletService();
if (braveWalletService == null) {
return;
}
AccountsPermissionsHelper accountsPermissionsHelper =
new AccountsPermissionsHelper(braveWalletService,
Utils.filterAccountsByCoin(
mAllAccountsInfo.accounts, mSelectedAccount.accountId.coin)
.toArray(new AccountInfo[0]));
accountsPermissionsHelper.checkAccounts(() -> {
mAccountsWithPermissions = accountsPermissionsHelper.getAccountsWithPermissions();
updateSelectedAccountInfo();
});
};
mPopupWindow = new PopupWindow(mContext);
mPopupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
mPopupWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@@ -151,19 +170,7 @@ public class BraveWalletPanel implements DialogInterface {
return false;
}
});
mPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
@Override
public void onDismiss() {
dismiss();
}
});
try {
mWalletModel = BraveActivity.getBraveActivity().getWalletModel();
// Update network model to use network per origin
getNetworkModel().updateMode(NetworkModel.Mode.PANEL_MODE);
} catch (BraveActivity.BraveActivityNotFoundException e) {
Log.e(TAG, "BraveWalletPanel Constructor " + e);
}
mPopupWindow.setOnDismissListener(this::dismiss);
setUpViews();
}
@@ -175,9 +182,9 @@ public class BraveWalletPanel implements DialogInterface {
// use android.widget.PopupMenu and anchor to an URL bar there.
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
androidx.appcompat.widget.PopupMenu menu = new androidx.appcompat.widget.PopupMenu(
mOptionsImage.getContext(), (View) mOptionsImage);
mOptionsImage.getContext(), mOptionsImage);
menu.getMenuInflater().inflate(R.menu.menu_dapps_panel, menu.getMenu());
menu.setOnMenuItemClickListener(item -> { return handleMenuItemClick(item); });
menu.setOnMenuItemClickListener(this::handleMenuItemClick);
if (menu.getMenu() instanceof MenuBuilder) {
((MenuBuilder) menu.getMenu()).setOptionalIconsVisible(true);
@@ -194,7 +201,10 @@ public class BraveWalletPanel implements DialogInterface {
private boolean handleMenuItemClick(MenuItem item) {
if (item.getItemId() == R.id.action_lock_wallet) {
mBraveWalletPanelServices.getKeyringService().lock();
final KeyringService keyringService = mBraveWalletPanelServices.getKeyringService();
if (keyringService != null) {
keyringService.lock();
}
dismiss();
} else if (item.getItemId() == R.id.action_connected_sites) {
try {
@@ -373,29 +383,33 @@ public class BraveWalletPanel implements DialogInterface {
LiveDataUtil.observeOnce(
getNetworkModel().mDefaultNetwork, selectedNetwork -> {
BlockchainToken asset = Utils.makeNetworkAsset(selectedNetwork);
AssetsPricesHelper.fetchPrices(mBraveWalletPanelServices.getAssetRatioService(),
new BlockchainToken[] {asset}, assetPrices -> {
BalanceHelper.getNativeAssetsBalances(
mBraveWalletPanelServices.getJsonRpcService(),
selectedNetwork, new AccountInfo[] {mSelectedAccount},
(coinType, nativeAssetsBalances) -> {
double price = Utils.getOrDefault(assetPrices,
asset.symbol.toLowerCase(Locale.getDefault()),
0.0d);
double balance =
Utils.getOrDefault(nativeAssetsBalances,
mSelectedAccount.address.toLowerCase(
Locale.getDefault()),
0.0d);
String fiatBalanceString = String.format(
Locale.getDefault(), "$%,.2f", balance * price);
String cryptoBalanceString =
String.format(Locale.getDefault(), "%.4f %s",
balance, selectedNetwork.symbol);
mAmountAsset.setText(cryptoBalanceString);
mAmountFiat.setText(fiatBalanceString);
});
});
final AssetRatioService assetRatioService =
mBraveWalletPanelServices.getAssetRatioService();
final JsonRpcService jsonRpcService =
mBraveWalletPanelServices.getJsonRpcService();
if (assetRatioService == null || jsonRpcService == null) {
return;
}
AssetsPricesHelper.fetchPrices(assetRatioService, new BlockchainToken[] {asset},
assetPrices
-> BalanceHelper.getNativeAssetsBalances(jsonRpcService,
selectedNetwork, new AccountInfo[] {mSelectedAccount},
(coinType, nativeAssetsBalances) -> {
double price = Utils.getOrDefault(assetPrices,
asset.symbol.toLowerCase(Locale.getDefault()),
0.0d);
double balance = Utils.getOrDefault(nativeAssetsBalances,
mSelectedAccount.address.toLowerCase(
Locale.getDefault()),
0.0d);
String fiatBalanceString = String.format(
Locale.getDefault(), "$%,.2f", balance * price);
String cryptoBalanceString =
String.format(Locale.getDefault(), "%.4f %s",
balance, selectedNetwork.symbol);
mAmountAsset.setText(cryptoBalanceString);
mAmountFiat.setText(fiatBalanceString);
}));
});
}
android/java/org/chromium/chrome/browser/crypto_wallet/util/AssetsPricesHelper.java
+1 -1
View File
@@ -17,7 +17,7 @@ import java.util.HashMap;
import java.util.Locale;
public class AssetsPricesHelper {
private static String TAG = "AssetsPricesHelper";
private static final String TAG = "AssetsPricesHelper";
public static void fetchPrices(AssetRatioService assetRatioService, BlockchainToken[] assets,
Callbacks.Callback1<HashMap<String, Double>> callback) {