ABP/Android Proxy settings user helper

src/org/adblockplus/android/Preferences.java

 /*
  * This file is part of the Adblock Plus,
  * Copyright (C) 2006-2012 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 26 matching lines @@
 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.Bundle;
 import android.os.IBinder;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.PreferenceManager;
+import android.text.Html;
 import android.text.format.DateFormat;
 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
@@ skipping 264 matching lines @@
         out.flush();
         out.close();
       }
       catch (Exception e)
       {
         Log.e(TAG, "Asset copy error", e);
       }
     }
   }
 
+  public void showProxySettings(View v)
+  {
+    this.startActivity(new Intent(this, ProxyConfigurationActivity.class).putExtra("port", proxyService.port));
+  }
+
   @Override
   protected Dialog onCreateDialog(int id)
   {
     Dialog dialog = null;
     switch (id)
     {
       case ABOUT_DIALOG:
         dialog = new AboutDialog(this);
         break;
       case HIDEICONWARNING_DIALOG:
@@ skipping 37 matching lines @@
       if (hideIcon)
         showDialog(HIDEICONWARNING_DIALOG);
       if (proxyService != null)
         proxyService.setEmptyIcon(hideIcon);
     }
     super.onSharedPreferenceChanged(sharedPreferences, key);
   }
 
   private void showConfigurationMsg(String message)
   {
+    ViewGroup grp = (ViewGroup) findViewById(R.id.grp_configuration);
     TextView msg = (TextView) findViewById(R.id.txt_configuration);
-    msg.setText(message);
-    msg.setVisibility(View.VISIBLE);
+    msg.setText(Html.fromHtml(message));
+    View btn = findViewById(R.id.btn_configuration);
+    btn.setVisibility(ProxyService.hasNativeProxy ? View.VISIBLE : View.GONE);
+    grp.setVisibility(View.VISIBLE);
   }
 
   private void hideConfigurationMsg()
   {
-    TextView msg = (TextView) findViewById(R.id.txt_configuration);
-    msg.setVisibility(View.GONE);
+    ViewGroup grp = (ViewGroup) findViewById(R.id.grp_configuration);
+    grp.setVisibility(View.GONE);
   }
 
   private BroadcastReceiver receiver = new BroadcastReceiver()
   {
     @Override
     public void onReceive(Context context, Intent intent)
     {
       String action = intent.getAction();
       Bundle extra = intent.getExtras();
       if (action.equals(ProxyService.BROADCAST_STATE_CHANGED))
@@ skipping 103 matching lines @@
         showConfigurationMsg(getString(R.string.msg_configuration, proxyService.port));
     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }