blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #3886 - Uses `defaultDeviceName` for the `DeviceConfig` device name

master
Jeff Boek 2019-07-31 21:32:06 -07:00
parent a75c2f7cfb
commit e4700f76c6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
View File

@ -55,9 +55,16 @@ class BackgroundServices(
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 deviceConfig = DeviceConfig(
name = Build.MANUFACTURER + " " + Build.MODEL,
name = defaultDeviceName,
type = DeviceType.MOBILE,
// 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
* logged in account.