Bug 1426864 - Determine private mode via browser toolbar, 2nd edition. r? draft
authorJan Henning <jh+bugzilla@buttercookie.de>
Fri, 22 Dec 2017 18:51:11 +0100
changeset 714601 6c4bf952b408506b085ed0dac707f2650c0171d3
parent 714600 b9c754af5d22ea06de7172f7741fa1b3b4d9b5c3
child 744624 9b723e150c5155c10dc166117f1526a374aee8f2
push id93961
push usermozilla@buttercookie.de
push dateTue, 26 Dec 2017 17:41:15 +0000
bugs1426864, 1426613
milestone59.0a1
Bug 1426864 - Determine private mode via browser toolbar, 2nd edition. r? Similar to maybeSwitchToTab in bug 1426613, a search might be launched while we don't have a selected tab yet. Therefore we determine private mode state via the browser toolbar instead. MozReview-Commit-ID: 4idUR8v7MCx
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -4305,17 +4305,17 @@ public class BrowserApp extends GeckoApp
     }
 
     // BrowserSearch.OnSearchListener
     @Override
     public void onSearch(SearchEngine engine, final String text, final TelemetryContract.Method method) {
         // Don't store searches that happen in private tabs. This assumes the user can only
         // perform a search inside the currently selected tab, which is true for searches
         // that come from SearchEngineRow.
-        if (!Tabs.getInstance().getSelectedTab().isPrivate()) {
+        if (!mBrowserToolbar.isPrivateMode()) {
             storeSearchQuery(text);
         }
 
         // We don't use SearchEngine.getEngineIdentifier because it can
         // return a custom search engine name, which is a privacy concern.
         final String identifierToRecord = (engine.identifier != null) ? engine.identifier : "other";
         recordSearch(GeckoSharedPrefs.forProfile(this), identifierToRecord, method);
         openUrlAndStopEditing(text, engine.name);