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

Commit b5f94599 authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

Merge changes I6abbfc5d,I1ce1b014 

* changes:
  Fix Wi-Fi DPP activity crash after configuration change.
  Implement Wi-Fi DPP flow
parents 9f08f6c7 dcf3f290

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -2104,6 +2104,12 @@ 
    <string name="wifi_dpp_add_another_device">Add another device</string>

    <!-- Button label to choose different Wi-Fi network [CHAR LIMIT=80]  -->

    <string name="wifi_dpp_choose_different_network">Choose different network</string>

    <!-- Hint for QR code detection [CHAR LIMIT=50]  -->

    <string name="wifi_dpp_could_not_add_device">Couldn\u2019t add device</string>

    <!-- Title for the fragment to show that device found but naming known [CHAR LIMIT=50]  -->

    <string name="wifi_dpp_device_found">Device found</string>

     <!-- Label for the try again button [CHAR LIMIT=20]-->

    <string name="retry">Retry</string>

    <!-- Label for the check box to share a network with other users on the same device -->

    <string name="wifi_shared">Share with other device users</string>

    <!-- Hint for unchanged fields -->

src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java

+44 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.app.Activity; 
import android.content.Context;

import android.net.wifi.WifiManager;

import android.os.Bundle;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;
@@ -55,6 +56,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { 
            // Update success UI.

            mTitle.setText(R.string.wifi_dpp_wifi_shared_with_device);

            mSummary.setVisibility(View.INVISIBLE);

            mChooseDifferentNetwork.setVisibility(View.INVISIBLE);

            mButtonLeft.setText(R.string.wifi_dpp_add_another_device);

            mButtonLeft.setOnClickListener(v -> getFragmentManager().popBackStack());

            mButtonRight.setText(R.string.done);
@@ -63,8 +65,13 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { 


        @Override

        public void onFailure(int code) {

            //TODO(b/122429170): Show DPP configuration error state UI

            Log.d(TAG, "DppStatusCallback.onFailure " + code);



            // Update fail UI.

            mTitle.setText(R.string.wifi_dpp_could_not_add_device);

            mSummary.setVisibility(View.INVISIBLE);

            mChooseDifferentNetwork.setVisibility(View.INVISIBLE);

            mButtonRight.setText(R.string.retry);

        }



        @Override
@@ -99,6 +106,15 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { 
    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);



        final WifiQrCode wifiQrCode = ((WifiDppConfiguratorActivity) getActivity())

                .getWifiDppQrCode();

        final String information = wifiQrCode.getInformation();

        if (TextUtils.isEmpty(information)) {

            mTitle.setText(R.string.wifi_dpp_device_found);

        } else {

            mTitle.setText(information);

        }



        final WifiNetworkConfig wifiNetworkConfig = ((WifiDppConfiguratorActivity) getActivity())

                .getWifiNetworkConfig();

        if (!WifiNetworkConfig.isValidConfig(wifiNetworkConfig)) {
@@ -110,7 +126,8 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { 
        mWifiApPictureView = view.findViewById(R.id.wifi_ap_picture_view);



        mChooseDifferentNetwork = view.findViewById(R.id.choose_different_network);

        mChooseDifferentNetwork.setOnClickListener(v -> getFragmentManager().popBackStack());

        mChooseDifferentNetwork.setOnClickListener(v ->

                mClickChooseDifferentNetworkListener.onClickChooseDifferentNetwork());



        mButtonLeft = view.findViewById(R.id.button_left);

        mButtonLeft.setText(R.string.cancel);
@@ -125,11 +142,34 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { 
    }



    private void startWifiDppInitiator() {

        final String enrolleeUri = ((WifiDppConfiguratorActivity) getActivity()).getDppUri();

        final WifiQrCode wifiQrCode = ((WifiDppConfiguratorActivity) getActivity())

                .getWifiDppQrCode();

        final String qrCode = wifiQrCode.getQrCode();

        final int networkId =

                ((WifiDppConfiguratorActivity) getActivity()).getWifiNetworkConfig().getNetworkId();

        final WifiManager wifiManager = getContext().getSystemService(WifiManager.class);

        wifiManager.startDppAsConfiguratorInitiator(enrolleeUri, networkId,



        wifiManager.startDppAsConfiguratorInitiator(qrCode, networkId,

                WifiManager.DPP_NETWORK_ROLE_STA, /* handler */ null, new DppStatusCallback());

    }



    // Container Activity must implement this interface

    public interface OnClickChooseDifferentNetworkListener {

        public void onClickChooseDifferentNetwork();

    }

    OnClickChooseDifferentNetworkListener mClickChooseDifferentNetworkListener;



    @Override

    public void onAttach(Context context) {

        super.onAttach(context);



        mClickChooseDifferentNetworkListener = (OnClickChooseDifferentNetworkListener) context;

    }



    @Override

    public void onDetach() {

        mClickChooseDifferentNetworkListener = null;



        super.onDetach();

    }

}

src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java

+70 −17
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Intent; 
import android.os.Bundle;

import android.util.Log;



import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentTransaction;
@@ -51,7 +52,8 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
        WifiNetworkConfig.Retriever,

        WifiDppQrCodeGeneratorFragment.OnQrCodeGeneratorFragmentAddButtonClickedListener,

        WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener,

        WifiDppQrCodeScannerFragment.OnScanZxingWifiFormatSuccessListener {

        WifiDppQrCodeScannerFragment.OnScanZxingWifiFormatSuccessListener,

        WifiDppAddDeviceFragment.OnClickChooseDifferentNetworkListener {

    private static final String TAG = "WifiDppConfiguratorActivity";



    public static final String ACTION_CONFIGURATOR_QR_CODE_SCANNER =
@@ -61,14 +63,19 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
    public static final String ACTION_PROCESS_WIFI_DPP_QR_CODE =

            "android.settings.PROCESS_WIFI_DPP_QR_CODE";



    // Key for Bundle usage

    private static final String KEY_QR_CODE = "key_qr_code";

    private static final String KEY_WIFI_SECURITY = "key_wifi_security";

    private static final String KEY_WIFI_SSID = "key_wifi_ssid";

    private static final String KEY_WIFI_PRESHARED_KEY = "key_wifi_preshared_key";

    private static final String KEY_WIFI_HIDDEN_SSID = "key_wifi_hidden_ssid";

    private static final String KEY_WIFI_NETWORK_ID = "key_wifi_network_id";



    private FragmentManager mFragmentManager;



    /** The Wi-Fi network which will be configured */

    private WifiNetworkConfig mWifiNetworkConfig;



    /** The uri from Wi-Fi DPP QR code */

    private String mDppUri;



    /** The Wi-Fi DPP QR code from intent ACTION_PROCESS_WIFI_DPP_QR_CODE */

    private WifiQrCode mWifiDppQrCode;
@@ -81,6 +88,21 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (savedInstanceState != null) {

            String qrCode = savedInstanceState.getString(KEY_QR_CODE);



            mWifiDppQrCode = getValidWifiDppQrCodeOrNull(qrCode);



            String security = savedInstanceState.getString(KEY_WIFI_SECURITY);

            String ssid = savedInstanceState.getString(KEY_WIFI_SSID);

            String preSharedKey = savedInstanceState.getString(KEY_WIFI_PRESHARED_KEY);

            boolean hiddenSsid = savedInstanceState.getBoolean(KEY_WIFI_HIDDEN_SSID);

            int networkId = savedInstanceState.getInt(KEY_WIFI_NETWORK_ID);



            mWifiNetworkConfig = WifiNetworkConfig.getValidConfigOrNull(security, ssid,

                    preSharedKey, hiddenSsid, networkId);

        }



        setContentView(R.layout.wifi_dpp_activity);

        mFragmentManager = getSupportFragmentManager();
@@ -117,7 +139,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
                break;

            case ACTION_PROCESS_WIFI_DPP_QR_CODE:

                String qrCode = intent.getStringExtra(WifiDppUtils.EXTRA_QR_CODE);

                mWifiDppQrCode = getValidWiFiDppQrCodeOrNull(qrCode);

                mWifiDppQrCode = getValidWifiDppQrCodeOrNull(qrCode);

                if (mWifiDppQrCode == null) {

                    cancelActivity = true;

                } else {
@@ -205,7 +227,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
        fragmentTransaction.commit();

    }



    private WifiQrCode getValidWiFiDppQrCodeOrNull(String qrCode) {

    private WifiQrCode getValidWifiDppQrCodeOrNull(String qrCode) {

        WifiQrCode wifiQrCode;

        try {

            wifiQrCode = new WifiQrCode(qrCode);
@@ -225,16 +247,12 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
        return mWifiNetworkConfig;

    }



    public String getDppUri() {

        return mDppUri;

    }



    public WifiQrCode getWifiDppQrCode() {

        return mWifiDppQrCode;

    }



    @Override

    public boolean setWifiNetworkConfig(WifiNetworkConfig config) {

    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    protected boolean setWifiNetworkConfig(WifiNetworkConfig config) {

        if(!WifiNetworkConfig.isValidConfig(config)) {

            return false;

        } else {
@@ -243,6 +261,20 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
        }

    }



    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)

    protected boolean setWifiDppQrCode(WifiQrCode wifiQrCode) {

        if (wifiQrCode == null) {

            return false;

        }



        if (!WifiQrCode.SCHEME_DPP.equals(wifiQrCode.getScheme())) {

            return false;

        }



        mWifiDppQrCode = new WifiQrCode(wifiQrCode.getQrCode());

        return true;

    }



    @Override

    public boolean onNavigateUp() {

        Fragment fragment = mFragmentManager.findFragmentById(R.id.fragment_container);
@@ -263,17 +295,38 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
    }



    @Override

    public void onScanWifiDppSuccess(String uri) {

        mDppUri = uri;

    public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {

        mWifiDppQrCode = wifiQrCode;



        showAddDeviceFragment(/* addToBackStack */ true);

    }



    @Override

    public void onScanZxingWifiFormatSuccess(WifiNetworkConfig wifiNetworkConfig) {

        mDppUri = null;

        mWifiNetworkConfig = new WifiNetworkConfig(wifiNetworkConfig);

        // Do nothing, it's impossible to be a configurator without a Wi-Fi DPP QR code

    }



        showAddDeviceFragment(/* addToBackStack */ true);

    @Override

    public void onClickChooseDifferentNetwork() {

        mWifiNetworkConfig = null;



        showChooseSavedWifiNetworkFragment(/* addToBackStack */ true);

    }



    @Override

    public void onSaveInstanceState(Bundle outState) {

        if (mWifiDppQrCode != null) {

            outState.putString(KEY_QR_CODE, mWifiDppQrCode.getQrCode());

        }



        if (mWifiNetworkConfig != null) {

            outState.putString(KEY_WIFI_SECURITY, mWifiNetworkConfig.getSecurity());

            outState.putString(KEY_WIFI_SSID, mWifiNetworkConfig.getSsid());

            outState.putString(KEY_WIFI_PRESHARED_KEY, mWifiNetworkConfig.getPreSharedKey());

            outState.putBoolean(KEY_WIFI_HIDDEN_SSID, mWifiNetworkConfig.getHiddenSsid());

            outState.putInt(KEY_WIFI_NETWORK_ID, mWifiNetworkConfig.getNetworkId());

        }



        super.onSaveInstanceState(outState);

    }

}

src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -145,9 +145,10 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements 
    }



    @Override

    public void onScanWifiDppSuccess(String uri) {

    public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {

        final WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);

        wifiManager.startDppAsEnrolleeInitiator(uri, /* handler */ null, new DppStatusCallback());

        wifiManager.startDppAsEnrolleeInitiator(wifiQrCode.getQrCode(), /* handler */ null,

                new DppStatusCallback());

    }



    @Override

src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java

+16 −22
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl 


    // Container Activity must implement this interface

    public interface OnScanWifiDppSuccessListener {

        public void onScanWifiDppSuccess(String uri);

        public void onScanWifiDppSuccess(WifiQrCode wifiQrCode);

    }

    OnScanWifiDppSuccessListener mScanWifiDppSuccessListener;
@@ -108,7 +108,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl 
    public interface OnScanZxingWifiFormatSuccessListener {

        public void onScanZxingWifiFormatSuccess(WifiNetworkConfig wifiNetworkConfig);

    }

    OnScanZxingWifiFormatSuccessListener mScanScanZxingWifiFormatSuccessListener;

    OnScanZxingWifiFormatSuccessListener mScanZxingWifiFormatSuccessListener;



    /**

     * Configurator container activity of the fragment should create instance with this constructor.
@@ -146,13 +146,13 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl 
        super.onAttach(context);



        mScanWifiDppSuccessListener = (OnScanWifiDppSuccessListener) context;

        mScanScanZxingWifiFormatSuccessListener = (OnScanZxingWifiFormatSuccessListener) context;

        mScanZxingWifiFormatSuccessListener = (OnScanZxingWifiFormatSuccessListener) context;

    }



    @Override

    public void onDetach() {

        mScanWifiDppSuccessListener = null;

        mScanScanZxingWifiFormatSuccessListener = null;

        mScanZxingWifiFormatSuccessListener = null;



        super.onDetach();

    }
@@ -278,11 +278,11 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl 
    public void handleSuccessfulResult(String qrCode) {

        switch (mWifiQrCode.getScheme()) {

            case WifiQrCode.SCHEME_DPP:

                handleWifiDpp(qrCode);

                handleWifiDpp();

                break;



            case WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG:

                handleZxingWifiFormat(mWifiQrCode.getWifiNetworkConfig());

                handleZxingWifiFormat();

                break;



            default:
@@ -290,25 +290,22 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl 
        }

    }



    private void handleWifiDpp(String uri) {

    private void handleWifiDpp() {

        destroyCamera();

        mDecorateView.setFocused(true);



        final Bundle bundle = new Bundle();

        bundle.putString(KEY_PUBLIC_URI, uri);



        Message message = mHandler.obtainMessage(MESSAGE_SCAN_WIFI_DPP_SUCCESS);

        message.setData(bundle);

        message.obj = new WifiQrCode(mWifiQrCode.getQrCode());



        mHandler.sendMessageDelayed(message, SHOW_SUCCESS_SQUARE_INTERVAL);

    }



    private void handleZxingWifiFormat(WifiNetworkConfig wifiNetworkConfig) {

    private void handleZxingWifiFormat() {

        destroyCamera();

        mDecorateView.setFocused(true);



        Message message = mHandler.obtainMessage(MESSAGE_SCAN_ZXING_WIFI_FORMAT_SUCCESS);

        message.obj = wifiNetworkConfig;

        message.obj = new WifiQrCode(mWifiQrCode.getQrCode()).getWifiNetworkConfig();



        mHandler.sendMessageDelayed(message, SHOW_SUCCESS_SQUARE_INTERVAL);

    }
@@ -359,17 +356,14 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl 
                    if (mScanWifiDppSuccessListener == null) {

                        return;

                    }

                    final Bundle bundle = msg.getData();

                    final String uri = bundle.getString(KEY_PUBLIC_URI);



                    mScanWifiDppSuccessListener.onScanWifiDppSuccess(uri);

                    mScanWifiDppSuccessListener.onScanWifiDppSuccess((WifiQrCode)msg.obj);

                    break;



                case MESSAGE_SCAN_ZXING_WIFI_FORMAT_SUCCESS:

                    if (mScanScanZxingWifiFormatSuccessListener == null) {

                    if (mScanZxingWifiFormatSuccessListener == null) {

                        return;

                    }

                    mScanScanZxingWifiFormatSuccessListener.onScanZxingWifiFormatSuccess(

                    mScanZxingWifiFormatSuccessListener.onScanZxingWifiFormatSuccess(

                            (WifiNetworkConfig)msg.obj);

                    break;