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

Commit 06ee3f96 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refine Wi-Fi privacy settings" into main

parents bfa49605 739fa3f4
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
package com.android.settings.wifi.details2

import android.content.Context
import android.net.wifi.WifiConfiguration
import android.net.wifi.WifiManager
import android.os.Bundle
import android.os.Handler
@@ -114,19 +113,19 @@ fun WifiPrivacyPage(wifiEntry: WifiEntry) {
                }
            })
            wifiEntry.wifiConfiguration?.let {
                DeviceNameSwitchPreference(it)
                DeviceNameSwitchPreference(wifiEntry)
            }
        }
    }
}

@Composable
fun DeviceNameSwitchPreference(wifiConfiguration: WifiConfiguration){
fun DeviceNameSwitchPreference(wifiEntry: WifiEntry) {
    Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight))
    CategoryTitle(title = stringResource(R.string.wifi_privacy_device_name_settings))
    Spacer(modifier = Modifier.width(SettingsDimension.itemDividerHeight))
    var checked by remember {
        mutableStateOf(wifiConfiguration.isSendDhcpHostnameEnabled)
        mutableStateOf(wifiEntry.wifiConfiguration?.isSendDhcpHostnameEnabled)
    }
    val context = LocalContext.current
    val wifiManager = context.getSystemService(WifiManager::class.java)!!
@@ -143,10 +142,12 @@ fun DeviceNameSwitchPreference(wifiConfiguration: WifiConfiguration){
            }
        override val checked = { checked }
        override val onCheckedChange: (Boolean) -> Unit = { newChecked ->
            wifiConfiguration.isSendDhcpHostnameEnabled = newChecked
            wifiManager.save(wifiConfiguration, null /* listener */)
            wifiEntry.wifiConfiguration?.let {
                it.isSendDhcpHostnameEnabled = newChecked
                wifiManager.save(it, null /* listener */)
                checked = newChecked
            }
        }
    })
}