Usage of new API, cleanups (reduced)

src/org/adblockplus/android/AdvancedPreferences.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 27 matching lines @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 /**
  * Advanced settings UI.
  */
-@SuppressWarnings("deprecation")
 public class AdvancedPreferences extends SummarizedPreferences
 {
-  private final static String TAG = Utils.getTag(AdvancedPreferences.class);
-  private final static int CONFIGURATION_DIALOG = 1;
+  private static final String TAG = Utils.getTag(AdvancedPreferences.class);
+
+  private static final int CONFIGURATION_DIALOG = 1;
 
   private ProxyService proxyService = null;
 
   @Override
   public void onCreate(final Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
 
-    this.addPreferencesFromResource(R.xml.preferences_advanced);

[Felix Dahlke, 2014/04/16 15:24:25]

ALso a bunch of unrelated changes here, same as before.

[René Jeschke, 2014/04/16 17:51:47]

Done.

+    addPreferencesFromResource(R.xml.preferences_advanced);
 
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
-    final PreferenceScreen screen = this.getPreferenceScreen();
+    final PreferenceScreen screen = getPreferenceScreen();
     if (ProxyService.NATIVE_PROXY_SUPPORTED)
     {
-      screen.removePreference(this.findPreference(this.getString(R.string.pref_proxy)));
-      if (prefs.getBoolean(this.getString(R.string.pref_proxyautoconfigured), false))
-      {
-        screen.removePreference(this.findPreference(this.getString(R.string.pref_proxyenabled)));
-      }
-    }
-    if (this.getResources().getBoolean(R.bool.def_release))
-    {
-      screen.removePreference(this.findPreference(this.getString(R.string.pref_support)));
+      screen.removePreference(findPreference(getString(R.string.pref_proxy)));
+      if (prefs.getBoolean(getString(R.string.pref_proxyautoconfigured), false))
+      {
+        screen.removePreference(findPreference(getString(R.string.pref_proxyenabled)));
+      }
+    }
+    if (getResources().getBoolean(R.bool.def_release))
+    {
+      screen.removePreference(findPreference(getString(R.string.pref_support)));
     }
     else
     {
-      final Preference prefUpdate = this.findPreference(this.getString(R.string.pref_checkupdate));
+      final Preference prefUpdate = findPreference(getString(R.string.pref_checkupdate));
       prefUpdate.setOnPreferenceClickListener(new OnPreferenceClickListener()
       {
         @Override

[Felix Dahlke, 2014/04/16 15:24:25]

Does that mean we're on Java 6 now?

[René Jeschke, 2014/04/16 17:51:47]

The whole code base (please have a look) is a mixture of missing and used
@override annotations, so either we always use them, or we don't.

         public boolean onPreferenceClick(final Preference preference)
         {
           final AdblockPlus application = AdblockPlus.getApplication();
           application.checkUpdates();
           return true;
         }
       });
 
-      final Preference prefConfiguration = this.findPreference(this.getString(R.string.pref_configuration));
+      final Preference prefConfiguration = findPreference(getString(R.string.pref_configuration));
       prefConfiguration.setOnPreferenceClickListener(new OnPreferenceClickListener()
       {
         @Override
         public boolean onPreferenceClick(final Preference preference)
         {
-          AdvancedPreferences.this.showDialog(CONFIGURATION_DIALOG);
+          showDialog(CONFIGURATION_DIALOG);
           return true;
         }
       });
     }
   }
 
   @Override
   public void onResume()
   {
     super.onResume();
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-    final int refresh = Integer.valueOf(prefs.getString(this.getString(R.string.pref_refresh), "0"));
-    this.findPreference(this.getString(R.string.pref_wifirefresh)).setEnabled(refresh > 0);
-    this.connect();
+    final int refresh = Integer.valueOf(prefs.getString(getString(R.string.pref_refresh), "0"));
+    findPreference(getString(R.string.pref_wifirefresh)).setEnabled(refresh > 0);
+    connect();
   }
 
   @Override
   public void onPause()
   {
     super.onPause();
-    this.disconnect();
+    disconnect();
   }
 
   @Override
   public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences, final String key)
   {
-    if (this.getString(R.string.pref_proxyenabled).equals(key))
+    if (getString(R.string.pref_proxyenabled).equals(key))
     {
       final AdblockPlus application = AdblockPlus.getApplication();
       final boolean enabled = sharedPreferences.getBoolean(key, false);
       final boolean serviceRunning = application.isServiceRunning();
       if (enabled)
       {
         if (!serviceRunning)
-        {
-          this.startService(new Intent(this, ProxyService.class));
-        }
+          startService(new Intent(this, ProxyService.class));
       }
       else
       {
         if (serviceRunning)
-        {
-          this.stopService(new Intent(this, ProxyService.class));
-        }
+          stopService(new Intent(this, ProxyService.class));
         // If disabled, disable filtering as well
         final SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putBoolean(this.getString(R.string.pref_enabled), false);
+        editor.putBoolean(getString(R.string.pref_enabled), false);
         editor.commit();
         application.setFilteringEnabled(false);
       }
     }
-    if (this.getString(R.string.pref_refresh).equals(key))
+    if (getString(R.string.pref_refresh).equals(key))
     {
       final int refresh = Integer.valueOf(sharedPreferences.getString(key, "0"));
-      this.findPreference(this.getString(R.string.pref_wifirefresh)).setEnabled(refresh > 0);
-    }
-    if (this.getString(R.string.pref_crashreport).equals(key))
-    {
-      final boolean report = sharedPreferences.getBoolean(key, this.getResources().getBoolean(R.bool.def_crashreport));
+      findPreference(getString(R.string.pref_wifirefresh)).setEnabled(refresh > 0);
+    }
+    if (getString(R.string.pref_crashreport).equals(key))
+    {
+      final boolean report = sharedPreferences.getBoolean(key, getResources().getBoolean(R.bool.def_crashreport));
       try
       {
-        final CrashHandler handler = (CrashHandler)Thread.getDefaultUncaughtExceptionHandler();
+        final CrashHandler handler = (CrashHandler) Thread.getDefaultUncaughtExceptionHandler();
         handler.generateReport(report);
       }
       catch (final ClassCastException e)
       {
         // ignore - default handler in use
       }
     }
     super.onSharedPreferenceChanged(sharedPreferences, key);
   }
 
   @Override
   protected Dialog onCreateDialog(final int id)
   {
     Dialog dialog = null;
     switch (id)
     {
       case CONFIGURATION_DIALOG:
         final List<String> items = new ArrayList<String>();
         items.add(AdblockPlus.getDeviceName());
         items.add(String.format("API: %d Build: %d", Build.VERSION.SDK_INT, AdblockPlus.getApplication().getBuildNumber()));
-        if (this.proxyService != null)
-        {
-          items.add(String.format("Local port: %d", this.proxyService.port));
-          if (this.proxyService.isTransparent())
+        if (proxyService != null)
+        {
+          items.add(String.format("Local port: %d", proxyService.port));
+          if (proxyService.isTransparent())
           {
             items.add("Running in root mode");
             items.add("iptables output:");
-            final List<String> output = this.proxyService.getIptablesOutput();
+            final List<String> output = proxyService.getIptablesOutput();
             if (output != null)
             {
               for (final String line : output)
               {
                 if (!"".equals(line))
-                {
                   items.add(line);
-                }
               }
             }
           }
-          if (this.proxyService.isNativeProxyAutoConfigured())
+          if (proxyService.isNativeProxyAutoConfigured())
           {
             items.add("Has native proxy auto configured");
           }
           if (ProxyService.NATIVE_PROXY_SUPPORTED)
           {
-            final String[] px = ProxySettings.getUserProxy(this.getApplicationContext());
+            final String[] px = ProxySettings.getUserProxy(getApplicationContext());
             if (px != null)
             {
               items.add("System settings:");
               items.add(String.format("Host: [%s] Port: [%s] Excl: [%s]", px[0], px[1], px[2]));
             }
           }
           items.add("Proxy settings:");
-          items.add(String.format("Host: [%s] Port: [%s] Excl: [%s]", this.proxyService.proxy.props.getProperty("adblock.proxyHost"),
-              this.proxyService.proxy.props.getProperty("adblock.proxyPort"),
-              this.proxyService.proxy.props.getProperty("adblock.proxyExcl")));
-          if (this.proxyService.proxy.props.getProperty("adblock.auth") != null)
-          {
+          items.add(String.format("Host: [%s] Port: [%s] Excl: [%s]", proxyService.proxy.props.getProperty("adblock.proxyHost"), proxyService.proxy.props.getProperty("adblock.proxyPort"),
+              proxyService.proxy.props.getProperty("adblock.proxyExcl")));
+          if (proxyService.proxy.props.getProperty("adblock.auth") != null)
             items.add("Auth: yes");
-          }
         }
         else
         {
           items.add("Service not running");
         }
 
         final ScrollView scrollPane = new ScrollView(this);
         final TextView messageText = new TextView(this);
         messageText.setPadding(12, 6, 12, 6);
         messageText.setText(TextUtils.join("\n", items));
         messageText.setOnClickListener(new View.OnClickListener()
         {
+
           @Override
           public void onClick(final View v)
           {
-            final ClipboardManager manager = (ClipboardManager)AdvancedPreferences.this.getSystemService(CLIPBOARD_SERVICE);
-            final TextView showTextParam = (TextView)v;
+            final ClipboardManager manager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+            final TextView showTextParam = (TextView) v;
             manager.setText(showTextParam.getText());
             Toast.makeText(v.getContext(), R.string.msg_clipboard, Toast.LENGTH_SHORT).show();
           }
         });
         scrollPane.addView(messageText);
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setView(scrollPane).setTitle(R.string.configuration_name).setIcon(android.R.drawable.ic_dialog_info).setCancelable(false)
             .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
             {
               @Override
               public void onClick(final DialogInterface dialog, final int id)
               {
                 dialog.cancel();
               }
             });
         dialog = builder.create();
         break;
     }
     return dialog;
   }
 
   private void connect()
   {
-    this.bindService(new Intent(this, ProxyService.class), this.proxyServiceConnection, 0);
+    bindService(new Intent(this, ProxyService.class), proxyServiceConnection, 0);
   }
 
   private void disconnect()
   {
-    this.unbindService(this.proxyServiceConnection);
-    this.proxyService = null;
+    unbindService(proxyServiceConnection);
+    proxyService = null;
   }
 
   private final ServiceConnection proxyServiceConnection = new ServiceConnection()
   {
     @Override
     public void onServiceConnected(final ComponentName className, final IBinder service)
     {
-      AdvancedPreferences.this.proxyService = ((ProxyService.LocalBinder)service).getService();
+      proxyService = ((ProxyService.LocalBinder) service).getService();
       Log.d(TAG, "Proxy service connected");
     }
 
     @Override
     public void onServiceDisconnected(final ComponentName className)
     {
-      AdvancedPreferences.this.proxyService = null;
+      proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }