PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix WifiPrivacy for special SSID AP" into main

Browse Source
This commit is contained in:
Weng Su
2024-08-30 09:25:46 +00:00
committed by Android (Google) Code Review
parent 2d07418b8b 407f69fec5
commit e8c9816d15
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/details2/WifiPrivacyPageProvider.kt
View File

@@ -55,6 +55,7 @@ import com.android.settingslib.spa.widget.ui.CategoryTitle
import com.android.wifitrackerlib.WifiEntry import com.android.wifitrackerlib.WifiEntry
import java.time.Clock import java.time.Clock
import java.time.ZoneOffset import java.time.ZoneOffset
import java.util.Base64
const val WIFI_ENTRY_KEY = "wifiEntryKey" const val WIFI_ENTRY_KEY = "wifiEntryKey"
@@ -68,7 +69,8 @@ object WifiPrivacyPageProvider : SettingsPageProvider {
@Composable @Composable
override fun Page(arguments: Bundle?) { override fun Page(arguments: Bundle?) {
val wifiEntryKey = arguments!!.getString(WIFI_ENTRY_KEY) val wifiEntryKey =
String(Base64.getUrlDecoder().decode(arguments!!.getString(WIFI_ENTRY_KEY)))
if (wifiEntryKey != null) { if (wifiEntryKey != null) {
val context = LocalContext.current val context = LocalContext.current
val lifecycle = LocalLifecycleOwner.current.lifecycle val lifecycle = LocalLifecycleOwner.current.lifecycle
@@ -81,7 +83,7 @@ object WifiPrivacyPageProvider : SettingsPageProvider {
fun getRoute( fun getRoute(
wifiEntryKey: String, wifiEntryKey: String,
): String = "${name}/$wifiEntryKey" ): String = "${name}/${Base64.getUrlEncoder().encodeToString(wifiEntryKey.toByteArray())}"
} }
@Composable @Composable