Skip to content

Commit 2a600bf

Browse files
samartnikmkarolin
authored andcommitted
[cr137][Android] Temporary fix for Utils.getProfile
This function should be removed and proper profile should be passed brave/brave-browser#45937
1 parent 83ada9c commit 2a600bf

File tree

1 file changed

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

1 file changed

+13
-3
lines changed

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

+13-3
Original file line numberDiff line numberDiff line change
@@ -1104,6 +1104,7 @@ public static Spanned geteTldSpanned(OriginInfo originInfo) {
11041104
return AndroidUtils.formatHTML(geteTldHtmlString(originInfo));
11051105
}
11061106

1107+
@Nullable
11071108
public static Profile getProfile(boolean isIncognito) {
11081109
ChromeActivity chromeActivity = null;
11091110
try {
@@ -1115,23 +1116,32 @@ public static Profile getProfile(boolean isIncognito) {
11151116
chromeActivity = BraveActivity.getChromeTabbedActivity();
11161117
}
11171118
if (chromeActivity == null) {
1118-
return ProfileManager.getLastUsedRegularProfile(); // Last resort
1119+
return getLastUsedProfile(isIncognito); // Last resort
11191120
}
11201121

11211122
ObservableSupplier<TabModelSelector> supplier =
11221123
chromeActivity.getTabModelSelectorSupplier();
11231124
TabModelSelector selector = supplier.get();
11241125
if (selector == null) {
1125-
return ProfileManager.getLastUsedRegularProfile();
1126+
return getLastUsedProfile(isIncognito);
11261127
}
11271128

11281129
Profile profile = selector.getModel(isIncognito).getProfile();
11291130
if (profile == null) {
1130-
return ProfileManager.getLastUsedRegularProfile();
1131+
return getLastUsedProfile(isIncognito);
11311132
}
11321133
return profile;
11331134
}
11341135

1136+
@Nullable
1137+
private static Profile getLastUsedProfile(boolean isIncognito) {
1138+
if (!isIncognito) {
1139+
return ProfileManager.getLastUsedRegularProfile();
1140+
} else {
1141+
return ProfileManager.getLastUsedRegularProfile().getPrimaryOtrProfile(true);
1142+
}
1143+
}
1144+
11351145
public static String formatErc721TokenTitle(String title, String id) {
11361146
if (id.isEmpty() || id.equals("0")) {
11371147
return title;

0 commit comments

Comments
 (0)