Remove transcript as parameter.

Co-authored-by: AliveDevil <[email protected]>

Author: dkocher

cli/src/main/java/ch/cyberduck/cli/TerminalAlertCallback.java

@@ -29,7 +29,7 @@ public class TerminalAlertCallback implements AlertCallback {
     private final Console console = new Console();
 
     @Override
-    public boolean alert(final Host host, final BackgroundException failure, final StringBuilder transcript) {
+    public boolean alert(final Host host, final BackgroundException failure) {
         this.print(failure);
         // Never repeat
         return false;

cli/src/test/java/ch/cyberduck/cli/TerminalAlertCallbackTest.java

@@ -29,6 +29,6 @@ public class TerminalAlertCallbackTest  {
 
     @Test
     public void testAlert() {
-        assertFalse(new TerminalAlertCallback().alert(new Host(new TestProtocol()), new BackgroundException(), new StringBuilder()));
+        assertFalse(new TerminalAlertCallback().alert(new Host(new TestProtocol()), new BackgroundException()));
     }
 }

core/src/main/java/ch/cyberduck/core/notification/NotificationAlertCallback.java

@@ -28,7 +28,7 @@ public class NotificationAlertCallback implements AlertCallback {
     private final NotificationService notification = NotificationServiceFactory.get();
 
     @Override
-    public boolean alert(final Host bookmark, final BackgroundException failure, final StringBuilder transcript) {
+    public boolean alert(final Host bookmark, final BackgroundException failure) {
         notification.notify(BookmarkNameProvider.toString(bookmark), bookmark.getUuid(), failure.getMessage(), BookmarkNameProvider.toString(bookmark));
         return false;
     }

core/src/main/java/ch/cyberduck/core/threading/AlertCallback.java

@@ -23,12 +23,8 @@
 
 public interface AlertCallback {
 
-    default boolean alert(final Host host, final BackgroundException failure) {
-        return this.alert(host, failure, new StringBuilder());
-    }
-
     /**
      * @return True if action should be repeated
      */
-    boolean alert(Host host, BackgroundException failure, StringBuilder transcript);
+    boolean alert(Host host, BackgroundException failure);
 }

core/src/main/java/ch/cyberduck/core/threading/DisabledAlertCallback.java

@@ -28,7 +28,7 @@ public class DisabledAlertCallback implements AlertCallback {
     private static final Logger log = LogManager.getLogger(DisabledAlertCallback.class);
 
     @Override
-    public boolean alert(final Host host, final BackgroundException failure, final StringBuilder transcript) {
+    public boolean alert(final Host host, final BackgroundException failure) {
         log.warn("Ignore failure {}", failure.getMessage());
         return false;
     }

core/src/main/java/ch/cyberduck/core/threading/SessionBackgroundAction.java

@@ -21,28 +21,21 @@
 import ch.cyberduck.core.BookmarkNameProvider;
 import ch.cyberduck.core.ProgressListener;
 import ch.cyberduck.core.Session;
-import ch.cyberduck.core.TranscriptListener;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.pool.SessionPool;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public abstract class SessionBackgroundAction<T> extends AbstractBackgroundAction<T> implements ProgressListener, TranscriptListener {
+public abstract class SessionBackgroundAction<T> extends AbstractBackgroundAction<T> implements ProgressListener {
     private static final Logger log = LogManager.getLogger(SessionBackgroundAction.class);
 
     /**
      * This action encountered one or more exceptions
      */
     private BackgroundException failure;
 
-    /**
-     * Contains the transcript of the session while this action was running
-     */
-    private final StringBuffer transcript
-            = new StringBuffer();
-
     private static final String LINE_SEPARATOR
             = System.lineSeparator();
 
@@ -64,14 +57,6 @@ public void message(final String message) {
         progress.message(message);
     }
 
-    /**
-     * Append to the transcript and notify listeners.
-     */
-    @Override
-    public void log(final Type request, final String message) {
-        transcript.append(message).append(LINE_SEPARATOR);
-    }
-
     @Override
     public void prepare() {
         super.prepare();
@@ -112,7 +97,7 @@ public T call() throws BackgroundException {
     public T run() throws BackgroundException {
         final Session<?> session;
         try {
-            session = pool.borrow(this).withListener(this);
+            session = pool.borrow(this);
         }
         catch(BackgroundException e) {
             failure = e;
@@ -126,7 +111,7 @@ public T run() throws BackgroundException {
             throw e;
         }
         finally {
-            pool.release(session.removeListener(this), failure);
+            pool.release(session, failure);
         }
     }
 
@@ -140,12 +125,11 @@ public boolean alert(final BackgroundException failure) {
         }
         log.info("Run alert callback {} for failure {}", alert, failure);
         // Display alert if the action was not canceled intentionally
-        return alert.alert(pool.getHost(), failure, new StringBuilder(transcript.toString()));
+        return alert.alert(pool.getHost(), failure);
     }
 
     @Override
     public void cleanup(final T result, final BackgroundException failure) {
-        transcript.setLength(0);
         this.message(StringUtils.EMPTY);
         super.cleanup(result, failure);
     }

core/src/test/java/ch/cyberduck/core/threading/SessionBackgroundActionTest.java

@@ -68,7 +68,7 @@ public void testGetExceptionFailure() {
             new TestLoginConnectionService(), new NullSession(new Host(new TestProtocol(), "t")),
             new DisabledTranscriptListener(), new DefaultVaultRegistry(new DisabledPasswordCallback())), new AlertCallback() {
             @Override
-            public boolean alert(final Host repeatableBackgroundAction, final BackgroundException f, final StringBuilder transcript) {
+            public boolean alert(final Host repeatableBackgroundAction, final BackgroundException f) {
                 assertEquals(failure, f);
                 return false;
             }
@@ -95,7 +95,7 @@ public void testGetExceptionLoginCanceledException() {
             new TestLoginConnectionService(), new NullSession(new Host(new TestProtocol(), "t")),
             new DisabledTranscriptListener(), new DefaultVaultRegistry(new DisabledPasswordCallback())), new AlertCallback() {
             @Override
-            public boolean alert(final Host repeatableBackgroundAction, final BackgroundException f, final StringBuilder transcript) {
+            public boolean alert(final Host repeatableBackgroundAction, final BackgroundException f) {
                 assertEquals(failure, f);
                 return false;
             }
@@ -124,7 +124,7 @@ public void testRetrySocket() {
             new NullSession(new Host(new TestProtocol(), "t")),
             new DisabledTranscriptListener(), new DefaultVaultRegistry(new DisabledPasswordCallback())), new AlertCallback() {
             @Override
-            public boolean alert(final Host repeatableBackgroundAction, final BackgroundException f, final StringBuilder transcript) {
+            public boolean alert(final Host repeatableBackgroundAction, final BackgroundException f) {
                 assertEquals(failure, f);
                 return false;
             }

osx/src/main/java/ch/cyberduck/ui/cocoa/callback/PromptAlertCallback.java

@@ -39,15 +39,15 @@ public PromptAlertCallback(final WindowController parent) {
     }
 
     @Override
-    public boolean alert(final Host host, final BackgroundException failure, final StringBuilder transcript) {
+    public boolean alert(final Host host, final BackgroundException failure) {
         final FailureDiagnostics.Type type = new DefaultFailureDiagnostics().determine(failure);
         switch(type) {
             case cancel:
             case skip:
                 return false;
             default:
                 // Send notification
-                notification.alert(host, failure, transcript);
+                notification.alert(host, failure);
                 // Run prompt
                 final AlertController alert = new BackgroundExceptionAlertController(failure, host);
                 switch(alert.beginSheet(parent)) {

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java

@@ -3217,7 +3217,7 @@ public void openTerminalButtonClicked(final ID sender) {
             terminal.open(pool.getHost(), workdir);
         }
         catch(AccessDeniedException e) {
-            new PromptAlertCallback(this).alert(pool.getHost(), e, new StringBuilder());
+            new PromptAlertCallback(this).alert(pool.getHost(), e);
         }
     }
 

windows/src/main/csharp/ch/cyberduck/ui/winforms/threading/DialogAlertCallback.cs

@@ -41,11 +41,6 @@ public DialogAlertCallback(IWindowController controller)
         }
 
         public bool alert(Host host, BackgroundException failure)
-        {
-            return alert(host, failure, new StringBuilder());
-        }
-
-        public bool alert(Host host, BackgroundException failure, StringBuilder log)
         {
             FailureDiagnostics.Type type = _diagnostics.determine(failure);
             if (type == FailureDiagnostics.Type.cancel)
@@ -56,15 +51,14 @@ public bool alert(Host host, BackgroundException failure, StringBuilder log)
             {
                 return false;
             }
-            _notification.alert(host, failure, log);
+            _notification.alert(host, failure);
             bool r = false;
             _controller.Invoke(delegate
                 {
                     string footer = ProviderHelpServiceFactory.get().help(host.getProtocol());
                     string title = BookmarkNameProvider.toString(host);
                     string message = failure.getMessage() ?? LocaleFactory.localizedString("Unknown");
                     string detail = failure.getDetail() ?? LocaleFactory.localizedString("Unknown");
-                    string expanded = log.length() > 0 ? log.toString() : null;
                     string commandButtons;
                     if (type == FailureDiagnostics.Type.network)
                     {
@@ -86,7 +80,7 @@ public bool alert(Host host, BackgroundException failure, StringBuilder log)
                         title: title,
                         mainInstruction: message,
                         content: detail,
-                        expandedInfo: expanded,
+                        expandedInfo: null,
                         help: footer,
                         verificationText: null,
                         commandButtons: commandButtons,