| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <http://adblockplus.org/>, | 2  * This file is part of Adblock Plus <http://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-2014 Eyeo GmbH | 3  * Copyright (C) 2006-2014 Eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 26 import android.widget.TextView; | 26 import android.widget.TextView; | 
| 27 | 27 | 
| 28 /** | 28 /** | 
| 29  * Displays configuration warning message. | 29  * Displays configuration warning message. | 
| 30  */ | 30  */ | 
| 31 public class ConfigurationActivity extends Activity | 31 public class ConfigurationActivity extends Activity | 
| 32 { | 32 { | 
| 33   private int port; | 33   private int port; | 
| 34 | 34 | 
| 35   @Override | 35   @Override | 
| 36   public void onCreate(Bundle savedInstanceState) | 36   public void onCreate(final Bundle savedInstanceState) | 
| 37   { | 37   { | 
| 38     super.onCreate(savedInstanceState); | 38     super.onCreate(savedInstanceState); | 
| 39     setContentView(R.layout.configuration); | 39     setContentView(R.layout.configuration); | 
| 40     port = getIntent().getIntExtra("port", 0); | 40     port = getIntent().getIntExtra("port", 0); | 
| 41     String msg1 = getString(R.string.msg_notraffic); | 41     final String msg1 = getString(R.string.msg_notraffic); | 
| 42     String msg2 = getString(R.string.msg_configuration); | 42     final String msg2 = getString(R.string.msg_configuration); | 
| 43     ((TextView) findViewById(R.id.message_text)).setText(Html.fromHtml(msg1 + " 
    " + msg2)); | 43     ((TextView) findViewById(R.id.message_text)).setText(Html.fromHtml(msg1 + " 
    " + msg2)); | 
| 44   } | 44   } | 
| 45 | 45 | 
| 46   public void onOk(View view) | 46   public void onOk(final View view) | 
| 47   { | 47   { | 
| 48     finish(); | 48     finish(); | 
| 49   } | 49   } | 
| 50 | 50 | 
| 51   public void onHelp(View view) | 51   public void onHelp(final View view) | 
| 52   { | 52   { | 
| 53     Intent intent; | 53     final Intent intent; | 
| 54     if (ProxyService.NATIVE_PROXY_SUPPORTED) | 54     if (ProxyService.NATIVE_PROXY_SUPPORTED) | 
| 55     { | 55     { | 
| 56       intent = new Intent(this, ProxyConfigurationActivity.class).putExtra("port
    ", port); | 56       intent = new Intent(this, ProxyConfigurationActivity.class).putExtra("port
    ", port); | 
| 57     } | 57     } | 
| 58     else | 58     else | 
| 59     { | 59     { | 
| 60       Uri uri = Uri.parse(getString(R.string.configuring_proxy_url)); | 60       final Uri uri = Uri.parse(getString(R.string.configuring_proxy_url)); | 
| 61       intent = new Intent(Intent.ACTION_VIEW, uri); | 61       intent = new Intent(Intent.ACTION_VIEW, uri); | 
| 62     } | 62     } | 
| 63     startActivity(intent); | 63     startActivity(intent); | 
| 64     finish(); | 64     finish(); | 
| 65   } | 65   } | 
| 66 } | 66 } | 
| OLD | NEW | 
|---|