Update the checkbox when enabling Acceptable Ads

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 23 matching lines @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.AssetManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.PreferenceManager;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
@@ skipping 46 matching lines @@
       }
     }
     catch (NameNotFoundException e)
     {
       copyAssets();
     }
     
     // Set Acceptable Ads FAQ link
     HelpfulCheckBoxPreference acceptableAdsCheckBox = (HelpfulCheckBoxPreference) findPreference(getString(R.string.pref_acceptableads));
     // TODO Set proper url
     acceptableAdsCheckBox.setHelpUrl("https://adblockplus.org/en/acceptable-ads");

[Wladimir Palant, 2013/11/28 08:59:42]

Please address this TODO comment.

   }
 
   @Override
   protected void onStart()
   {
     super.onStart();
     AdblockPlus application = AdblockPlus.getApplication();
     application.startEngine();
 
     // Initialize subscription list
@@ skipping 29 matching lines @@
 
     boolean firstRun = firstRunActionsPending && application.isFirstRun();
     firstRunActionsPending = false;
 
     if (firstRun && current != null)
     {
       showNotificationDialog(getString(R.string.install_name),
           String.format(getString(R.string.msg_subscription_offer, current.title)),
           application.getAcceptableAdsUrl());
       application.setNotifiedAboutAcceptableAds(true);
-      application.setAcceptableAdsEnabled(true);
+      setAcceptableAdsEnabled(true);
     }
     else if (!application.isNotifiedAboutAcceptableAds())
     {
       showNotificationDialog(getString(R.string.acceptableads_name),
           getString(R.string.msg_acceptable_ads), application.getAcceptableAdsUrl());
       application.setNotifiedAboutAcceptableAds(true);
-      application.setAcceptableAdsEnabled(true);
+      setAcceptableAdsEnabled(true);
     }
 
     // Enable manual subscription refresh
     subscriptionList.setOnRefreshClickListener(new View.OnClickListener()
     {
       @Override
       public void onClick(View v)
       {
         application.refreshSubscriptions();
       }
@@ skipping 97 matching lines @@
         showDialog(ABOUT_DIALOG);
         return true;
       case R.id.menu_advanced:
         startActivity(new Intent(this, AdvancedPreferences.class));
         return true;
       default:
         return super.onOptionsItemSelected(item);
     }
   }
 
+  private void setAcceptableAdsEnabled(boolean enabled)
+  {
+    CheckBoxPreference acceptableAdsPreference =
+        (CheckBoxPreference) findPreference(getString(R.string.pref_acceptableads));
+    acceptableAdsPreference.setChecked(enabled);
+    AdblockPlus application = AdblockPlus.getApplication();
+    application.setAcceptableAdsEnabled(enabled);
+  }
+
   private void setFilteringEnabled(boolean enabled)
   {
     SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(this).edit();
     editor.putBoolean(getString(R.string.pref_enabled), enabled);
     editor.commit();
     ((SwitchPreference) findPreference(getString(R.string.pref_enabled))).setChecked(enabled);
     AdblockPlus application = AdblockPlus.getApplication();
     application.setFilteringEnabled(enabled);
   }
 
@@ skipping 266 matching lines @@
         showConfigurationMsg(getString(R.string.msg_configuration));
     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }