Issue 7387 - Onboarding shown again after upgrade

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko;
 
 import android.Manifest;
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ skipping 1096 matching lines @@
 
         if (intent.getBooleanExtra(EXTRA_SKIP_STARTPANE, false)) {
             // Note that we don't set the pref, so subsequent launches can result
             // in the firstrun pane being shown.
             return;
         }
         final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskReads();
 
         try {
             final SharedPreferences prefs = GeckoSharedPrefs.forProfile(this);
 

[jens, 2019/03/28 16:05:28]

Not important at all, but there is a little typo in the comment ('wanna' should
be 'want' or 'wanna do')

[diegocarloslima, 2019/03/28 20:02:13]

Acknowledged.

+            // Mozilla changed the preference name, thus the first run is being showed again after updating. We don't wanna that

[anton, 2019/03/29 04:32:13]

'showed' -> 'shown' ?

+            // See https://issues.adblockplus.org/ticket/7387
+            final String prefFirstRunEnabledBefore57 = GeckoPreferences.NON_PREF_PREFIX + "startpane_enabled";
             if (prefs.getBoolean(FirstrunAnimationContainer.PREF_FIRSTRUN_ENABLED_OLD, true) &&
+                prefs.getBoolean(prefFirstRunEnabledBefore57, true) &&
                 prefs.getBoolean(FirstrunAnimationContainer.PREF_FIRSTRUN_ENABLED, true)) {
                 showSplashScreen = false;
                 if (!Intent.ACTION_VIEW.equals(intent.getAction())) {
                     // Check to see if a distribution has turned off the first run pager.
                     final Distribution distribution = Distribution.getInstance(BrowserApp.this);
                     if (!distribution.shouldWaitForSystemDistribution()) {
                         checkFirstrunInternal();
                     } else {
                         distribution.addOnDistributionReadyCallback(new Distribution.ReadyCallback() {
                             @Override
@@ skipping 3476 matching lines @@
     @Override
     public void onLightweightThemeReset() {
         refreshStatusBarColor();
     }
 
     private void refreshStatusBarColor() {
         final boolean isPrivate = mBrowserToolbar.isPrivateMode();
         WindowUtil.setStatusBarColor(BrowserApp.this, isPrivate);
     }
 }