Dont implement SQLiteTransactionListener within SQLiteLruReferenceDelegate

Author: rsgowman

firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteLruReferenceDelegate.java

@@ -16,16 +16,14 @@
 
 import static com.google.firebase.firestore.util.Assert.hardAssert;
 
-import android.database.sqlite.SQLiteTransactionListener;
 import android.util.SparseArray;
 import com.google.firebase.firestore.core.ListenSequence;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.ResourcePath;
 import com.google.firebase.firestore.util.Consumer;
 
 /** Provides LRU functionality for SQLite persistence. */
-class SQLiteLruReferenceDelegate
-    implements ReferenceDelegate, LruDelegate, SQLiteTransactionListener {
+class SQLiteLruReferenceDelegate implements ReferenceDelegate, LruDelegate {
   private final SQLitePersistence persistence;
   private ListenSequence listenSequence;
   private long currentSequenceNumber;
@@ -42,19 +40,6 @@ void start(long highestSequenceNumber) {
     listenSequence = new ListenSequence(highestSequenceNumber);
   }
 
-  @Override
-  public void onBegin() {
-    onTransactionStarted();
-  }
-
-  @Override
-  public void onCommit() {
-    onTransactionCommitted();
-  }
-
-  @Override
-  public void onRollback() {}
-
   @Override
   public void onTransactionStarted() {
     hardAssert(

firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLitePersistence.java

@@ -26,6 +26,7 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteProgram;
 import android.database.sqlite.SQLiteStatement;
+import android.database.sqlite.SQLiteTransactionListener;
 import android.support.annotation.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.firebase.firestore.auth.User;
@@ -144,7 +145,21 @@ RemoteDocumentCache getRemoteDocumentCache() {
   @Override
   void runTransaction(String action, Runnable operation) {
     Logger.debug(TAG, "Starting transaction: %s", action);
-    db.beginTransactionWithListener(referenceDelegate);
+    db.beginTransactionWithListener(
+        new SQLiteTransactionListener() {
+          @Override
+          public void onBegin() {
+            referenceDelegate.onTransactionStarted();
+          }
+
+          @Override
+          public void onCommit() {
+            referenceDelegate.onTransactionCommitted();
+          }
+
+          @Override
+          public void onRollback() {}
+        });
     try {
       operation.run();
 
@@ -159,7 +174,21 @@ void runTransaction(String action, Runnable operation) {
   <T> T runTransaction(String action, Supplier<T> operation) {
     Logger.debug(TAG, "Starting transaction: %s", action);
     T value = null;
-    db.beginTransactionWithListener(referenceDelegate);
+    db.beginTransactionWithListener(
+        new SQLiteTransactionListener() {
+          @Override
+          public void onBegin() {
+            referenceDelegate.onTransactionStarted();
+          }
+
+          @Override
+          public void onCommit() {
+            referenceDelegate.onTransactionCommitted();
+          }
+
+          @Override
+          public void onRollback() {}
+        });
     try {
       value = operation.get();