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

Commit 0f2773fb authored by cosmohsieh's avatar cosmohsieh
Browse files

[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user... 

[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection

Call NetworkRequestUserSelectionCallback#reject() to notify framework that user quit this request without
selecting any network.

Bug: 138855477
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestErrorDialogFragmentTest
Change-Id: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
parent 34b1e00c

src/com/android/settings/wifi/NetworkRequestDialogActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.os.Handler; 
import android.os.Message;

import android.widget.Toast;

import androidx.annotation.Nullable;

import androidx.fragment.app.DialogFragment;

import androidx.fragment.app.FragmentActivity;

import com.android.settings.R;

import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;
@@ -152,7 +151,9 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements 
        dismissDialogs();



        // Throws error dialog.

        final DialogFragment dialogFragment = NetworkRequestErrorDialogFragment.newInstance();

        final NetworkRequestErrorDialogFragment dialogFragment =

                NetworkRequestErrorDialogFragment.newInstance();

        dialogFragment.setRejectCallback(mUserSelectionCallback);

        final Bundle bundle = new Bundle();

        bundle.putSerializable(NetworkRequestErrorDialogFragment.DIALOG_TYPE, type);

        dialogFragment.setArguments(bundle);

src/com/android/settings/wifi/NetworkRequestErrorDialogFragment.java

+24 −3
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ package com.android.settings.wifi; 
import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.DialogInterface;

import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;

import android.os.Bundle;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.appcompat.app.AlertDialog;

import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -34,6 +37,8 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen 
    public static final String DIALOG_TYPE = "DIALOG_ERROR_TYPE";



    public enum ERROR_DIALOG_TYPE {TIME_OUT, ABORT}

    @Nullable

    private NetworkRequestUserSelectionCallback mRejectCallback;



    public static NetworkRequestErrorDialogFragment newInstance() {

        return new NetworkRequestErrorDialogFragment();
@@ -47,7 +52,7 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen 
    public void onCancel(@NonNull DialogInterface dialog) {

        super.onCancel(dialog);

        // Wants to finish the activity when user clicks back key or outside of the dialog.

        getActivity().finish();

        rejectNetworkRequestAndFinish();

    }



    @Override
@@ -63,10 +68,12 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen 
            builder.setMessage(R.string.network_connection_timeout_dialog_message)

                    .setPositiveButton(R.string.network_connection_timeout_dialog_ok,

                            (dialog, which) -> onRescanClick())

                    .setNegativeButton(R.string.cancel, (dialog, which) -> getActivity().finish());

                    .setNegativeButton(R.string.cancel,

                            (dialog, which) -> rejectNetworkRequestAndFinish());

        } else {

            builder.setMessage(R.string.network_connection_errorstate_dialog_message)

                    .setPositiveButton(R.string.okay, (dialog, which) -> getActivity().finish());

                    .setPositiveButton(R.string.okay,

                            (dialog, which) -> rejectNetworkRequestAndFinish());

        }

        return builder.create();

    }
@@ -76,10 +83,24 @@ public class NetworkRequestErrorDialogFragment extends InstrumentedDialogFragmen 
        return SettingsEnums.WIFI_SCANNING_NEEDED_DIALOG;

    }



    // Sets the callback for fragment to reject this request.

    public void setRejectCallback(NetworkRequestUserSelectionCallback rejectCallback) {

        mRejectCallback = rejectCallback;

    }



    protected void onRescanClick() {

        if (getActivity() != null) {

            dismiss();

            ((NetworkRequestDialogActivity)getActivity()).onClickRescanButton();

        }

    }



    private void rejectNetworkRequestAndFinish() {

        if (getActivity() != null) {

            if (mRejectCallback != null) {

                mRejectCallback.reject();

            }

            getActivity().finish();

        }

    }

}

tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java

+14 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.internal.verification.VerificationModeFactory.times;



import android.content.DialogInterface;

import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;

import android.os.Bundle;

import android.widget.Button;

import androidx.appcompat.app.AlertDialog;
@@ -112,4 +113,17 @@ public class NetworkRequestErrorDialogFragmentTest { 
        negativeButton.performClick();

        assertThat(alertDialog.isShowing()).isFalse();

    }



    @Test

    public void clickNegativeButton_shouldCallReject() {

        final NetworkRequestUserSelectionCallback rejectCallback =

                mock(NetworkRequestUserSelectionCallback.class);

        mFragment.setRejectCallback(rejectCallback);



        final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        final Button negativeButton = alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE);

        negativeButton.performClick();



        verify(rejectCallback, times(1)).reject();

    }

}