Merge branch 'master' into ac-update

Author: mergify[bot]

.editorconfig

@@ -0,0 +1,18 @@
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma_on_call_site=true
+ij_kotlin_allow_trailing_comma=true
+
+[*]
+insert_final_newline = true
+
+# rules we should look into enabling
+ktlint_standard_blank-line-before-declaration = disabled
+ktlint_standard_chain-method-continuation = disabled
+ktlint_standard_class-signature = disabled
+ktlint_standard_function-expression-body = disabled
+ktlint_standard_function-naming = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_indent = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
+ktlint_standard_no-empty-first-line-in-class-body = disabled
+ktlint_standard_string-template-indent = disabled

app/src/androidTest/java/org/mozilla/reference/browser/helpers/BrowserActivityTestRule.kt

@@ -19,7 +19,6 @@ import org.mozilla.reference.browser.BrowserActivity
 class BrowserActivityTestRule(
     initialTouchMode: Boolean = false,
     launchActivity: Boolean = true,
-
 ) : ActivityTestRule<BrowserActivity>(BrowserActivity::class.java, initialTouchMode, launchActivity) {
 
     /**

app/src/androidTest/java/org/mozilla/reference/browser/helpers/MockWebServer.kt

@@ -54,7 +54,8 @@ class AndroidAssetDispatcher : Dispatcher() {
             assetManager.open(pathWithoutQueryParams!!).use { inputStream ->
                 return fileToResponse(pathWithoutQueryParams, inputStream)
             }
-        } catch (e: IOException) { // e.g. file not found.
+        } catch (e: IOException) {
+            // e.g. file not found.
             // We're on a background thread so we need to forward the exception to the main thread.
             mainThreadHandler.postAtFrontOfQueue { throw e }
             return MockResponse().setResponseCode(HTTP_NOT_FOUND)

app/src/androidTest/java/org/mozilla/reference/browser/ui/CustomTabsTest.kt

@@ -27,7 +27,7 @@ class CustomTabsTest {
     @get:Rule
     val activityTestRule = BrowserActivityTestRule()
 
-    @get: Rule
+    @get:Rule
     val intentReceiverActivityTestRule = ActivityTestRule(
         IntentReceiverActivity::class.java,
         true,

app/src/main/java/org/mozilla/reference/browser/autofill/AutofillPreference.kt

@@ -17,7 +17,9 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import org.mozilla.reference.browser.R
 
-class AutofillPreference @JvmOverloads constructor(
+class AutofillPreference
+    @JvmOverloads
+    constructor(
     context: Context,
     attrs: AttributeSet? = null,
 ) : Preference(context, attrs) {

app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt

@@ -95,7 +95,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
         fullScreenFeature,
         findInPageIntegration,
         toolbarIntegration,
-
         sessionFeature,
         lastTabFeature,
     )

app/src/main/java/org/mozilla/reference/browser/browser/CustomTabsIntegration.kt

@@ -102,24 +102,20 @@ class CustomTabsIntegration(
     private fun menuItems(sessionState: SessionState?): List<MenuCandidate> {
         return listOf(
             menuToolbar(session),
-
             TextMenuCandidate("Share") {
                 val url = sessionState?.content?.url.orEmpty()
                 context.share(url)
             },
-
             CompoundMenuCandidate(
                 text = "Request desktop site",
                 isChecked = sessionState?.content?.desktopMode == true,
                 end = CompoundMenuCandidate.ButtonType.SWITCH,
             ) { checked ->
                 sessionUseCases.requestDesktopSite.invoke(checked, sessionState?.id)
             },
-
             TextMenuCandidate("Find in Page") {
                 FindInPageIntegration.launch?.invoke()
             },
-
             TextMenuCandidate("Open in Browser") {
                 // Release the session from this view so that it can immediately be rendered by a different view
                 engineView.release()

app/src/main/java/org/mozilla/reference/browser/browser/ExternalAppBrowserFragment.kt

@@ -84,7 +84,7 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler
             ) { toolbarVisible ->
                 toolbar.isVisible = toolbarVisible
                 webAppToolbarShouldBeVisible = toolbarVisible
-                if (!toolbarVisible) { engineView.setDynamicToolbarMaxHeight(0) }
+                if (!toolbarVisible) engineView.setDynamicToolbarMaxHeight(0)
             },
             owner = this,
             view = toolbar,

app/src/main/java/org/mozilla/reference/browser/browser/ToolbarIntegration.kt

@@ -105,20 +105,17 @@ class ToolbarIntegration(
     private fun sessionMenuItems(sessionState: SessionState): List<MenuCandidate> {
         return listOfNotNull(
             menuToolbar(sessionState),
-
             TextMenuCandidate("Share") {
                 val url = sessionState.content.url
                 context.share(url)
             },
-
             CompoundMenuCandidate(
                 text = "Request desktop site",
                 isChecked = sessionState.content.desktopMode,
                 end = CompoundMenuCandidate.ButtonType.SWITCH,
             ) { checked ->
                 sessionUseCases.requestDesktopSite.invoke(checked)
             },
-
             if (webAppUseCases.isPinningSupported()) {
                 TextMenuCandidate(
                     text = "Add to homescreen",
@@ -131,7 +128,6 @@ class ToolbarIntegration(
             } else {
                 null
             },
-
             TextMenuCandidate(
                 text = "Find in Page",
             ) {
@@ -153,19 +149,16 @@ class ToolbarIntegration(
                 intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 context.startActivity(intent)
             },
-
             TextMenuCandidate(text = "Synced Tabs") {
                 val intent = Intent(context, SyncedTabsActivity::class.java)
                 intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 context.startActivity(intent)
             },
-
             TextMenuCandidate(text = "Report issue") {
                 tabsUseCases.addTab(
                     url = "https://github.com/mozilla-mobile/reference-browser/issues/new",
                 )
             },
-
             TextMenuCandidate(text = "Settings") {
                 val intent = Intent(context, SettingsActivity::class.java)
                 intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK

app/src/main/java/org/mozilla/reference/browser/components/Services.kt

@@ -28,8 +28,7 @@ class Services(
         FirefoxAccountsAuthFeature(
             accountManager,
             redirectUrl = BackgroundServices.REDIRECT_URL,
-        ) {
-                _, authUrl ->
+        ) { _, authUrl ->
             MainScope().launch {
                 tabsUseCases.addTab.invoke(authUrl)
             }