Bug 1861219 - Resolve breaking changes to the Rust fxa-client

This is mostly just renames.

app/src/androidTest/java/org/mozilla/fenix/components/FxaServer.kt

@@ -5,8 +5,8 @@
 package org.mozilla.fenix.components
 
 import android.content.Context
-import mozilla.components.service.fxa.ServerConfig
-import mozilla.components.service.fxa.ServerConfig.Server
+import mozilla.appservices.fxaclient.FxaConfig
+import mozilla.appservices.fxaclient.FxaServer
 
 /**
  * Utility to configure Firefox Account stage servers.
@@ -17,7 +17,7 @@ object FxaServer {
     private const val REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel"
 
     @Suppress("UNUSED_PARAMETER")
-    fun config(context: Context): ServerConfig {
-        return ServerConfig(Server.STAGE, CLIENT_ID, REDIRECT_URL)
+    fun config(context: Context): FxaConfig {
+        return FxaConfig(FxaServer.Stage, CLIENT_ID, REDIRECT_URL)
     }
 }

app/src/main/java/org/mozilla/fenix/components/FxaServer.kt

@@ -5,8 +5,8 @@
 package org.mozilla.fenix.components
 
 import android.content.Context
+import mozilla.appservices.fxaclient.FxaServer
 import mozilla.components.service.fxa.ServerConfig
-import mozilla.components.service.fxa.ServerConfig.Server
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.ext.settings
 
@@ -20,18 +20,19 @@ object FxaServer {
 
     fun config(context: Context): ServerConfig {
         // If a server override is configured, use that. Otherwise:
-        // - for all channels other than Mozilla Online, use Server.Release.
-        // - for Mozilla Online channel, if domestic server is allowed, use Server.CHINA; otherwise, use Server.RELEASE
+        // - for all channels other than Mozilla Online, use FxaServer.Release.
+        // - for Mozilla Online channel, if domestic server is allowed, use FxaServer.China; otherwise,
+        //   use FxaServer.Release
         val serverOverride = context.settings().overrideFxAServer
         val tokenServerOverride = context.settings().overrideSyncTokenServer.ifEmpty { null }
         if (serverOverride.isEmpty()) {
             val releaseServer = if (Config.channel.isMozillaOnline && context.settings().allowDomesticChinaFxaServer) {
-                Server.CHINA
+                FxaServer.China
             } else {
-                Server.RELEASE
+                FxaServer.Release
             }
             return ServerConfig(releaseServer, CLIENT_ID, REDIRECT_URL, tokenServerOverride)
         }
-        return ServerConfig(serverOverride, CLIENT_ID, REDIRECT_URL, tokenServerOverride)
+        return ServerConfig(FxaServer.Custom(serverOverride), CLIENT_ID, REDIRECT_URL, tokenServerOverride)
     }
 }

app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt

@@ -12,6 +12,8 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
+import mozilla.appservices.fxaclient.FxaServer
+import mozilla.appservices.fxaclient.contentUrl
 import mozilla.appservices.places.BookmarkRoot
 import mozilla.components.browser.menu.view.MenuButton
 import mozilla.components.concept.sync.FxAEntryPoint
@@ -127,9 +129,9 @@ class HomeMenuView(
                 homeActivity.openToBrowserAndLoad(
                     searchTermOrURL =
                     if (context.settings().allowDomesticChinaFxaServer) {
-                        mozilla.appservices.fxaclient.Config.Server.CHINA.contentUrl + "/settings"
+                        FxaServer.China.contentUrl() + "/settings"
                     } else {
-                        mozilla.appservices.fxaclient.Config.Server.RELEASE.contentUrl + "/settings"
+                        FxaServer.Release.contentUrl() + "/settings"
                     },
                     newTab = true,
                     from = BrowserDirection.FromHome,