Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/org/adblockplus/android/ConfigurationActivity.java

Issue 6074937345310720: Issue 1262 - Wrong proxy configuration message (Closed)
Patch Set: Created Aug. 26, 2014, 12:51 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 (Utils.isNativeProxySupported(this)) 54 if (ProxyService.GLOBAL_PROXY_USER_CONFIGURABLE)
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 }
OLDNEW
« no previous file with comments | « src/org/adblockplus/android/AdvancedPreferences.java ('k') | src/org/adblockplus/android/ProxyConfigurationActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld