Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b91a5577 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "Captive portal login shows specific network name" am: 01fb05cf am:... 

Merge "Captive portal login shows specific network name" am: 01fb05cf am: 93fe99ac am: 75faf02f am: f5b8d187
am: 6c91a5bf

Change-Id: I63f264673f4eb34e69a199f39552704196ab6a78
parents c5fedd9a 6c91a5bf

packages/CaptivePortalLogin/res/values/strings.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -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>

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+10 −1
Original line number Original line Diff line number Diff line
@@ -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.hasTransport(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);