| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 44   } | 44   } | 
| 45 | 45 | 
| 46   public void onOk(final View view) | 46   public void onOk(final View view) | 
| 47   { | 47   { | 
| 48     finish(); | 48     finish(); | 
| 49   } | 49   } | 
| 50 | 50 | 
| 51   public void onHelp(final View view) | 51   public void onHelp(final View view) | 
| 52   { | 52   { | 
| 53     final Intent intent; | 53     final Intent intent; | 
| 54     if (ProxyService.NATIVE_PROXY_SUPPORTED) | 54     if (Utils.isNativeProxySupported(this)) | 
| 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       final 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 | 
|---|