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}}\

Cyberduck.xcodeproj/project.pbxproj

@@ -257,8 +257,6 @@
 		47F85C361C0F103E00FDA856 /* CDOutlineView.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F85C241C0F103E00FDA856 /* CDOutlineView.h */; };
 		47F85C371C0F103E00FDA856 /* CDOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 47F85C251C0F103E00FDA856 /* CDOutlineView.m */; };
 		47F85C3C1C0F103E00FDA856 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 47F85C2A1C0F103E00FDA856 /* main.m */; };
-		47F85C401C0F103E00FDA856 /* SNDisclosableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F85C2E1C0F103E00FDA856 /* SNDisclosableView.h */; };
-		47F85C411C0F103E00FDA856 /* SNDisclosableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 47F85C2F1C0F103E00FDA856 /* SNDisclosableView.m */; };
 		47F9380F1D7F63CE00108AB5 /* dropbox.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 47F9380E1D7F63CE00108AB5 /* dropbox.tiff */; };
 		47FB0FD724B3C7FB00C6764E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47FB0FD624B3C7FA00C6764E /* Security.framework */; };
 		47FB0FDE24B3C88A00C6764E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47FB0FDD24B3C88A00C6764E /* Foundation.framework */; };
@@ -1746,8 +1744,6 @@
 		47F85C241C0F103E00FDA856 /* CDOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDOutlineView.h; path = osx/src/main/objc/CDOutlineView.h; sourceTree = "<group>"; };
 		47F85C251C0F103E00FDA856 /* CDOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDOutlineView.m; path = osx/src/main/objc/CDOutlineView.m; sourceTree = "<group>"; };
 		47F85C2A1C0F103E00FDA856 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = osx/src/main/objc/main.m; sourceTree = "<group>"; };
-		47F85C2E1C0F103E00FDA856 /* SNDisclosableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SNDisclosableView.h; path = osx/src/main/objc/SNDisclosableView.h; sourceTree = "<group>"; };
-		47F85C2F1C0F103E00FDA856 /* SNDisclosableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SNDisclosableView.m; path = osx/src/main/objc/SNDisclosableView.m; sourceTree = "<group>"; };
 		47F9380E1D7F63CE00108AB5 /* dropbox.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = dropbox.tiff; sourceTree = "<group>"; };
 		47FB0FD624B3C7FA00C6764E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = ../MacOSX.sdk/System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		47FB0FDA24B3C84A00C6764E /* QuickLookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLookUI.framework; path = ../MacOSX.sdk/System/Library/Frameworks/Quartz.framework/Versions/A/Frameworks/QuickLookUI.framework; sourceTree = SDKROOT; };
@@ -1919,7 +1915,6 @@
 				473A8DD5287424CA00CD2E12 /* WorkspaceSchemeHandlerProxy.m */,
 			);
 			name = Core;
-			path = source;
 			sourceTree = "<group>";
 		};
 		4741639206C4F58D00AC0BD2 /* Resources */ = {
@@ -2144,8 +2139,6 @@
 				47F85C241C0F103E00FDA856 /* CDOutlineView.h */,
 				47F85C251C0F103E00FDA856 /* CDOutlineView.m */,
 				47F85C2A1C0F103E00FDA856 /* main.m */,
-				47F85C2E1C0F103E00FDA856 /* SNDisclosableView.h */,
-				47F85C2F1C0F103E00FDA856 /* SNDisclosableView.m */,
 				47D6FFE61CCFA54A005B01C5 /* CDToolbarItem.m */,
 				47D6FFE71CCFA54A005B01C5 /* CDToolbarItem.h */,
 			);
@@ -2185,7 +2178,6 @@
 				47FB79D81C2E9E67008D3B9C /* launcher.h in Headers */,
 				47F85C361C0F103E00FDA856 /* CDOutlineView.h in Headers */,
 				47D6FFE91CCFA54A005B01C5 /* CDToolbarItem.h in Headers */,
-				47F85C401C0F103E00FDA856 /* SNDisclosableView.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2655,7 +2647,6 @@
 				47F85C371C0F103E00FDA856 /* CDOutlineView.m in Sources */,
 				47F85C311C0F103E00FDA856 /* CDBookmarkCell.m in Sources */,
 				47F85C351C0F103E00FDA856 /* CDOutlineCell.m in Sources */,
-				47F85C411C0F103E00FDA856 /* SNDisclosableView.m in Sources */,
 				47F85C331C0F103E00FDA856 /* CDListView.m in Sources */,
 				47D6FFE81CCFA54A005B01C5 /* CDToolbarItem.m in Sources */,
 				47F85C3C1C0F103E00FDA856 /* main.m in Sources */,

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
      *
@@ -309,4 +328,85 @@ 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);
+
+        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 = positioningView;
+            this.positioningRect = positioningRect;
+            this.controller = controller;
+            this.controller.addHandler(this);
+        }
+
+        @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(true);
+            popover.setBehavior(NSPopover.NSPopoverBehaviorSemitransient);
+            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().fittingSize());
+        }
+
+        @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;
+        }
+    }
 }

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);
+
 }

defaults/src/main/resources/default.properties

@@ -126,6 +126,12 @@ browser.delete.trash=true
 browser.filesize.decimal=false
 browser.date.natural=true
 
+bookmark.window.popover=true
+bookmark.protocol.configurable=true
+bookmark.name.configurable=true
+bookmark.labels.configurable=true
+bookmark.username.configurable=true
+bookmark.password.configurable=true
 bookmark.toggle.options=false
 transfer.toggle.details=true