Interoperability with macOS Tahoe

CHANGELOG.md

@@ -5,6 +5,7 @@
 * [Feature] Connect with Multi-Bucket Application Keys that grant access to a specific group of buckets within an
   account, including the option to limit access based on a single file prefix (
   B2) ([#17139](https://trac.cyberduck.io/ticket/17139))
+* [Feature] Support for Liquid Glass (macOS) ([#17459](https://trac.cyberduck.io/ticket/17459))
 * [Feature] Connect with connection profile obtaining temporary credentials from AWS Security Token Service (STS) by
   assuming role with optional Multi-Factor Authentication (MFA) input (
   S3) ([#17437](https://trac.cyberduck.io/ticket/17437))

Credits.rtf

@@ -39,8 +39,6 @@
 \cf3 		Synapticloop\
 \cf0 		{\field{\*\fldinst{HYPERLINK "http://zathras.de/"}}{\fldrslt UKCrashReporter}}\
 \cf3 		M. Uli Kusterer\
-\cf0 		{\field{\*\fldinst{HYPERLINK "http://www.snoize.com/"}}{\fldrslt SNDisclosableView}}\
-\cf3 		Kurt Revis\
 \cf0 		{\field{\*\fldinst{HYPERLINK "https://opensource.apple.com/tarballs/mDNSResponder/"}}{\fldrslt mDNSResponder}}\
 \cf3 		Apple Inc.\
 \cf0 		{\field{\*\fldinst{HYPERLINK "https://sparkle-project.org/"}}{\fldrslt Sparkle}}\

binding/src/main/java/ch/cyberduck/binding/BundleController.java

@@ -30,13 +30,17 @@
 import ch.cyberduck.core.Factory;
 import ch.cyberduck.core.FactoryException;
 
+import ch.cyberduck.core.LocaleFactory;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 public abstract class BundleController extends ProxyController {
     private static final Logger log = LogManager.getLogger(BundleController.class);
 
+    protected static final String DEFAULT = LocaleFactory.localizedString("Default");
+
     public static final NSMutableParagraphStyle PARAGRAPH_STYLE_LEFT_ALIGNMENT_TRUNCATE_MIDDLE;
     public static final NSMutableParagraphStyle PARAGRAPH_STYLE_LEFT_ALIGNMENT_TRUNCATE_TAIL;
     public static final NSMutableParagraphStyle PARAGRAPH_STYLE_RIGHT_ALIGNMENT_TRUNCATE_TAIL;

binding/src/main/java/ch/cyberduck/binding/Outlet.java

@@ -22,7 +22,7 @@
 import java.lang.annotation.ElementType;
 import java.lang.annotation.RetentionPolicy;
 
-@java.lang.annotation.Target({ElementType.FIELD})
+@java.lang.annotation.Target({ElementType.FIELD, ElementType.METHOD})
 @java.lang.annotation.Retention(RetentionPolicy.SOURCE)
 public @interface Outlet {
 }

binding/src/main/java/ch/cyberduck/binding/ProxyController.java

@@ -17,9 +17,15 @@
 
 import ch.cyberduck.binding.application.NSAlert;
 import ch.cyberduck.binding.application.NSApplication;
+import ch.cyberduck.binding.application.NSPopover;
+import ch.cyberduck.binding.application.NSView;
+import ch.cyberduck.binding.application.NSViewController;
 import ch.cyberduck.binding.application.NSWindow;
 import ch.cyberduck.binding.application.SheetCallback;
 import ch.cyberduck.binding.application.WindowListener;
+import ch.cyberduck.binding.foundation.FoundationKitFunctions;
+import ch.cyberduck.binding.foundation.NSNotification;
+import ch.cyberduck.binding.foundation.NSObject;
 import ch.cyberduck.binding.foundation.NSThread;
 import ch.cyberduck.core.AbstractController;
 import ch.cyberduck.core.threading.DefaultMainAction;
@@ -28,11 +34,14 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.rococoa.ID;
+import org.rococoa.cocoa.foundation.NSRect;
+import org.rococoa.cocoa.foundation.NSSize;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
 import com.google.common.util.concurrent.Uninterruptibles;
 
@@ -153,6 +162,16 @@ public int alert(final SheetController sheet, final AlertRunner runner, final Co
     protected static final Set<AlertRunner> alerts
             = new HashSet<>();
 
+    /**
+     * @param sheet    Controller for alert window
+     * @param callback Handler invoked after sheet is dismissed with selected option
+     * @param runner   Implementation to display alert window
+     * @return Selected alert option by user
+     */
+    public int alert(final SheetController sheet, final SheetCallback callback, final AlertRunner runner) {
+        return this.alert(sheet, callback, runner, new CountDownLatch(1));
+    }
+
     /**
      * Display as sheet attached to window of parent controller
      *
@@ -164,7 +183,9 @@ public int alert(final SheetController sheet, final AlertRunner runner, final Co
      */
     public int alert(final SheetController sheet, final SheetCallback callback, final AlertRunner runner, final CountDownLatch signal) {
         log.debug("Alert with runner {} and callback {}", runner, callback);
-        alerts.add(runner);
+        synchronized(alerts) {
+            alerts.add(runner);
+        }
         final AtomicInteger option = new AtomicInteger(SheetCallback.CANCEL_OPTION);
         final CountDownLatch state = new CountDownLatch(1);
         final SheetCallback.DelegatingSheetCallback chain = new SheetCallback.DelegatingSheetCallback(new SheetCallback.ReturnCodeSheetCallback(option), sheet, callback);
@@ -174,7 +195,11 @@ public void run() {
                 log.info("Load bundle for alert {}", sheet);
                 sheet.loadBundle();
                 runner.alert(sheet.window(), new SheetCallback.DelegatingSheetCallback(new SignalSheetCallback(state),
-                        chain, new SignalSheetCallback(signal), (returncode) -> alerts.remove(runner)));
+                        chain, new SignalSheetCallback(signal), (returncode) -> {
+                    synchronized(alerts) {
+                        alerts.remove(runner);
+                    }
+                }));
             }
         }, true);
         if(!NSThread.isMainThread()) {
@@ -310,4 +335,102 @@ public void callback(final int returncode) {
             signal.countDown();
         }
     }
+
+    public static final class PopoverAlertRunner extends Proxy implements AlertRunner, AlertRunner.CloseHandler, WindowListener {
+        private final NSPopover popover = NSPopover.create();
+        private final NSView positioningView;
+        private final NSRect positioningRect;
+        private final SheetController controller;
+        private final AtomicReference<Proxy> reference = new AtomicReference<>();
+        private final AtomicInteger option = new AtomicInteger(SheetCallback.CANCEL_OPTION);
+        private final int behaviour;
+
+        public PopoverAlertRunner(final NSView positioningView, final SheetController controller) {
+            this(positioningView, positioningView.frame(), controller);
+        }
+
+        public PopoverAlertRunner(final NSView positioningView, final NSRect positioningRect, final SheetController controller) {
+            this(positioningView, positioningRect, controller, NSPopover.NSPopoverBehaviorSemitransient);
+        }
+
+        public PopoverAlertRunner(final NSView positioningView, final NSRect positioningRect, final SheetController controller, final int behaviour) {
+            this.positioningView = positioningView;
+            this.positioningRect = positioningRect;
+            this.controller = controller;
+            this.behaviour = behaviour;
+        }
+
+        @Override
+        public void alert(final NSWindow sheet, final SheetCallback callback) {
+            NSApplication.sharedApplication().activateIgnoringOtherApps(true);
+            final Proxy proxy = new PopoverDelegate(controller, option, callback);
+            reference.set(proxy);
+            popover.setDelegate(proxy.id());
+            popover.setAnimates(false);
+            popover.setBehavior(behaviour);
+            final NSViewController viewController = NSViewController.create();
+            viewController.setView(sheet.contentView());
+            popover.setContentViewController(viewController);
+            popover.showRelativeToRect_ofView_preferredEdge(positioningRect, positioningView,
+                    FoundationKitFunctions.NSRectEdge.NSMinYEdge);
+            controller.addListener(this);
+        }
+
+        @Override
+        public void windowDidResize(final NSSize windowFrame) {
+            log.debug("Resize popover to {}", windowFrame);
+            popover.setContentSize(controller.view().intrinsicContentSize());
+        }
+
+        @Override
+        public void closed(final NSWindow sheet, final int returncode) {
+            option.set(returncode);
+            popover.performClose(null);
+        }
+    }
+
+    public static final class PopoverDelegate extends Proxy {
+        private final SheetController controller;
+        private final AtomicInteger returncode;
+        private final SheetCallback callback;
+
+        public PopoverDelegate(final SheetController controller, final AtomicInteger returncode, final SheetCallback callback) {
+            this.controller = controller;
+            this.returncode = returncode;
+            this.callback = callback;
+        }
+
+        @Delegate
+        public void popoverWillClose(final NSNotification notification) {
+            final NSObject popoverCloseReasonValue = notification.userInfo().objectForKey(NSPopover.NSPopoverCloseReasonKey);
+            if(popoverCloseReasonValue != null) {
+                if(NSPopover.NSPopoverCloseReasonValue.NSPopoverCloseReasonStandard.equals(popoverCloseReasonValue.toString())) {
+                    log.debug("Notify {} of return code {}", callback, returncode.get());
+                    // No window close notification for popover
+                    controller.invalidate();
+                    callback.callback(returncode.get());
+                }
+                else {
+                    log.debug("Ignore notification {}", notification);
+                }
+            }
+        }
+
+        @Delegate
+        public boolean popoverShouldDetach(final NSPopover popover) {
+            return true;
+        }
+    }
+
+    /**
+     * Adjust frame of subview to match the parent view and attach with translating autoresizing mask into constraints
+     *
+     * @param parent  Container View
+     * @param subview Content View
+     */
+    protected void addSubview(final NSView parent, final NSView subview) {
+        subview.setTranslatesAutoresizingMaskIntoConstraints(true);
+        subview.setFrame(parent.bounds());
+        parent.addSubview(subview);
+    }
 }

binding/src/main/java/ch/cyberduck/binding/WindowController.java

@@ -47,8 +47,6 @@
 public abstract class WindowController extends BundleController implements NSWindow.Delegate {
     private static final Logger log = LogManager.getLogger(WindowController.class);
 
-    protected static final String DEFAULT = LocaleFactory.localizedString("Default");
-
     protected final Set<WindowListener> listeners
             = Collections.synchronizedSet(new HashSet<>());
     /**
@@ -57,11 +55,6 @@ public abstract class WindowController extends BundleController implements NSWin
     @Outlet
     protected NSWindow window;
 
-    /**
-     * Main content view of window
-     */
-    protected NSView view;
-
     public WindowController() {
         super();
     }
@@ -91,7 +84,6 @@ public void removeListener(final WindowListener listener) {
 
     public void setWindow(final NSWindow window) {
         this.window = window;
-        this.view = window.contentView();
         this.window.recalculateKeyViewLoop();
         this.window.setReleasedWhenClosed(true);
         this.window.setDelegate(this.id());
@@ -103,7 +95,7 @@ public NSWindow window() {
 
     @Override
     public NSView view() {
-        return view;
+        return window.contentView();
     }
 
     /**
@@ -252,14 +244,14 @@ protected double getMinWindowWidth() {
 
     protected double toolbarHeightForWindow() {
         final NSRect windowFrame = NSWindow.contentRectForFrameRect_styleMask(window.frame(), window.styleMask());
-        return windowFrame.size.height.doubleValue() - view.frame().size.height.doubleValue();
+        return windowFrame.size.height.doubleValue() - window.contentView().frame().size.height.doubleValue();
     }
 
     /**
      * @return Minimum size to fit content view of currently selected tab.
      */
     protected NSRect getContentRect() {
-        return view.frame();
+        return window.contentView().frame();
     }
 
     /**

binding/src/main/java/ch/cyberduck/binding/application/NSTableView.java

@@ -30,6 +30,7 @@
 import org.rococoa.cocoa.CGFloat;
 import org.rococoa.cocoa.foundation.NSInteger;
 import org.rococoa.cocoa.foundation.NSPoint;
+import org.rococoa.cocoa.foundation.NSRect;
 import org.rococoa.cocoa.foundation.NSUInteger;
 
 /// <i>native declaration : :69</i>
@@ -841,4 +842,13 @@ public void editRow(NSInteger column, NSInteger row, boolean select) {
      * <i>from NSDeprecated native declaration : :528</i><br>
      * Conversion Error : NSRect
      */
+
+    /**
+     * Returns the rectangle containing the row at the specified index.
+     *
+     * @param row Table row
+     * @return The rectangle containing the row at rowIndex. Returns NSZeroRect if rowIndex lies outside the range of valid row indexes for the table view.
+     */
+    public abstract NSRect rectOfRow(NSInteger row);
+
 }

binding/src/main/java/ch/cyberduck/binding/application/NSView.java

@@ -279,6 +279,13 @@ public interface _Class extends ObjCClass {
      */
     public abstract NSSize fittingSize();
 
+    /**
+     * The natural size for the receiving view, considering only properties of the view itself.
+     *
+     * @return A size indicating the natural size for the receiving view based on its intrinsic properties.
+     */
+    public abstract NSSize intrinsicContentSize();
+
     /**
      * Original signature : <code>void setAutoresizesSubviews(BOOL)</code><br>
      * <i>native declaration : :155</i>
@@ -1162,4 +1169,13 @@ public boolean dragPromisedFilesOfTypes(
      * <i>from NSFullScreenMode native declaration : :419</i>
      */
     public abstract boolean isInFullScreenMode();
+
+    /**
+     * When this property is set to true, the view’s superview looks at the view’s autoresizing mask, produces constraints
+     * that implement it, and adds those constraints to itself (the superview). If your view has flexible constraints that
+     * require dynamic adjustment, set this property to false and apply the constraints yourself.
+     *
+     * @param flag A Boolean value indicating whether the view’s autoresizing mask is translated into constraints for the constraint-based layout system.
+     */
+    public abstract void setTranslatesAutoresizingMaskIntoConstraints(final boolean flag);
 }