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 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);
 
     addPreferencesFromResource(R.xml.preferences_advanced);
@@ skipping 136 matching lines @@
           if (ProxyService.NATIVE_PROXY_SUPPORTED)
           {
             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]", proxyService.proxy.props.getProperty("adblock.proxyHost"),
-              proxyService.proxy.props.getProperty("adblock.proxyPort"),
+          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) 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);
@@ skipping 35 matching lines @@
     }
 
     @Override
     public void onServiceDisconnected(final ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }