Skip to content

Commit fc15e46

Browse files
committed
[cr137][Android] Temporary fix for Utils.getProfile
This function should be removed and proper profile should be passed brave/brave-browser#45937
1 parent 6571399 commit fc15e46

File tree

1 file changed

+11
-3
lines changed
  • android/java/org/chromium/chrome/browser/crypto_wallet/util

1 file changed

+11
-3
lines changed

android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java

+11-3
Original file line numberDiff line numberDiff line change
@@ -1115,23 +1115,31 @@ public static Profile getProfile(boolean isIncognito) {
11151115
chromeActivity = BraveActivity.getChromeTabbedActivity();
11161116
}
11171117
if (chromeActivity == null) {
1118-
return ProfileManager.getLastUsedRegularProfile(); // Last resort
1118+
return getLastUsedProfile(isIncognito); // Last resort
11191119
}
11201120

11211121
ObservableSupplier<TabModelSelector> supplier =
11221122
chromeActivity.getTabModelSelectorSupplier();
11231123
TabModelSelector selector = supplier.get();
11241124
if (selector == null) {
1125-
return ProfileManager.getLastUsedRegularProfile();
1125+
return getLastUsedProfile(isIncognito);
11261126
}
11271127

11281128
Profile profile = selector.getModel(isIncognito).getProfile();
11291129
if (profile == null) {
1130-
return ProfileManager.getLastUsedRegularProfile();
1130+
return getLastUsedProfile(isIncognito);
11311131
}
11321132
return profile;
11331133
}
11341134

1135+
private static Profile getLastUsedProfile(boolean isIncognito) {
1136+
if (!isIncognito) {
1137+
return ProfileManager.getLastUsedRegularProfile();
1138+
} else {
1139+
return ProfileManager.getLastUsedRegularProfile().getPrimaryOtrProfile(true);
1140+
}
1141+
}
1142+
11351143
public static String formatErc721TokenTitle(String title, String id) {
11361144
if (id.isEmpty() || id.equals("0")) {
11371145
return title;

0 commit comments

Comments
 (0)