blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #5552 - Reverts temporary fix for #5552

master
Jeff Boek 2020-01-06 14:05:31 -08:00 committed by Mihai Adrian
parent 75b87334fa
commit fdb1f505cc
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,6 @@ import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.isInExperiment
import org.mozilla.fenix.test.Mockable
import java.util.FormatFlagsConversionMismatchException
/**
* Component group for background services. These are the components that need to be accessed from within a
@ -55,22 +54,13 @@ class BackgroundServices(
passwordsStorage: SyncableLoginsStore,
secureAbove22Preferences: SecureAbove22Preferences
) {
// // A malformed string is causing crashes.
// This will be removed when the string is fixed. See #5552
fun defaultDeviceName(context: Context): String = try {
fun defaultDeviceName(context: Context): String =
context.getString(
R.string.default_device_name,
context.getString(R.string.app_name),
Build.MANUFACTURER,
Build.MODEL
)
} catch (ex: FormatFlagsConversionMismatchException) {
"%s on %s %s".format(
context.getString(R.string.app_name),
Build.MANUFACTURER,
Build.MODEL
)
}
private val serverConfig = FxaServer.config(context)
private val deviceConfig = DeviceConfig(