Proxy configurators

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 10 matching lines @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Calendar;
 import java.util.Date;
 
 import org.jraf.android.backport.switchwidget.SwitchPreference;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 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;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
 /**
  * Main settings UI.
  */
 public class Preferences extends SummarizedPreferences
 {
   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;
 
+  private ServiceBinder serviceBinder = null;
+
   @Override
   public void onCreate(final Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
 
+    this.serviceBinder = new ServiceBinder(this).setOnConnectHandler(new ServiceBinder.OnConnectHandler()
+    {
+      @Override
+      public void onConnect(final ProxyService proxyService)
+      {
+        if (proxyService.isManual() && !proxyService.isRegistered())
+        {
+          Preferences.this.showConfigurationMsg(Preferences.this.getString(R.string.msg_configuration));
+        }
+      }
+    });
+
     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
@@ skipping 107 matching lines @@
     final boolean autoconfigured = prefs.getBoolean(getString(R.string.pref_proxyautoconfigured), false);
 
     // This is weird but UI does not update on back button (when returning from advanced preferences)
     ((SwitchPreference) findPreference(getString(R.string.pref_enabled))).setChecked(enabled);
 
     if (enabled || firstRun)
       setFilteringEnabled(true);
     if (enabled || firstRun || (proxyenabled && !autoconfigured))
       setProxyEnabled(true);
 
-    bindService(new Intent(this, ProxyService.class), proxyServiceConnection, 0);
+    this.serviceBinder.bind();
   }
 
   private void showNotificationDialog(final String title, String message, String url)
   {
     url = TextUtils.htmlEncode(url);
     message = TextUtils.htmlEncode(message)
         .replaceAll("&lt;a&gt;(.*?)&lt;/a&gt;", "<a href=\"" + url + "\">$1</a>");
     final TextView messageView = new TextView(this);
     messageView.setText(Html.fromHtml(message));
     messageView.setMovementMethod(LinkMovementMethod.getInstance());
@@ skipping 11 matching lines @@
     super.onPause();
     try
     {
       unregisterReceiver(receiver);
     }
     catch (final IllegalArgumentException e)
     {
       // ignore - it is thrown if receiver is not registered but it can not be
       // true in normal conditions
     }
-    unbindService(proxyServiceConnection);
-    proxyService = null;
+    this.serviceBinder.unbind();
 
     hideConfigurationMsg();
   }
 
   @Override
   protected void onStop()
   {
     super.onStop();
     final AdblockPlus application = AdblockPlus.getApplication();
     if (!application.isFilteringEnabled())
@@ skipping 92 matching lines @@
       }
       catch (final Exception e)
       {
         Log.e(TAG, "Asset copy error", e);
       }
     }
   }
 
   public void showProxySettings(final View v)
   {
-    startActivity(new Intent(this, ProxyConfigurationActivity.class).putExtra("port", proxyService.port));
+    final ProxyService proxyService = this.serviceBinder.get();
+    if (proxyService != null)
+    {
+      startActivity(new Intent(this, ProxyConfigurationActivity.class).putExtra("port", proxyService.port));
+    }
   }
 
   @Override
   protected Dialog onCreateDialog(final int id)
   {
     Dialog dialog = null;
     switch (id)
     {
       case ABOUT_DIALOG:
         dialog = new AboutDialog(this);
@@ skipping 64 matching lines @@
     {
       final String url = sharedPreferences.getString(key, null);
       if (url != null)
         application.setSubscription(url);
     }
     else if (getString(R.string.pref_hideicon).equals(key))
     {
       final boolean hideIcon = sharedPreferences.getBoolean(key, false);
       if (hideIcon)
         showDialog(HIDEICONWARNING_DIALOG);
+      final ProxyService proxyService = this.serviceBinder.get();
       if (proxyService != null)
         proxyService.setEmptyIcon(hideIcon);
     }
     super.onSharedPreferenceChanged(sharedPreferences, key);
   }
 
   private void showConfigurationMsg(final String message)
   {
     final ViewGroup grp = (ViewGroup) findViewById(R.id.grp_configuration);
     final TextView msg = (TextView) findViewById(R.id.txt_configuration);
@@ skipping 104 matching lines @@
     super.onRestoreInstanceState(state);
     subscriptionSummary = state.getString("subscriptionSummary");
   }
 
   @Override
   protected void onSaveInstanceState(final Bundle outState)
   {
     outState.putString("subscriptionSummary", subscriptionSummary);
     super.onSaveInstanceState(outState);
   }
-
-  private final ServiceConnection proxyServiceConnection = new ServiceConnection()
-  {
-    @Override
-    public void onServiceConnected(final ComponentName className, final IBinder service)
-    {
-      proxyService = ((ProxyService.LocalBinder) service).getService();
-      Log.d(TAG, "Proxy service connected");
-
-      if (proxyService.isManual() && proxyService.noTraffic())
-        showConfigurationMsg(getString(R.string.msg_configuration));
-    }
-
-    @Override
-    public void onServiceDisconnected(final ComponentName className)
-    {
-      proxyService = null;
-      Log.d(TAG, "Proxy service disconnected");
-    }
-  };
 }