Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00
Code Issues Releases Wiki Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/5552 - Reverts temporary fix for https://github.com/mozilla-mobile/fenix/issues/5552

Browse Source
This commit is contained in:
Jeff Boek 2020-01-06 14:05:31 -08:00 committed by Mihai Adrian
parent e23d8662b2
commit 0d2b57ed16
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.ext.settings
import org.mozilla.fenix.isInExperiment import org.mozilla.fenix.isInExperiment
import org.mozilla.fenix.test.Mockable 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 * 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, passwordsStorage: SyncableLoginsStore,
secureAbove22Preferences: SecureAbove22Preferences secureAbove22Preferences: SecureAbove22Preferences
) { ) {
// // A malformed string is causing crashes. fun defaultDeviceName(context: Context): String =
// This will be removed when the string is fixed. See #5552
fun defaultDeviceName(context: Context): String = try {
context.getString( context.getString(
R.string.default_device_name, R.string.default_device_name,
context.getString(R.string.app_name), context.getString(R.string.app_name),
Build.MANUFACTURER, Build.MANUFACTURER,
Build.MODEL 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 serverConfig = FxaServer.config(context)
private val deviceConfig = DeviceConfig( private val deviceConfig = DeviceConfig(