From 178b452d6ade018ebb7f2209ccc8233d4fa8acaa Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Mon, 9 Apr 2018 14:47:58 -0700
Subject: Autogenerate IDs for inserts and consolidate loader into one
 transaction.

Bug: 36841782,77724716,77725859
Test: implemented
PiperOrigin-RevId: 192191296
Change-Id: I7a22367b33c7555d014a29a2af2942f2eb76c0a5
---
 .../android/dialer/speeddial/SpeedDialUiItemLoader.java | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'java/com/android/dialer/speeddial/SpeedDialUiItemLoader.java')

diff --git a/java/com/android/dialer/speeddial/SpeedDialUiItemLoader.java b/java/com/android/dialer/speeddial/SpeedDialUiItemLoader.java
index 257c74f58..13e5f8744 100644
--- a/java/com/android/dialer/speeddial/SpeedDialUiItemLoader.java
+++ b/java/com/android/dialer/speeddial/SpeedDialUiItemLoader.java
@@ -97,15 +97,9 @@ public final class SpeedDialUiItemLoader {
     List<SpeedDialEntry> entriesToUpdate = new ArrayList<>();
     List<Long> entriesToDelete = new ArrayList<>();
 
-    // Track the highest entry ID
-    // TODO(a bug): use auto-generated IDs
-    long maxId = 0L;
-
     // Get all SpeedDialEntries and mark them to be updated or deleted
     List<SpeedDialEntry> entries = db.getAllEntries();
     for (SpeedDialEntry entry : entries) {
-      maxId = Math.max(entry.id(), maxId);
-
       SpeedDialUiItem contact = getSpeedDialContact(entry);
       // Remove contacts that no longer exist or are no longer starred
       if (contact == null || !contact.isStarred()) {
@@ -138,11 +132,8 @@ public final class SpeedDialUiItemLoader {
         speedDialUiItems.add(contact);
 
       } else if (speedDialUiItems.stream().noneMatch(c -> c.contactId() == contact.contactId())) {
-        // Increment the ID so there aren't any collisions
-        maxId += 1;
         entriesToInsert.add(
             SpeedDialEntry.builder()
-                .setId(maxId)
                 .setLookupKey(contact.lookupKey())
                 .setContactId(contact.contactId())
                 .setDefaultChannel(contact.defaultChannel())
@@ -153,10 +144,10 @@ public final class SpeedDialUiItemLoader {
       }
     }
 
-    // TODO(a bug): use a single db transaction
-    db.delete(entriesToDelete);
-    db.update(entriesToUpdate);
-    db.insert(entriesToInsert);
+    db.insertUpdateAndDelete(
+        ImmutableList.copyOf(entriesToInsert),
+        ImmutableList.copyOf(entriesToUpdate),
+        ImmutableList.copyOf(entriesToDelete));
     return ImmutableList.copyOf(speedDialUiItems);
   }
 
-- 
cgit v1.2.3