Verified Commit 4b443a0c authored by Beatriz Rizental's avatar Beatriz Rizental Committed by ma1
Browse files

TB 42669: [android] Use custom no-op app-services 

Fetch the custom built no-op application services library
from tor-browser-build when building for Android.
parent 212bd727

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ toolkit/crashreporter/minidump-analyzer/analyzer-test/target/ 
mobile/android/.experimenter.json



# Tor libraries for local builds

mobile/android/fenix/tools/nimbus-fml

mobile/android/fenix/app/tor-expert-bundle.aar

mobile/android/fenix/app/src/main/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi

build.gradle

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ import org.tomlj.TomlTable 


buildscript {

    repositories {

        mavenLocal()



        gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->

            maven {

                url = repository
@@ -129,6 +131,8 @@ allprojects { 
    }



    repositories {

        mavenLocal()



        gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->

            maven {

                url = repository

mobile/android/android-components/components/browser/engine-gecko/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


buildscript {

    repositories {

        mavenLocal()



        gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->

            maven {

                url = repository

mobile/android/android-components/components/browser/storage-sync/src/main/java/mozilla/components/browser/storage/sync/RemoteTabsStorage.kt

+9 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ class RemoteTabsCommandQueue( 
            .groupBy {

                when (it.command) {

                    is RemoteCommand.CloseTab -> PendingCommandGroup.Key.CloseTab(it.deviceId)

                    is RemoteCommand.__NOOP -> PendingCommandGroup.Key.Noop(it.deviceId)

                    // Add `is ... ->` branches for future pending commands here...

                }.asAnyKey

            }
@@ -184,6 +185,13 @@ class RemoteTabsCommandQueue( 
                            pendingCommands = pendingCommands,

                        )

                    }

                    is PendingCommandGroup.Key.Noop -> {

                        PendingCommandGroup(

                            deviceId = key.deviceId,

                            command = DeviceCommandOutgoing.Noop(),

                            pendingCommands = pendingCommands,

                        )

                    }

                    // Add `is ... ->` branches for future pending command grouping keys here...

                }.asAnyGroup

            }
@@ -279,6 +287,7 @@ class RemoteTabsCommandQueue( 


        sealed interface Key {

            data class CloseTab(val deviceId: String) : Key

            data class Noop(val deviceId: String) : Key

            // Add data classes for future pending command grouping keys here...



            /** Returns this grouping key as a type-erased [Key]. */

mobile/android/android-components/components/concept/sync/src/main/java/mozilla/components/concept/sync/AccountEvent.kt

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ sealed class DeviceCommandIncoming { 
 * Outgoing device commands (ie, targeted at other devices.)

 */

sealed class DeviceCommandOutgoing {

    /** A command to do nothing */

    class Noop() : DeviceCommandOutgoing()



    /** A command to open a tab on another device */

    class SendTab(val title: String, val url: String) : DeviceCommandOutgoing()