Commit c3a40397 authored by MickeyMoz's avatar MickeyMoz
Browse files

Merge #4114 

4114: No issue: bump a-s to 0.37.1 r=Amejia481 a=grigoryk

Let's try this again - update a-s to 0.37.1, follow-up to https://github.com/mozilla-mobile/android-components/pull/4070 which got backed out (0.37's megazord publication was busted).
---
<!-- Text above this line will be added to the commit once "bors" merges this PR -->

### Pull Request checklist
<!-- Before submitting the PR, please address each item -->
- [ ] **Quality**: This PR builds and passes detekt/ktlint checks (A pre-push hook is recommended)
- [ ] **Tests**: This PR includes thorough tests or an explanation of why it does not
- [ ] **Changelog**: This PR includes [a changelog entry](https://github.com/mozilla-mobile/android-components/blob/master/docs/changelog.md) or does not need one
- [ ] **Accessibility**: The code in this PR follows [accessibility best practices](https://github.com/mozilla-mobile/shared-docs/blob/master/android/accessibility_guide.md) or does not include any user facing features

### After merge
- [ ] **Milestone**: Make sure issues closed by this pull request are added to the [milestone](https://github.com/mozilla-mobile/android-components/milestones) of the version currently in development.
- [x] **Breaking Changes**: If this is a breaking change, please push a draft PR on [Reference Browser](https://github.com/mozilla-mobile/reference-browser

) to address the breaking issues.


Co-authored-by: default avatarGrisha Kruglov <gkruglov@mozilla.com>
parents eda2ba63 cb7d8f51

buildSrc/src/main/java/Dependencies.kt

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ object Versions { 
    const val disklrucache = "2.0.2"

    const val leakcanary = "1.6.3"



    const val mozilla_appservices = "0.36.0"

    const val mozilla_appservices = "0.37.1"

    const val servo = "0.0.1.20181017.aa95911"



    const val material = "1.0.0"

components/concept/sync/src/main/java/mozilla/components/concept/sync/Devices.kt

+3 −0
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ interface DeviceConstellationObserver { 
enum class DeviceType {

    DESKTOP,

    MOBILE,

    TABLET,

    TV,

    VR,

    UNKNOWN

}

components/concept/sync/src/main/java/mozilla/components/concept/sync/OAuthAccount.kt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class AuthException(type: AuthExceptionType, cause: Exception? = null) : Throwab 
 */

@SuppressWarnings("TooManyFunctions")

interface OAuthAccount : AutoCloseable {

    fun beginOAuthFlowAsync(scopes: Set<String>, wantsKeys: Boolean): Deferred<String?>

    fun beginOAuthFlowAsync(scopes: Set<String>): Deferred<String?>

    fun beginPairingFlowAsync(pairingUrl: String, scopes: Set<String>): Deferred<String?>

    fun getProfileAsync(ignoreCache: Boolean): Deferred<Profile?>

    fun getProfileAsync(): Deferred<Profile?>

components/feature/accounts/src/test/java/mozilla/components/feature/accounts/FirefoxAccountsAuthFeatureTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ class FirefoxAccountsAuthFeatureTest { 
        val profile = Profile(uid = "testUID", avatar = null, email = "test@example.com", displayName = "test profile")



        `when`(mockAccount.getProfileAsync(anyBoolean())).thenReturn(CompletableDeferred(profile))

        `when`(mockAccount.beginOAuthFlowAsync(any(), anyBoolean())).thenReturn(CompletableDeferred("auth://url"))

        `when`(mockAccount.beginOAuthFlowAsync(any())).thenReturn(CompletableDeferred("auth://url"))

        `when`(mockAccount.beginPairingFlowAsync(anyString(), any())).thenReturn(CompletableDeferred("auth://url"))

        `when`(mockAccount.completeOAuthFlowAsync(anyString(), anyString())).thenReturn(CompletableDeferred(true))
@@ -154,7 +154,7 @@ class FirefoxAccountsAuthFeatureTest { 


        `when`(mockAccount.getProfileAsync(anyBoolean())).thenReturn(CompletableDeferred(profile))



        `when`(mockAccount.beginOAuthFlowAsync(any(), anyBoolean())).thenReturn(CompletableDeferred(value = null))

        `when`(mockAccount.beginOAuthFlowAsync(any())).thenReturn(CompletableDeferred(value = null))

        `when`(mockAccount.beginPairingFlowAsync(anyString(), any())).thenReturn(CompletableDeferred(value = null))

        `when`(mockAccount.completeOAuthFlowAsync(anyString(), anyString())).thenReturn(CompletableDeferred(true))

components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/FirefoxAccount.kt

+2 −3
Original line number Diff line number Diff line
@@ -103,13 +103,12 @@ class FirefoxAccount internal constructor( 
     * Constructs a URL used to begin the OAuth flow for the requested scopes and keys.

     *

     * @param scopes List of OAuth scopes for which the client wants access

     * @param wantsKeys Fetch keys for end-to-end encryption of data from Mozilla-hosted services

     * @return Deferred<String> that resolves to the flow URL when complete

     */

    override fun beginOAuthFlowAsync(scopes: Set<String>, wantsKeys: Boolean): Deferred<String?> {

    override fun beginOAuthFlowAsync(scopes: Set<String>): Deferred<String?> {

        return scope.async {

            handleFxaExceptions(logger, "begin oauth flow", { null }) {

                inner.beginOAuthFlow(scopes.toTypedArray(), wantsKeys)

                inner.beginOAuthFlow(scopes.toTypedArray())

            }

        }

    }