Improve manual proxy configuration

src/org/adblockplus/android/ProxyConfigurationActivity.java

 package org.adblockplus.android;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.opengl.Visibility;

[Andrey Novikov, 2013/03/13 07:51:15]

What is it doing here?

[Felix Dahlke, 2013/03/13 08:48:53]

WTF, missed that. I wasn't trying to sneak OpenGL in :D

 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
 public class ProxyConfigurationActivity extends Activity
 {
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.proxyconfiguration);
     int port = getIntent().getIntExtra("port", 0);
-    
-    boolean configurationSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1;

[Andrey Novikov, 2013/03/13 07:51:15]

We have a static application-wide flag for this:
ProxyService.NATIVE_PROXY_SUPPORTED

[Felix Dahlke, 2013/03/13 08:48:53]

Right, I remember lobbying for that, but couldn't find it :P

 
     StringBuilder info = new StringBuilder();
-    int proxySettingsResource = configurationSupported ? R.raw.proxysettings : R.raw.proxysettings_old;

[Andrey Novikov, 2013/03/13 07:51:15]

I would rename it to 'proxySettingsLayout' :) (In fact I would rename it to
'layout', but you do not like short names)

[Felix Dahlke, 2013/03/13 08:48:53]

Yeah, not a great name... Went with textId, seems appropriate. And I don't mind
short names :D

-    AdblockPlus.appendRawTextFile(this, info, proxySettingsResource);
+    int textId = ProxyService.NATIVE_PROXY_SUPPORTED ? R.raw.proxysettings : R.raw.proxysettings_old;
+    AdblockPlus.appendRawTextFile(this, info, textId);
     String msg = String.format(info.toString(), port);
 
     TextView tv = (TextView) findViewById(R.id.message_text);
     tv.setText(Html.fromHtml(msg));
     tv.setMovementMethod(LinkMovementMethod.getInstance());
 
-    Button buttonToHide = (Button) findViewById(configurationSupported ? R.id.gotit : R.id.opensettings);
+    Button buttonToHide = (Button) findViewById(ProxyService.NATIVE_PROXY_SUPPORTED ? R.id.gotit : R.id.opensettings);
     buttonToHide.setVisibility(View.GONE);
   }
 
   public void onGotit(View view)
   {
     finish();
   }
 
   public void onSettings(View view)
   {
     startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
     finish();
   }
 }