Merge pull request #967 from ashitsalesforce/master

make "keep account team" and "use bulk API" mutually exclusive
forcedotcom · Feb 7, 2024 · f98b2be · f98b2be
2 parents 197ec4a + 4f4e460
commit f98b2be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java b/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java
@@ -525,6 +525,7 @@ public void widgetSelected(SelectionEvent e) {
                 super.widgetSelected(e);
                 boolean enabled = buttonKeepAccountTeam.getSelection();
                 // make sure the appropriate check boxes are enabled or disabled
+                buttonUseBulkApi.setSelection(!enabled);
                 setBulkSettings(!enabled);
             }
         });
@@ -551,8 +552,10 @@ public void widgetSelected(SelectionEvent e) {
                 textBatch.setText(String.valueOf(newDefaultBatchSize));
                 // make sure the appropriate check boxes are enabled or disabled
                 setBulkSettings(enabled);
+                buttonKeepAccountTeam.setSelection(!enabled);
             }
         });
+        buttonKeepAccountTeam.setSelection(!buttonUseBulkApi.getSelection());
 
         // Bulk API serial concurrency mode setting
         Label labelBulkApiSerialMode = new Label(restComp, SWT.RIGHT | SWT.WRAP);

diff --git a/src/main/java/com/salesforce/dataloader/util/OAuthBrowserLoginRunner.java b/src/main/java/com/salesforce/dataloader/util/OAuthBrowserLoginRunner.java
@@ -99,6 +99,7 @@ private void retryBrowserLoginWithDefaultURL(Config config, boolean skipUserCode
         startBrowserLogin(config, skipUserCodePage);
     }
 
+    // Browser login uses OAuth 2.0 Device Flow - https://help.salesforce.com/s/articleView?id=sf.remoteaccess_oauth_device_flow.htm&type=5
     private void startBrowserLogin(Config config, boolean skipUserCodePage) throws IOException, ParameterLoadException, OAuthBrowserLoginRunnerException {
         setLoginStatus(LoginStatus.WAIT);
         this.config = config;