Merge branch 'main' into push-rrwmqqkxlowz

Author: mhammond

CHANGELOG.md

@@ -22,6 +22,12 @@
   `tracing-logging` feature and were either also using `tracing-reporting` or not handling error
   reporting at all.
 
+### Logins
+* Opened count method on logins for Android. ([#7207](https://github.com/mozilla/application-services/pull/7207/))
+
+### Autofill
+* Added count methods for credit cards and addresses. ([#7207](https://github.com/mozilla/application-services/pull/7207/))
+
 ## ✨ What's New ✨
 
 ### Ads Client
@@ -30,6 +36,7 @@
 * Reset cache on context ID rotation.
 * Enable staging environment support for all platforms (previously feature-gated)
 * Temporarily disable cache invalidation on click and impression recording (will be re-enabled behind Nimbus experiment)
+* Enable automatic context_id rotation every 3 days
 
 ### Android
 * Upgraded Kotlin compiler from 2.2.21 to 2.3.0 ([#7183](https://github.com/mozilla/application-services/pull/7183))

Cargo.lock

@@ -31,6 +31,7 @@ echo "Generating Kotlin bindings with uniffi-bindgen..."
 
 cd "$REPO_ROOT"
 
+$CARGO build -p megazord
 $CARGO uniffi-bindgen generate --language kotlin --no-format --out-dir "$KOTLIN_DIR" "target/debug/${DLL_PREFIX}megazord${DLL_SUFFIX}"
 
 # Generate documentation with increased memory

automation/kotlin-components-docs/generate_docs.sh

@@ -3,6 +3,7 @@ name = "ads-client"
 version = "0.1.0"
 edition = "2021"
 license = "MPL-2.0"
+exclude = ["/android"]
 
 [features]
 dev = []

components/ads-client/Cargo.toml

@@ -202,7 +202,7 @@ where
     }
 
     pub fn get_context_id(&self) -> context_id::ApiResult<String> {
-        self.context_id_component.request(0)
+        self.context_id_component.request(3)
     }
 
     pub fn cycle_context_id(&mut self) -> context_id::ApiResult<String> {

components/ads-client/src/client.rs

@@ -103,6 +103,9 @@ interface Store {
     [Throws=AutofillApiError]
     sequence<CreditCard> get_all_credit_cards();
 
+    [Throws=AutofillApiError]
+    i64 count_all_credit_cards();
+
     [Throws=AutofillApiError]
     void update_credit_card(string guid, UpdatableCreditCardFields cc);
 
@@ -121,6 +124,9 @@ interface Store {
     [Throws=AutofillApiError]
     sequence<Address> get_all_addresses();
 
+    [Throws=AutofillApiError]
+    i64 count_all_addresses();
+
     [Throws=AutofillApiError]
     void update_address(string guid, UpdatableAddressFields a);
 

components/autofill/src/autofill.udl

@@ -115,6 +115,15 @@ pub(crate) fn get_all_addresses(conn: &Connection) -> Result<Vec<InternalAddress
     Ok(addresses)
 }
 
+pub(crate) fn count_all_addresses(conn: &Connection) -> Result<i64> {
+    let sql = "SELECT COUNT(*)
+        FROM addresses_data";
+
+    let mut stmt = conn.prepare(sql)?;
+    let count: i64 = stmt.query_row([], |row| row.get(0))?;
+    Ok(count)
+}
+
 /// Updates just the "updatable" columns - suitable for exposure as a public
 /// API.
 pub(crate) fn update_address(
@@ -404,6 +413,9 @@ mod tests {
         let expected_number_of_addresses = 2;
         assert_eq!(expected_number_of_addresses, retrieved_addresses.len());
 
+        let address_count = count_all_addresses(&db).expect("Should count all saved addresses");
+        assert_eq!(expected_number_of_addresses, address_count as usize);
+
         let retrieved_address_guids = [
             retrieved_addresses[0].guid.as_str(),
             retrieved_addresses[1].guid.as_str(),

components/autofill/src/db/addresses.rs

@@ -119,6 +119,15 @@ pub(crate) fn get_all_credit_cards(conn: &Connection) -> Result<Vec<InternalCred
     Ok(credit_cards)
 }
 
+pub(crate) fn count_all_credit_cards(conn: &Connection) -> Result<i64> {
+    let sql = "SELECT COUNT(*)
+        FROM credit_cards_data";
+
+    let mut stmt = conn.prepare(sql)?;
+    let count: i64 = stmt.query_row([], |row| row.get(0))?;
+    Ok(count)
+}
+
 pub fn update_credit_card(
     conn: &Connection,
     guid: &Guid,
@@ -466,6 +475,9 @@ pub(crate) mod tests {
             retrieved_credit_cards.len()
         );
 
+        let credit_card_count = count_all_credit_cards(&db)?;
+        assert_eq!(expected_number_of_credit_cards, credit_card_count as usize);
+
         let retrieved_credit_card_guids = [
             retrieved_credit_cards[0].guid.as_str(),
             retrieved_credit_cards[1].guid.as_str(),

components/autofill/src/db/credit_cards.rs

@@ -94,6 +94,12 @@ impl Store {
         Ok(credit_cards)
     }
 
+    #[handle_error(Error)]
+    pub fn count_all_credit_cards(&self) -> ApiResult<i64> {
+        let count = credit_cards::count_all_credit_cards(&self.db.lock().unwrap().writer)?;
+        Ok(count)
+    }
+
     #[handle_error(Error)]
     pub fn update_credit_card(
         &self,
@@ -136,6 +142,12 @@ impl Store {
         Ok(addresses)
     }
 
+    #[handle_error(Error)]
+    pub fn count_all_addresses(&self) -> ApiResult<i64> {
+        let count = addresses::count_all_addresses(&self.db.lock().unwrap().writer)?;
+        Ok(count)
+    }
+
     #[handle_error(Error)]
     pub fn update_address(&self, guid: String, address: UpdatableAddressFields) -> ApiResult<()> {
         addresses::update_address(&self.db.lock().unwrap().writer, &Guid::new(&guid), &address)

components/autofill/src/db/store.rs

@@ -65,6 +65,16 @@ class DatabaseLoginsStorage(dbPath: String, keyManager: KeyManager) : AutoClosea
         return store.list()
     }
 
+    /**
+     * Counts the amount of logins.
+     *
+     * @return The number of logins.
+     */
+    @Throws(LoginsApiException::class)
+    fun count(): Long {
+        return store.count()
+    }
+
     @Throws(LoginsApiException::class)
     fun hasLoginsByBaseDomain(baseDomain: String): Boolean {
         return store.hasLoginsByBaseDomain(baseDomain)