Closed Bug 1954263 Opened 1 month ago Closed 1 month ago

Update android nightly application-services version bump to new version d773da92641d92930b7308300e9fc2746a05ce6a from 2025-03-15 05:03:53

Categories

(Firefox for Android :: General, enhancement)

All
Unspecified
enhancement

Tracking

()

RESOLVED DUPLICATE of bug 1954668
Tracking Status
firefox138 --- affected

People

(Reporter: update-bot, Assigned: diannaS)

References

Details

(Whiteboard: [3pl-filed][task_id: Bd16iyG8QjOMAfOAV1nO6A])

Attachments

(1 obsolete file)

This update covers 4 commits, including 1 new upstream commit I've never filed a bug on before. (It's the top one.). Here are the overall diff statistics, and then the commit information.


mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt | 2 +-
mobile/android/android-components/plugins/dependencies/src/main/java/moz.yaml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)


d773da92641d92930b7308300e9fc2746a05ce6a by Drew Willcoxon <adw@mozilla.com>

https://github.com/mozilla/application-services/commit/d773da92641d92930b7308300e9fc2746a05ce6a
Authored: 2025-03-13 19:37:31 -0700
Committed: 2025-03-14 16:02:12 +0000

Bug 1953945 - Fix uniqueness constraint errors in Suggest due to new RS collections.

Files Modified:

  • components/suggest/src/schema.rs

33958fcd7388ed9be2a63ebe6dfda18fb75a979f by Sammy Khamis <skhamis@mozilla.com>

https://github.com/mozilla/application-services/commit/33958fcd7388ed9be2a63ebe6dfda18fb75a979f
Authored: 2025-03-11 15:58:09 -1000
Committed: 2025-03-13 20:31:35 +0000

Handle GUID collisions for users with orphaned bookmarks

Files Modified:

  • components/places/src/bookmark_sync/engine.rs

7712c4f88fd70ee9b71bb9bcfae3dab8b2420a56 by Drew Willcoxon <adw@mozilla.com>

https://github.com/mozilla/application-services/commit/7712c4f88fd70ee9b71bb9bcfae3dab8b2420a56
Authored: 2025-03-06 18:35:32 -0800
Committed: 2025-03-13 17:57:36 +0000

Bug 1952407 - UNIQUE constraint failed due to geonames insert

We need to use INSERT OR REPLACE instead of INSERT OR IGNORE because
geonames.record_id needs to be updated when an existing geoname is in a new
record.

Files Modified:

  • components/suggest/src/geoname.rs

778c9c4d537eeca0eca46b0853dd79694416814a by Drew Willcoxon <adw@mozilla.com>

https://github.com/mozilla/application-services/commit/778c9c4d537eeca0eca46b0853dd79694416814a
Authored: 2025-03-05 14:49:25 -0800
Committed: 2025-03-13 16:55:22 +0000

Bug 1946621 - Implement suggest geo expansion and new collections.

This is based on https://github.com/mozilla/application-services/pull/6598

It uses the new remote settings collections and makes some other related
changes. Sorry for how big this is but I think it makes sense to make these
changes together. Details below.

We're setting up two new RS collections for geo expansion: quicksuggest-amp
and quicksuggest-other. The AMP collection will contain AMP suggestions and
icons for all user segments. The other collection will contain everything else
currently in the quicksuggest collection for all user segments. For both
collections, the client will use RS filter expressions to download the right
attachments for its user segment.

In the AMP collection, the record type will be amp, not data as it currently
is. The AMP collection will be updated often compared to the other one.

After discussion with Nan and Ben, we think it makes sense to move the client
over to the new collections. That's simpler than the alternative of hardcoding
branching collection logic or adding a way for consumers to pass in collection
overrides or something like that. We think it's unlikely we won't go forward
with geo expansion in some capacity, and even if we don't, the new collections
still have some benefits over the current single collection.

With the new collections, a record's collection isn't a function of its type
anymore. AMP icons will be in the AMP collection, but other icons will be in the
other collection. Currently Fakespot icons are in quicksuggest but this change
would let us move them to the Fakespot collection if we wanted.

I replaced SuggestRecordType::collection with some methods on
SuggestionProvider. There's a provider's primary collection and record type
and then some possible secondary collections/types, like icons and geonames.

I added some test helpers to create mock records given a provider so that tests
don't need to make assumptions about collections and record types. Most of the
test changes in store.rs are due to that.

Related to the previous point, I simplified MockRemoteSettingsClient and
introduced MockRecord and MockAttachment similar to the existing MockIcon.
The test helpers I mentioned in the previous point create mock records, and the
mock client interface is based on those.

I went ahead and replaced the AmpWikipedia record and type with separate Amp
and Wikipedia values. This is a good opportunity to do that, and it simplifies
rs.rs.

Mobile and tablet suggestions are just AMP suggestions that will live in
quicksuggest-amp, and consumers can ingest them by passing in an appropriate
RS context/filter, so I removed the AMP mobile provider and record type.

Files Modified:

  • components/suggest/src/benchmarks/client.rs
  • components/suggest/src/benchmarks/ingest.rs
  • components/suggest/src/db.rs
  • components/suggest/src/geoname.rs
  • components/suggest/src/provider.rs
  • components/suggest/src/query.rs
  • components/suggest/src/rs.rs
  • components/suggest/src/store.rs
  • components/suggest/src/suggestion.rs
  • components/suggest/src/testing/client.rs
  • components/suggest/src/testing/data.rs
  • components/suggest/src/testing/mod.rs
  • components/suggest/src/weather.rs
  • examples/suggest-cli/src/main.rs

Duplicate of this bug: 1954007
Assignee: nobody → update-bot
Status: NEW → ASSIGNED

The Bugbug bot thinks this bug should belong to the 'Fenix::Search' component, and is moving the bug to that component. Please correct in case you think the bot is wrong.

Component: General → Search
Component: Search → General

The try push is done, we found jobs with unclassified failures.

Needs Close Investigation:

  • toolchain-linux64-android-gradle-dependencies - 1 of 1 failed (failed: X9sExjNhT7a07mtaN4JP2Q)

These failures could mean that the library update changed something and caused
tests to fail. You'll need to review them yourself and decide where to go from here.

In either event, I have done all I can and you will need to take it from here. If you
don't want to land my patch, you can replicate it locally for editing with
./mach vendor mobile/android/android-components/plugins/dependencies/src/main/java/moz.yaml

When reviewing, please note that this is external code, which needs a full and
careful inspection - not a rubberstamp.

Assignee: update-bot → dmeehan
Flags: needinfo?(dmeehan)
Assignee: dmeehan → dsmith
Flags: needinfo?(dmeehan)

I just pushed https://bugzilla.mozilla.org/show_bug.cgi?id=1953166 to autoland. Assuming that land, this should not introduce issues on the Suggest side

This bug is being closed because a newer revision of the library is available.
This bug will be marked as a duplicate of it (because although this bug is older, it is superseded by the newer one).

Status: ASSIGNED → RESOLVED
Closed: 1 month ago
Duplicate of bug: 1954668
Resolution: --- → DUPLICATE
Attachment #9472240 - Attachment is obsolete: true
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: