Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f

Browse Source 
am: 6f2d79464d

Change-Id: I88dc4240bc4a8eb84bc3edd7a9f5a873296075fd
This commit is contained in:
Hugo Benichi
2017-06-07 02:56:15 +00:00
committed by android-build-merger
parent 2b64c87366 6f2d79464d
commit 8d60db5241
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/CaptivePortalLogin/res/values/strings.xml
View File

@@ -5,6 +5,7 @@
<string name="action_use_network">Use this network as is</string> <string name="action_use_network">Use this network as is</string>
<string name="action_do_not_use_network">Do not use this network</string> <string name="action_do_not_use_network">Do not use this network</string>
<string name="action_bar_label">Sign in to network</string> <string name="action_bar_label">Sign in to network</string>
<string name="action_bar_title">Sign in to %1$s</string>
<string name="ssl_error_warning">The network you&#8217;re trying to join has security issues.</string> <string name="ssl_error_warning">The network you&#8217;re trying to join has security issues.</string>
<string name="ssl_error_example">For example, the login page may not belong to the organization shown.</string> <string name="ssl_error_example">For example, the login page may not belong to the organization shown.</string>
<string name="ssl_error_continue">Continue anyway via browser</string> <string name="ssl_error_continue">Continue anyway via browser</string>

9
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
View File

@@ -26,6 +26,7 @@ import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.Proxy; import android.net.Proxy;
import android.net.Uri; import android.net.Uri;
@@ -469,8 +470,16 @@ public class CaptivePortalLoginActivity extends Activity {
} }
private String getHeaderTitle() { private String getHeaderTitle() {
NetworkInfo info = mCm.getNetworkInfo(mNetwork);
if (info == null) {
return getString(R.string.action_bar_label); return getString(R.string.action_bar_label);
} }
NetworkCapabilities nc = mCm.getNetworkCapabilities(mNetwork);
if (!nc.hasTransportType(NetworkCapabilities.TRANSPORT_WIFI)) {
return getString(R.string.action_bar_label);
}
return getString(R.string.action_bar_title, info.getExtraInfo().replaceAll("^\"|\"$", ""));
}
private String getHeaderSubtitle(String urlString) { private String getHeaderSubtitle(String urlString) {
URL url = makeURL(urlString); URL url = makeURL(urlString);