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

Commit 6347e1b4 authored by Sundeep Ghuman's avatar Sundeep Ghuman
Browse files

IPv6 addresses should not be selectable. 

Disable selectable when adding ipv6 addresses to the
WifiNetworkDetailsPage.

Bug: b/37351354
Test: make RunSettingsRoboTests
Change-Id: I79bc3dcab7339df96598aa1a6505f0148f8844b0
parent 221f9245

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ public class WifiDetailPreferenceController extends PreferenceController impleme 
                Preference pref = new Preference(mPrefContext);

                pref.setKey(ip);

                pref.setTitle(ip);

                pref.setSelectable(false);

                mIpv6AddressCategory.addPreference(pref);

                mIpv6AddressCategory.setVisible(true);

            }

tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java

+38 −1
Original line number Diff line number Diff line
@@ -54,11 +54,13 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import java.net.Inet6Address;

import java.net.InetAddress;

import java.net.UnknownHostException;
@@ -73,6 +75,7 @@ public class WifiDetailPreferenceControllerTest { 
    private static final String SECURITY = "None";



    private InetAddress mIpv4Address;

    private Inet6Address mIpv6Address;



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private PreferenceScreen mockScreen;
@@ -113,6 +116,12 @@ public class WifiDetailPreferenceControllerTest { 
        try {

            mIpv4Address = InetAddress.getByAddress(

                    new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255 });

            mIpv6Address = Inet6Address.getByAddress(

                    "123", /* host */

                    new byte[] {

                            (byte) 0xFE, (byte) 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x11, 0x25,

                            (byte) 0xFF, (byte) 0xFE, (byte) 0xF8, (byte) 0x7C, (byte) 0xB2},

                    1  /*scope id */);

        } catch (UnknownHostException e) {

            throw new RuntimeException(e);

        }
@@ -153,6 +162,8 @@ public class WifiDetailPreferenceControllerTest { 
    }



    private void setupMockedPreferenceScreen() {

        when(mockScreen.getPreferenceManager().getContext()).thenReturn(mContext);



        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_CONNECTION_DETAIL_PREF))

                .thenReturn(mockConnectionDetailPref);

        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SIGNAL_STRENGTH_PREF))
@@ -420,4 +431,30 @@ public class WifiDetailPreferenceControllerTest { 


        verify(mockActivity).finish();

    }



    @Test

    public void ipv6AddressPref_shouldHaveHostAddressTextSet() {

        LinkAddress ipv6Address = new LinkAddress(mIpv6Address, 128);



        mLinkProperties.addLinkAddress(ipv6Address);



        mController.onResume();



        ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(Preference.class);

        verify(mockIpv6AddressCategory).addPreference(preferenceCaptor.capture());

        assertThat(preferenceCaptor.getValue().getTitle()).isEqualTo(mIpv6Address.getHostAddress());

    }



    @Test

    public void ipv6AddressPref_shouldNotBeSelectable() {

        LinkAddress ipv6Address = new LinkAddress(mIpv6Address, 128);



        mLinkProperties.addLinkAddress(ipv6Address);



        mController.onResume();



        ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(Preference.class);

        verify(mockIpv6AddressCategory).addPreference(preferenceCaptor.capture());

        assertThat(preferenceCaptor.getValue().isSelectable()).isFalse();

    }

}