Proxy configurators

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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.android;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.adblockplus.android.compat.ProxyProperties;
 import org.adblockplus.android.configurators.IptablesProxyConfigurator;
-import org.adblockplus.android.configurators.ProxyRegistrationType;
 import org.apache.commons.lang.StringUtils;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
@@ skipping 33 matching lines @@
     if (Utils.isNativeProxySupported(this))
     {
       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))
     {
-      // FIXME Do we really want to disable support in dev-builds? ... and what does this do?

[Felix Dahlke, 2014/08/19 09:06:00]

How about creating an issue instead? :)

[René Jeschke, 2014/08/19 10:41:33]

Done.

       screen.removePreference(findPreference(getString(R.string.pref_support)));
     }
     else
     {
       final Preference prefUpdate = findPreference(getString(R.string.pref_checkupdate));
       prefUpdate.setOnPreferenceClickListener(new OnPreferenceClickListener()
       {
         @Override
         public boolean onPreferenceClick(final Preference preference)
         {
@@ skipping 87 matching lines @@
       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()));
 
         final ProxyService proxyService = this.serviceBinder.get();
 
         if (proxyService != null)
         {
           items.add(String.format("Local port: %d", proxyService.port));
-          if (proxyService.getProxyRegistrationType() == ProxyRegistrationType.IPTABLES)
+          if (proxyService.isIptables())
           {
             items.add("Running in root mode");
             items.add("iptables output:");
             final List<String> output = IptablesProxyConfigurator.getIptablesOutput(getApplicationContext());
             if (output != null)
             {
               for (final String line : output)
               {
                 if (StringUtils.isNotEmpty(line))
                   items.add(line);
@@ skipping 53 matching lines @@
               {
                 dialog.cancel();
               }
             });
         dialog = builder.create();
         break;
     }
     return dialog;
   }
 }