For #3886 - Uses `defaultDeviceName` for the `DeviceConfig` device name
parent
a75c2f7cfb
commit
e4700f76c6
|
@ -55,9 +55,16 @@ class BackgroundServices(
|
||||||
const val REDIRECT_URL = "https://accounts.firefox.com/oauth/success/$CLIENT_ID"
|
const val REDIRECT_URL = "https://accounts.firefox.com/oauth/success/$CLIENT_ID"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private val defaultDeviceName = context.getString(
|
||||||
|
R.string.default_device_name,
|
||||||
|
context.getString(R.string.app_name),
|
||||||
|
Build.MANUFACTURER,
|
||||||
|
Build.MODEL
|
||||||
|
)
|
||||||
|
|
||||||
private val serverConfig = ServerConfig.release(CLIENT_ID, REDIRECT_URL)
|
private val serverConfig = ServerConfig.release(CLIENT_ID, REDIRECT_URL)
|
||||||
private val deviceConfig = DeviceConfig(
|
private val deviceConfig = DeviceConfig(
|
||||||
name = Build.MANUFACTURER + " " + Build.MODEL,
|
name = defaultDeviceName,
|
||||||
type = DeviceType.MOBILE,
|
type = DeviceType.MOBILE,
|
||||||
|
|
||||||
// NB: flipping this flag back and worth is currently not well supported and may need hand-holding.
|
// NB: flipping this flag back and worth is currently not well supported and may need hand-holding.
|
||||||
|
@ -112,13 +119,6 @@ class BackgroundServices(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private val defaultDeviceName = context.getString(
|
|
||||||
R.string.default_device_name,
|
|
||||||
context.getString(R.string.app_name),
|
|
||||||
Build.MANUFACTURER,
|
|
||||||
Build.MODEL
|
|
||||||
)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* When we login/logout of FxA, we need to update our push subscriptions to match the newly
|
* When we login/logout of FxA, we need to update our push subscriptions to match the newly
|
||||||
* logged in account.
|
* logged in account.
|
||||||
|
|
Loading…
Reference in New Issue