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

Commit 2d211208 authored by Arc Wang's avatar Arc Wang
Browse files

[Wi-Fi DPP] remove unused code 


Bug: 120645817
Test: atest com.android.settings.wifi.dpp
Change-Id: I467888de0efe8ae663863e9eacc15e77d32487d2
parent 7c896fa1

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

+2 −11
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import java.util.List; 
 */

public class WifiDppConfiguratorActivity extends InstrumentedActivity implements

        WifiNetworkConfig.Retriever,

        WifiDppQrCodeGeneratorFragment.OnQrCodeGeneratorFragmentAddButtonClickedListener,

        WifiDppQrCodeScannerFragment.OnScanWifiDppSuccessListener,

        WifiDppAddDeviceFragment.OnClickChooseDifferentNetworkListener,

        WifiNetworkListFragment.OnChooseNetworkListener {
@@ -137,7 +136,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
                    cancelActivity = true;

                } else {

                    mWifiNetworkConfig = config;

                    showQrCodeScannerFragment(/* addToBackStack= */ false);

                    showQrCodeScannerFragment();

                }

                break;

            case ACTION_CONFIGURATOR_QR_CODE_GENERATOR:
@@ -180,7 +179,7 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
        }

    }



    private void showQrCodeScannerFragment(boolean addToBackStack) {

    private void showQrCodeScannerFragment() {

        WifiDppQrCodeScannerFragment fragment =

                (WifiDppQrCodeScannerFragment) mFragmentManager.findFragmentByTag(

                        WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
@@ -201,9 +200,6 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 


        fragmentTransaction.replace(R.id.fragment_container, fragment,

                WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);

        if (addToBackStack) {

            fragmentTransaction.addToBackStack(/* name */ null);

        }

        fragmentTransaction.commit();

    }
@@ -323,11 +319,6 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements 
        return true;

    }



    @Override

    public void onQrCodeGeneratorFragmentAddButtonClicked() {

        showQrCodeScannerFragment(/* addToBackStack */ true);

    }



    @Override

    public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {

        mWifiDppQrCode = wifiQrCode;

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

+0 −20
Original line number Diff line number Diff line
@@ -52,12 +52,6 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment { 
        return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;

    }



    // Container Activity must implement this interface

    public interface OnQrCodeGeneratorFragmentAddButtonClickedListener {

        public void onQrCodeGeneratorFragmentAddButtonClicked();

    }

    OnQrCodeGeneratorFragmentAddButtonClickedListener mListener;



    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);
@@ -71,20 +65,6 @@ public class WifiDppQrCodeGeneratorFragment extends WifiDppQrCodeBaseFragment { 
        }

    }



    @Override

    public void onAttach(Context context) {

        super.onAttach(context);



        mListener = (OnQrCodeGeneratorFragmentAddButtonClickedListener) context;

    }



    @Override

    public void onDetach() {

        mListener = null;



        super.onDetach();

    }



    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        final MenuItem menuItem = menu.findItem(Menu.FIRST);

tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java

+0 −8
Original line number Diff line number Diff line
@@ -107,14 +107,6 @@ public class WifiDppConfiguratorActivityTest { 
        assertThat(activity instanceof WifiNetworkConfig.Retriever).isTrue();

    }



    @Test

    public void testActivity_shouldImplementsQrCodeGeneratorFragmentCallback() {

        WifiDppConfiguratorActivity activity = mActivityRule.getActivity();



        assertThat(activity instanceof WifiDppQrCodeGeneratorFragment

                .OnQrCodeGeneratorFragmentAddButtonClickedListener).isTrue();

    }



    @Test

    public void testActivity_shouldImplementsOnScanWifiDppSuccessCallback() {

        WifiDppConfiguratorActivity activity = mActivityRule.getActivity();