Backed out changeset 297008b7e1f6 (bug 1059792) for mass Android bustage.

mobile/android/base/BrowserApp.java

@@ -82,6 +82,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -152,7 +153,7 @@ public class BrowserApp extends GeckoApp
 
     // Request ID for startActivityForResult.
     private static final int ACTIVITY_REQUEST_PREFERENCES = 1001;
-    private static final String PREF_FIRSTRUN_STARTPANE = "firstrun_startpane";
+    public static final String ACTION_NEW_PROFILE = "org.mozilla.gecko.NEW_PROFILE";
 
     private BrowserSearch mBrowserSearch;
     private View mBrowserSearchContainer;
@@ -610,6 +611,8 @@ public class BrowserApp extends GeckoApp
             "Updater:Launch",
             "BrowserToolbar:Visibility");
 
+        registerOnboardingReceiver(this);
+
         Distribution distribution = Distribution.init(this);
 
         // Init suggested sites engine in BrowserDB.
@@ -670,34 +673,24 @@ public class BrowserApp extends GeckoApp
         }
     }
 
-    /**
-     * Check and show Onboarding start pane if Firefox has never been launched and
-     * is not opening a external link from another application.
-     *
-     * @param context Context of application; used to show Start Pane if appropriate
-     * @param intentAction Intent that launched this activity
-     */
-    private void checkStartPane(Context context, String intentAction) {
-        final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskReads();
+    private void registerOnboardingReceiver(Context context) {
+        final LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
 
-        try {
-            final SharedPreferences prefs = GeckoSharedPrefs.forProfile(this);
-
-            if (prefs.contains(PREF_FIRSTRUN_STARTPANE)) {
-                return;
-             }
-
-            if (!Intent.ACTION_VIEW.equals(intentAction)) {
-                final Intent startIntent = new Intent(this, StartPane.class);
-                context.startActivity(startIntent);
+        // Receiver for launching first run start pane on new profile creation.
+        mOnboardingReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                launchStartPane(BrowserApp.this);
             }
-            // Don't bother trying again to show the v1 minimal first run.
-            prefs.edit().putBoolean(PREF_FIRSTRUN_STARTPANE, true).apply();
+        };
 
-        } finally {
-            StrictMode.setThreadPolicy(savedPolicy);
-        }
-      }
+        lbm.registerReceiver(mOnboardingReceiver, new IntentFilter(ACTION_NEW_PROFILE));
+    }
+
+    private void launchStartPane(Context context) {
+         final Intent startIntent = new Intent(context, StartPane.class);
+         context.startActivity(startIntent);
+     }
 
     private Class<?> getMediaPlayerManager() {
         if (AppConstants.MOZ_MEDIA_PLAYER) {
@@ -1099,8 +1092,6 @@ public class BrowserApp extends GeckoApp
 
     @Override
     protected void initializeChrome() {
-        checkStartPane(this, getIntent().getAction());
-
         super.initializeChrome();
 
         mDoorHangerPopup.setAnchor(mBrowserToolbar.getDoorHangerAnchor());
@@ -2577,6 +2568,7 @@ public class BrowserApp extends GeckoApp
         // or if the user has explicitly enabled the clear on shutdown pref.
         // (We check the pref last to save the pref read.)
         // In ICS+, it's easy to kill an app through the task switcher.
+        final SharedPreferences prefs = GeckoSharedPrefs.forProfile(this);
         final boolean visible = Versions.preICS ||
                                 HardwareUtils.isTelevision() ||
                                 !PrefUtils.getStringSet(GeckoSharedPrefs.forProfile(this),
@@ -2940,8 +2932,6 @@ public class BrowserApp extends GeckoApp
             GeckoAppShell.sendEventToGecko(GeckoEvent.createURILoadEvent(uri));
         }
 
-        checkStartPane(this, action);
-
         if (!mInitialized) {
             return;
         }

mobile/android/base/GeckoProfile.java

@@ -25,6 +25,8 @@ import org.mozilla.gecko.util.INISection;
 
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -654,6 +656,10 @@ public final class GeckoProfile {
             Log.w(LOGTAG, "Couldn't write times.json.", e);
         }
 
+        LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(mApplicationContext);
+        final Intent intent = new Intent(BrowserApp.ACTION_NEW_PROFILE);
+        lbm.sendBroadcast(intent);
+
         return profileDir;
     }