Rename operationQueue to transactionQueue

Author: bilal-alsharifi

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java

@@ -85,7 +85,7 @@ public void setUp() throws Exception{
 		assertNotNull(csm.fileManager);
 		assertNotNull(csm.preloadedChoices);
 		assertNotNull(csm.pendingPreloadChoices);
-		assertNotNull(csm.operationQueue);
+		assertNotNull(csm.transactionQueue);
 		assertNotNull(csm.hmiListener);
 		assertNotNull(csm.onDisplayCapabilityListener);
 		assertNull(csm.pendingPresentOperation);
@@ -102,7 +102,7 @@ public void tearDown() throws Exception {
 		assertNull(csm.pendingPresentationSet);
 		assertNull(csm.pendingPresentOperation);
 
-		assertEquals(csm.operationQueue.getTasksAsList().size(), 0);
+		assertEquals(csm.transactionQueue.getTasksAsList().size(), 0);
 		assertEquals(csm.nextChoiceId, 1);
 
 		assertFalse(csm.isVROptional);

base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java

@@ -89,7 +89,7 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
     ChoiceSet pendingPresentationSet;
 
     // We will pass operations into this to be completed
-    Queue operationQueue;
+    Queue transactionQueue;
     Task pendingPresentOperation;
 
     PresentKeyboardOperation currentlyPresentedKeyboardOperation;
@@ -104,8 +104,8 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
         super(internalInterface);
 
         // prepare operations queue
-        operationQueue = internalInterface.getTaskmaster().createQueue("ChoiceSetManagerQueue", 1, false);
-        operationQueue.pause(); // pause until HMI ready
+        transactionQueue = internalInterface.getTaskmaster().createQueue("ChoiceSetManagerQueue", 1, false);
+        transactionQueue.pause(); // pause until HMI ready
 
         // capabilities
         currentSystemContext = SystemContext.SYSCTXT_MAIN;
@@ -135,7 +135,7 @@ public void start(CompletionListener listener){
     public void dispose(){
 
         // cancel the operations
-        operationQueue.close();
+        transactionQueue.close();
 
         currentHMILevel = null;
         currentSystemContext = null;
@@ -173,10 +173,10 @@ public void onError(String error) {
                 // checking VR will always be first in the queue.
                 // If pre-load operations were added while this was in progress
                 // clear it from the queue onError.
-                operationQueue.clear();
+                transactionQueue.clear();
             }
         });
-        operationQueue.add(checkChoiceVR, false);
+        transactionQueue.add(checkChoiceVR, false);
     }
 
     /**
@@ -225,7 +225,7 @@ public void onComplete(boolean success) {
                 }
             });
 
-            operationQueue.add(preloadChoicesOperation, false);
+            transactionQueue.add(preloadChoicesOperation, false);
         } else {
             DebugTool.logError("File Manager was null in preload choice operation");
         }
@@ -259,7 +259,7 @@ public void deleteChoices(@NonNull List<ChoiceCell> choices){
 
         // Remove cells from pending and delete choices
         pendingPresentationChoices.removeAll(cellsToBeRemovedFromPending);
-        for (Task operation : operationQueue.getTasksAsList()){
+        for (Task operation : transactionQueue.getTasksAsList()){
             if (!(operation instanceof PreloadChoicesOperation)){ continue; }
             ((PreloadChoicesOperation) operation).removeChoicesFromUpload(cellsToBeRemovedFromPending);
         }
@@ -281,7 +281,7 @@ public void onComplete(boolean success) {
                 preloadedChoices.removeAll(cellsToBeDeleted);
             }
         });
-        operationQueue.add(deleteChoicesOperation, false);
+        transactionQueue.add(deleteChoicesOperation, false);
     }
 
     /**
@@ -355,7 +355,7 @@ public void onError(String error) {
             presentOp = new PresentChoiceSetOperation(internalInterface, pendingPresentationSet, mode, keyboardConfiguration, keyboardListener, privateChoiceListener, nextCancelId++);
         }
 
-        operationQueue.add(presentOp, false);
+        transactionQueue.add(presentOp, false);
         pendingPresentOperation = presentOp;
     }
 
@@ -396,7 +396,7 @@ public Integer presentKeyboard(@NonNull String initialText, @Nullable KeyboardPr
         Integer keyboardCancelID = nextCancelId++;
         PresentKeyboardOperation keyboardOp = new PresentKeyboardOperation(internalInterface, keyboardConfiguration, initialText, customKeyboardConfig, listener, keyboardCancelID);
         currentlyPresentedKeyboardOperation = keyboardOp;
-        operationQueue.add(keyboardOp, false);
+        transactionQueue.add(keyboardOp, false);
         pendingPresentOperation = keyboardOp;
         return keyboardCancelID;
     }
@@ -421,7 +421,7 @@ public void dismissKeyboard(@NonNull Integer cancelID) {
         }
 
         // Next, attempt to cancel keyboard operations that have not yet started
-        for (Task operation : operationQueue.getTasksAsList()){
+        for (Task operation : transactionQueue.getTasksAsList()){
             if (!(operation instanceof PresentKeyboardOperation)){ continue; }
 
             PresentKeyboardOperation pendingOp = (PresentKeyboardOperation) operation;
@@ -551,21 +551,21 @@ public void onNotified(RPCNotification notification) {
                 currentHMILevel = onHMIStatus.getHmiLevel();
 
                 if (currentHMILevel == HMILevel.HMI_NONE){
-                    operationQueue.pause();
+                    transactionQueue.pause();
                 }
 
                 if (oldHMILevel == HMILevel.HMI_NONE && currentHMILevel != HMILevel.HMI_NONE){
-                    operationQueue.resume();
+                    transactionQueue.resume();
                 }
 
                 currentSystemContext = onHMIStatus.getSystemContext();
 
                 if (currentSystemContext == SystemContext.SYSCTXT_HMI_OBSCURED || currentSystemContext == SystemContext.SYSCTXT_ALERT){
-                    operationQueue.pause();
+                    transactionQueue.pause();
                 }
 
                 if (currentSystemContext == SystemContext.SYSCTXT_MAIN && currentHMILevel != HMILevel.HMI_NONE){
-                    operationQueue.resume();
+                    transactionQueue.resume();
                 }
 
             }