Usage of new API, cleanups (reduced)

src/org/adblockplus/android/Preferences.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 54 matching lines @@
   private static final String TAG = Utils.getTag(Preferences.class);
   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;
 
-  @SuppressWarnings("deprecation")
   @Override
   public void onCreate(final Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
 
     PreferenceManager.setDefaultValues(this, R.xml.preferences, true);
     PreferenceManager.setDefaultValues(this, R.xml.preferences_advanced, true);
     setContentView(R.layout.preferences);
     addPreferencesFromResource(R.xml.preferences);
 
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
     // Check if we need to update assets
     final int lastVersion = prefs.getInt(getString(R.string.pref_version), 0);
     try
     {
       final int thisVersion = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
       if (lastVersion != thisVersion)
       {
         copyAssets();
         final SharedPreferences.Editor editor = prefs.edit();
         editor.putInt(getString(R.string.pref_version), thisVersion);
         editor.commit();
       }
     }
     catch (final NameNotFoundException e)
     {
       copyAssets();
     }
-    Log.d(TAG, "onCreateDone");
-  }
-
-  @SuppressWarnings("deprecation")
+  }
+
   @Override
   protected void onStart()
   {
     super.onStart();
     final AdblockPlus application = AdblockPlus.getApplication();
     application.startEngine();
 
     // Initialize subscription list
     subscriptionList = (RefreshableListPreference) findPreference(getString(R.string.pref_subscription));
     final Subscription[] subscriptions = application.getRecommendedSubscriptions();
-
     final String[] entries = new String[subscriptions.length];
     final String[] entryValues = new String[subscriptions.length];
     int i = 0;
     for (final Subscription subscription : subscriptions)
     {
       entries[i] = subscription.title;
       entryValues[i] = subscription.url;
       i++;
     }
     subscriptionList.setEntries(entries);
     subscriptionList.setEntryValues(entryValues);
 
     // Set Acceptable Ads FAQ link
     final HelpfulCheckBoxPreference acceptableAdsCheckBox =
         (HelpfulCheckBoxPreference) findPreference(getString(R.string.pref_acceptableads));
     acceptableAdsCheckBox.setHelpUrl(AdblockPlus.getApplication().getAcceptableAdsUrl());
   }
 
-  @SuppressWarnings("deprecation")
   @Override
   public void onResume()
   {
     super.onResume();
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
     final AdblockPlus application = AdblockPlus.getApplication();
 
     Subscription current = null;
     final Subscription[] subscriptions = application.getListedSubscriptions();
@@ skipping 108 matching lines @@
   }
 
   @Override
   public boolean onCreateOptionsMenu(final Menu menu)
   {
     final MenuInflater inflater = getSupportMenuInflater();
     inflater.inflate(R.menu.menu_preferences, menu);
     return true;
   }
 
-  @SuppressWarnings("deprecation")
   @Override
   public boolean onOptionsItemSelected(final MenuItem item)
   {
     switch (item.getItemId())
     {
       case R.id.menu_help:
         final Uri uri = Uri.parse(getString(R.string.configuring_url));
         final Intent intent = new Intent(Intent.ACTION_VIEW, uri);
         startActivity(intent);
         return true;
       case R.id.menu_about:
         showDialog(ABOUT_DIALOG);
         return true;
       case R.id.menu_advanced:
         startActivity(new Intent(this, AdvancedPreferences.class));
         return true;
       default:
         return super.onOptionsItemSelected(item);
     }
   }
 
-  @SuppressWarnings("deprecation")
   private void setAcceptableAdsEnabled(final boolean enabled)
   {
     final CheckBoxPreference acceptableAdsPreference =
         (CheckBoxPreference) findPreference(getString(R.string.pref_acceptableads));
     acceptableAdsPreference.setChecked(enabled);
     final AdblockPlus application = AdblockPlus.getApplication();
     application.setAcceptableAdsEnabled(enabled);
   }
 
-  @SuppressWarnings("deprecation")
   private void setFilteringEnabled(final boolean enabled)
   {
     final 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);
     final AdblockPlus application = AdblockPlus.getApplication();
     application.setFilteringEnabled(enabled);
   }
 
@@ skipping 89 matching lines @@
             }
           });
         }
         builder.setMessage(Html.fromHtml(message.toString()));
         dialog = builder.create();
         break;
     }
     return dialog;
   }
 
-  @SuppressWarnings("deprecation")
   @Override
   public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences, final String key)
   {
     final AdblockPlus application = AdblockPlus.getApplication();
     if (getString(R.string.pref_enabled).equals(key))
     {
       final boolean enabled = sharedPreferences.getBoolean(key, false);
       final boolean autoconfigured = sharedPreferences.getBoolean(getString(R.string.pref_proxyautoconfigured), false);
       final boolean serviceRunning = application.isServiceRunning();
       application.setFilteringEnabled(enabled);
       if (enabled)
       {
         // If user has enabled filtering, enable proxy as well
         setProxyEnabled(true);
       }
       else if (serviceRunning && autoconfigured)
       {
-        // If user disabled filtering disable proxy only if it was
-        // autoconfigured
+        // If user disabled filtering disable proxy only if it was autoconfigured
         stopService(new Intent(this, ProxyService.class));
       }
     }
     else if (getString(R.string.pref_acceptableads).equals(key))
     {
       final boolean enabled = sharedPreferences.getBoolean(key, false);
       application.setAcceptableAdsEnabled(enabled);
     }
     else if (getString(R.string.pref_subscription).equals(key))
     {
@@ skipping 77 matching lines @@
   };
 
   /**
    * Constructs and updates subscription status text.
    *
    * @param text
    *          status message
    * @param time
    *          time of last change
    */
-  @SuppressWarnings("deprecation")
   private void setSubscriptionStatus(final String text, final long time)
   {
     final ListPreference subscriptionList = (ListPreference) findPreference(getString(R.string.pref_subscription));
     final CharSequence summary = subscriptionList.getEntry();
     final StringBuilder builder = new StringBuilder();
     if (summary != null)
     {
       builder.append(summary);
       if (text != "")
       {
@@ skipping 47 matching lines @@
     }
 
     @Override
     public void onServiceDisconnected(final ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }