Only execute first run logic once

src/org/adblockplus/android/Preferences.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 48 matching lines @@
  */
 public class Preferences extends SummarizedPreferences
 {
   private static final String TAG = "Preferences";
 
   private static final int ABOUT_DIALOG = 1;
   private static final int HIDEICONWARNING_DIALOG = 2;
 
   private static ProxyService proxyService = null;
 
+  private static boolean firstRunActionsPending = true;
+
   private RefreshableListPreference subscriptionList;
 
   private String subscriptionSummary;
 
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
 
     PreferenceManager.setDefaultValues(this, R.xml.preferences, true);
@@ skipping 53 matching lines @@
 
     final AdblockPlus application = AdblockPlus.getApplication();
 
     Subscription current = null;
     Subscription[] subscriptions = application.getListedSubscriptions();
     if (subscriptions.length > 0)
     {
       current = subscriptions[0];
     }
 
-    boolean firstRun = false;
-    if (application.isFirstRun())
+    boolean firstRun = firstRunActionsPending && application.isFirstRun();
+    if (firstRun && current != null)
     {
-      firstRun = true;
-      
-      if (current != null)
-      {
-        new AlertDialog.Builder(this).setTitle(R.string.app_name).setMessage(String.format(getString(R.string.msg_subscription_offer, current.title))).setIcon(android.R.drawable.ic_dialog_info)
-            .setPositiveButton(R.string.ok, null).create().show();
-      }
+      new AlertDialog.Builder(this).setTitle(R.string.app_name)
+          .setMessage(String.format(getString(R.string.msg_subscription_offer, current.title)))
+          .setIcon(android.R.drawable.ic_dialog_info)
+          .setPositiveButton(R.string.ok, null).create().show();
     }
 
     // Enable manual subscription refresh
     subscriptionList.setOnRefreshClickListener(new View.OnClickListener()
     {
       @Override
       public void onClick(View v)
       {
         application.refreshSubscriptions();
       }
@@ skipping 22 matching lines @@
 
     // This is weird but UI does not update on back button (when returning from advanced preferences)
     ((SwitchPreference) findPreference(getString(R.string.pref_enabled))).setChecked(enabled);
 
     if (enabled || firstRun)
       setFilteringEnabled(true);
     if (enabled || firstRun || (proxyenabled && !autoconfigured))
       setProxyEnabled(true);
 
     bindService(new Intent(this, ProxyService.class), proxyServiceConnection, 0);
+    firstRunActionsPending = false;

[Wladimir Palant, 2013/11/08 06:08:20]

IMHO it's better to group related operations - I would set that immediately
after setting firstRun variable.

[Felix Dahlke, 2013/11/08 08:37:36]

Hehe, I was actually pondering that :) I'd prefer it up there, but concluded
that it might be misleading to have firstRunActionsPending set to false before
any first run actions have been executed. But I guess it's still better.

   }
 
   @Override
   public void onPause()
   {
     super.onPause();
     try
     {
       unregisterReceiver(receiver);
     }
@@ skipping 320 matching lines @@
         showConfigurationMsg(getString(R.string.msg_configuration));
     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }