Changes according to review, simplified ifs

AlexeyBarabash · AlexeyBarabash · commit a2a11d86b180 · 2024-11-25T17:59:27.000+02:00
diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java b/android/java/org/chromium/chrome/browser/crypto_wallet/util/Utils.java
@@ -1218,13 +1218,9 @@ public static Profile getProfile(boolean isIncognito) {
         if (chromeActivity == null) {
             chromeActivity = BraveActivity.getChromeTabbedActivity();
         }
-        if (chromeActivity == null) {
+        if (chromeActivity == null || !chromeActivity.areTabModelsInitialized()) {
             return ProfileManager.getLastUsedRegularProfile(); // Last resort
         }
-        if (!chromeActivity.areTabModelsInitialized()) {
-            return ProfileManager.getLastUsedRegularProfile();
-        }
-
         return chromeActivity.getTabModelSelector().getModel(isIncognito).getProfile();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1218,13 +1218,9 @@ public static Profile getProfile(boolean isIncognito) {`
`1218`	`1218`	`if (chromeActivity == null) {`
`1219`	`1219`	`chromeActivity = BraveActivity.getChromeTabbedActivity();`
`1220`	`1220`	`}`
`1221`		`- if (chromeActivity == null) {`
	`1221`	`+ if (chromeActivity == null \|\| !chromeActivity.areTabModelsInitialized()) {`
`1222`	`1222`	`return ProfileManager.getLastUsedRegularProfile(); // Last resort`
`1223`	`1223`	`}`
`1224`		`- if (!chromeActivity.areTabModelsInitialized()) {`
`1225`		`- return ProfileManager.getLastUsedRegularProfile();`
`1226`		`- }`
`1227`		`-`
`1228`	`1224`	`return chromeActivity.getTabModelSelector().getModel(isIncognito).getProfile();`
`1229`	`1225`	`}`
`1230`	`1226`