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

Unified Diff: src/org/adblockplus/android/Preferences.java

Issue 9643003: Improve manual proxy configuration (Closed)
Patch Set: Add guide for Android <= 2.3 devices Created March 12, 2013, 3:45 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« res/raw/proxysettings_old.txt ('K') | « src/org/adblockplus/android/ConfigurationActivity.java ('k') | src/org/adblockplus/android/ProxyConfigurationActivity.java » ('j') | src/org/adblockplus/android/ProxyConfigurationActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/org/adblockplus/android/Preferences.java
===================================================================
--- a/src/org/adblockplus/android/Preferences.java
+++ b/src/org/adblockplus/android/Preferences.java
@@ -414,8 +414,6 @@
ViewGroup grp = (ViewGroup) findViewById(R.id.grp_configuration);
TextView msg = (TextView) findViewById(R.id.txt_configuration);
msg.setText(Html.fromHtml(message));
- View btn = findViewById(R.id.btn_configuration);
- btn.setVisibility(ProxyService.NATIVE_PROXY_SUPPORTED ? View.VISIBLE : View.GONE);
grp.setVisibility(View.VISIBLE);
}
@@ -443,7 +441,7 @@
if (extra.getBoolean("configured"))
hideConfigurationMsg();
else
- showConfigurationMsg(getString(R.string.msg_configuration, extra.getInt("port")));
+ showConfigurationMsg(getString(R.string.msg_configuration));
}
}
else
@@ -536,7 +534,7 @@
Log.d(TAG, "Proxy service connected");
if (proxyService.isManual() && proxyService.noTraffic())
- showConfigurationMsg(getString(R.string.msg_configuration, proxyService.port));
+ showConfigurationMsg(getString(R.string.msg_configuration));
}
public void onServiceDisconnected(ComponentName className)
« res/raw/proxysettings_old.txt ('K') | « src/org/adblockplus/android/ConfigurationActivity.java ('k') | src/org/adblockplus/android/ProxyConfigurationActivity.java » ('j') | src/org/adblockplus/android/ProxyConfigurationActivity.java » ('J')

Powered by Google App Engine
This is Rietveld