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

Fixes a crash in cases when there is no active tab or it has not been initialized yet on Android

Browse Source
This commit is contained in:
Serg
2022-10-14 15:17:20 -04:00
parent 2da3f4c112
commit 179ef7c269
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class BraveRewardsDonationSentActivity extends Activity implements BraveR
String publisherFavIconURL =
mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_);
Tab currentActiveTab = BraveRewardsHelper.currentActiveChromeTabbedActivityTab();
String url = currentActiveTab.getUrl().getSpec();
String url = currentActiveTab != null ? currentActiveTab.getUrl().getSpec() : "";
String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL;
mIconFetcher = new org.chromium.chrome.browser.BraveRewardsHelper(currentActiveTab);
mIconFetcher.retrieveLargeIcon(favicon_url, this);
android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/ConnectAccountFragment.java
+1 -1
View File
@@ -233,7 +233,7 @@ public class ConnectAccountFragment extends BaseDAppsFragment
private GURL getCurrentHostHttpAddress() {
ChromeTabbedActivity activity = BraveActivity.getChromeTabbedActivity();
if (activity != null) {
if (activity != null && activity.getActivityTab() != null) {
return activity.getActivityTab().getUrl().getOrigin();
}
return GURL.emptyGURL();
android/java/org/chromium/chrome/browser/crypto_wallet/modal/BraveWalletPanel.java
+1 -1
View File
@@ -284,7 +284,7 @@ public class BraveWalletPanel implements DialogInterface {
mCvSolConnectionStatus.setVisibility(View.GONE);
} else {
BraveActivity activity = BraveActivity.getBraveActivity();
if (activity != null) {
if (activity != null && activity.getActivityTab() != null) {
BraveWalletProviderDelegateImplHelper.IsSolanaConnected(
activity.getActivityTab().getWebContents(), selectedAccount.address,
isConnected -> {
android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java
+2 -2
View File
@@ -1408,7 +1408,7 @@ public class Utils {
public static GURL getCurentTabUrl() {
ChromeTabbedActivity activity = BraveActivity.getChromeTabbedActivity();
if (activity != null) {
if (activity != null && activity.getActivityTab() != null) {
return activity.getActivityTab().getUrl().getOrigin();
}
return GURL.emptyGURL();
@@ -1427,7 +1427,7 @@ public class Utils {
org.chromium.url.internal.mojom.Origin hostOrigin =
new org.chromium.url.internal.mojom.Origin();
ChromeTabbedActivity activity = BraveActivity.getChromeTabbedActivity();
if (activity == null) {
if (activity == null || activity.getActivityTab() == null) {
return hostOrigin;
}
android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java
+1 -1
View File
@@ -208,7 +208,7 @@ public class RewardsBottomSheetDialogFragment extends BottomSheetDialogFragment
private void reloadTab() {
ChromeTabbedActivity chromeTabbedActivity = BraveRewardsHelper.getChromeTabbedActivity();
if (chromeTabbedActivity != null) {
if (chromeTabbedActivity != null && chromeTabbedActivity.getActivityTab() != null) {
Tab currentTab = chromeTabbedActivity.getActivityTab();
SponsoredTab sponsoredTab = TabAttributes.from(currentTab).get(String.valueOf(((TabImpl)currentTab).getId()));
sponsoredTab.setNTPImage(SponsoredImageUtil.getBackgroundImage());
android/java/org/chromium/chrome/browser/rewards/BraveRewardsCreatorPanelFragment.java
+1 -1
View File
@@ -220,7 +220,7 @@ public class BraveRewardsCreatorPanelFragment extends Fragment
String publisherFavIconURL =
mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_);
Tab currentActiveTab = BraveRewardsHelper.currentActiveChromeTabbedActivityTab();
String url = currentActiveTab.getUrl().getSpec();
String url = currentActiveTab != null ? currentActiveTab.getUrl().getSpec() : "";
String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL;
mIconFetcher = new BraveRewardsHelper(currentActiveTab);
mIconFetcher.retrieveLargeIcon(favicon_url, this);
android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java
+1 -1
View File
@@ -1312,7 +1312,7 @@ public class BraveRewardsPanel
String publisherFavIconURL =
mBraveRewardsNativeWorker.GetPublisherFavIconURL(mCurrentTabId);
Tab currentActiveTab = BraveRewardsHelper.currentActiveChromeTabbedActivityTab();
String url = currentActiveTab.getUrl().getSpec();
String url = currentActiveTab != null ? currentActiveTab.getUrl().getSpec() : "";
final String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL;
mIconFetcher.retrieveLargeIcon(favicon_url, this);
android/java/org/chromium/chrome/browser/util/TabUtils.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class TabUtils {
public static void openUrlInSameTab(String url) {
BraveActivity braveActivity = BraveActivity.getBraveActivity();
if (braveActivity != null) {
if (braveActivity != null && braveActivity.getActivityTab() != null) {
LoadUrlParams loadUrlParams = new LoadUrlParams(url);
braveActivity.getActivityTab().loadUrl(loadUrlParams);
}