More changes for Catalina -

The HTTPS streaming audio with a Bonjour host name does not work in Catalina or iOS 13, so that feature has been removed as a user interface option.

For the remaining HTTP connection, a Sharing button has been added to provide a convenient way to open LocalRadio on an iPhone via AirDrop.

In a few places, the Xcode static analyzer found some secondary processes trying to call methods that are allowed on the main thread only.  Those lines of code were wrapped in GCD calls to switch to the main thread when needed.

Author: dsward2

LocalRadio/LocalRadio-Source/AppDelegate.h

@@ -29,7 +29,7 @@
 #define kListenModeScan 2
 #define kListenModeDevice 3
 
-@interface AppDelegate : NSObject <NSApplicationDelegate, NSStreamDelegate, NSTabViewDelegate>
+@interface AppDelegate : NSObject <NSApplicationDelegate, NSStreamDelegate, NSTabViewDelegate, NSSharingServiceDelegate>
 
 //NS_ASSUME_NONNULL_BEGIN
 
@@ -57,6 +57,9 @@
 @property (weak) IBOutlet NSTextField * localRadioHTTPSURLTextField;
 @property (weak) IBOutlet NSTextField * localRadioHTTPURLTextField;
 
+@property (weak) IBOutlet NSButton * shareHTTPURLButton;
+@property (weak) IBOutlet NSButton * shareHTTPSURLButton;
+
 @property (weak) IBOutlet NSTextField * statusIcecastServerTextField;
 @property (weak) IBOutlet NSTextField * statusIcecastSourceTextField;
 @property (weak) IBOutlet NSTextField * statusRTLSDRTextField;
@@ -194,5 +197,7 @@
 - (NSString *)localHostString;
 - (NSString *)localHostIPString;
 
+- (IBAction)shareWebPreviewURL:(id)sender;
+
 @end
 

LocalRadio/LocalRadio-Source/AppDelegate.m

@@ -101,6 +101,9 @@ - (void)terminateTasks
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
     [self performSelectorInBackground:@selector(configureServices) withObject:NULL];
+    
+    [self.shareHTTPSURLButton sendActionOn:NSEventMaskLeftMouseDown];
+    [self.shareHTTPURLButton sendActionOn:NSEventMaskLeftMouseDown];
 }
 
 //==================================================================================
@@ -318,7 +321,23 @@ - (IBAction)updateCurrentTasksText:(id)sender
             [tasksString appendFormat:@"%@ %@\n\n",
                 self.icecastController.quotedIcecastPath, self.icecastController.icecastTaskArgsString];
 
-            AppDelegate * appDelegate = (AppDelegate *)[NSApp delegate];
+            //AppDelegate * appDelegate = (AppDelegate *)[NSApp delegate];
+            
+            __block AppDelegate * appDelegate = NULL;
+
+            if ([(NSThread*)[NSThread currentThread] isMainThread] == NO)
+            {
+                dispatch_sync(dispatch_get_main_queue(), ^{
+                    appDelegate = (AppDelegate *)[NSApp delegate];
+                });
+            }
+            else
+            {
+                appDelegate = (AppDelegate *)[NSApp delegate];
+            }
+
+
+
             IcecastController * icecastController = appDelegate.icecastController;
             NSDictionary * icecastStatusDictionary = [icecastController icecastStatusDictionary];
 
@@ -1499,6 +1518,68 @@ - (IBAction)reloadWebView:(id)sender
     [self.webViewDelegate.webView reload:self];
 }
 
+// AirDrop methods
+
+- (IBAction)shareWebPreviewURL:(id)sender
+{
+    NSString * urlString = self.localRadioHTTPURLTextField.stringValue;
+    NSRect frameRect = self.localRadioHTTPURLTextField.frame;
+    NSButton * senderButton = sender;
+    
+    if (sender == self.shareHTTPURLButton)
+    {
+        urlString = self.localRadioHTTPURLTextField.stringValue;
+        frameRect = self.localRadioHTTPURLTextField.bounds;
+    }
+    else if (sender == self.shareHTTPSURLButton)
+    {
+        urlString = self.localRadioHTTPSURLTextField.stringValue;
+        frameRect = self.localRadioHTTPSURLTextField.bounds;
+    }
+
+    NSURL* url = [NSURL URLWithString:urlString];
+
+    NSSharingServicePicker *sharingServicePicker = [[NSSharingServicePicker alloc] initWithItems:[NSArray arrayWithObjects:url, nil]];
+    
+    __weak id weakSelf = self;
+    sharingServicePicker.delegate = weakSelf;
+
+    [sharingServicePicker showRelativeToRect:frameRect
+                                      ofView:senderButton
+                               preferredEdge:NSMinYEdge];
+}
+
+
+- (NSRect) sharingService: (NSSharingService *) sharingService
+sourceFrameOnScreenForShareItem: (id<NSPasteboardWriting>) item
+{
+    if([item isKindOfClass: [NSURL class]])
+    {
+        //return a rect from where the image will fly
+        return NSZeroRect;
+    }
+
+    return NSZeroRect;
+}
+
+- (NSImage *) sharingService: (NSSharingService *) sharingService
+ transitionImageForShareItem: (id <NSPasteboardWriting>) item
+                 contentRect: (NSRect *) contentRect
+{
+    if([item isKindOfClass: [NSURL class]])
+    {
+
+        return [NSImage imageNamed:@"svg-logo.png"];
+    }
+
+    return nil;
+}
+
+- (id < NSSharingServiceDelegate >)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker delegateForSharingService:(NSSharingService *)sharingService
+{
+    return self;
+}
+
 
 
 @end

LocalRadio/LocalRadio-Source/Base.lproj/MainMenu.xib

@@ -42,7 +42,19 @@ - (id)initWithAsyncSocket:(GCDAsyncSocket *)newSocket configuration:(HTTPConfig
 {
 	if ((self = [super initWithAsyncSocket:newSocket configuration:aConfig]))
 	{
-        self.appDelegate = (AppDelegate *)[NSApp delegate];
+        //self.appDelegate = (AppDelegate *)[NSApp delegate];
+
+        if ([(NSThread*)[NSThread currentThread] isMainThread] == NO)
+        {
+            dispatch_sync(dispatch_get_main_queue(), ^{
+                self.appDelegate = (AppDelegate *)[NSApp delegate];
+            });
+        }
+        else
+        {
+            self.appDelegate = (AppDelegate *)[NSApp delegate];
+        }
+
         self.sqliteController = self.appDelegate.sqliteController;
         self.icecastController = self.appDelegate.icecastController;
         self.sdrController = self.appDelegate.sdrController;

LocalRadio/LocalRadio-Source/HTTPWebServerConnection.m

@@ -128,7 +128,22 @@ - (void) configureTaskPipes
             [taskItem.task setStandardOutput:[NSFileHandle fileHandleWithNullDevice]];
         }
 
-        AppDelegate * appDelegate = (AppDelegate *)[NSApp delegate];
+        //AppDelegate * appDelegate = (AppDelegate *)[NSApp delegate];
+
+        __block AppDelegate * appDelegate = NULL;
+        
+        if ([(NSThread*)[NSThread currentThread] isMainThread] == NO)
+        {
+            dispatch_sync(dispatch_get_main_queue(), ^{
+                appDelegate = (AppDelegate *)[NSApp delegate];
+            });
+        }
+        else
+        {
+            appDelegate = (AppDelegate *)[NSApp delegate];
+        }
+
+
         NSNumber * captureStderrNumber = [appDelegate.localRadioAppSettings integerForKey:@"CaptureStderr"];
         BOOL captureStderr = captureStderrNumber.boolValue;
 
@@ -215,7 +230,21 @@ - (void) startTasks
 
         self.taskPipelineStatus = kTaskPipelineStatusRunning;
 
-        AppDelegate * appDelegate = (AppDelegate *)[NSApp delegate];
+        //AppDelegate * appDelegate = (AppDelegate *)[NSApp delegate];
+
+        __block AppDelegate * appDelegate = NULL;
+        
+        if ([(NSThread*)[NSThread currentThread] isMainThread] == NO)
+        {
+            dispatch_sync(dispatch_get_main_queue(), ^{
+                appDelegate = (AppDelegate *)[NSApp delegate];
+            });
+        }
+        else
+        {
+            appDelegate = (AppDelegate *)[NSApp delegate];
+        }
+
         [appDelegate updateCurrentTasksText:self];
     }
 }