Fix warnings in demo/viewer apps

spotify · Sep 24, 2021 · 968e559 · 968e559
1 parent 693c656
commit 968e559
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.h b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.h
@@ -25,7 +25,7 @@
 @interface DetailViewController : UIViewController
 
 @property (nonatomic, strong) SPTPersistentCache *persistentDataCache;
-@property (strong, nonatomic) id detailItem;
+@property (strong, nonatomic) NSObject *detailItem;
 @property (nonatomic, weak, readwrite) IBOutlet UIImageView *detailImageView;
 
 @end

diff --git a/Viewer/MainWindowController.m b/Viewer/MainWindowController.m
@@ -22,7 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 #import <SPTPersistentCache/SPTPersistentCache.h>
 
 @interface MainWindowController () <NSTableViewDataSource, NSTableViewDelegate>
-@property (nonatomic, strong) NSMutableArray *cacheFiles;
+@property (nonatomic, strong) NSMutableArray<NSURL *> *cacheFiles;
 
 @property (nonatomic, strong) NSString *magic;
 @property (nonatomic, strong) NSString *headerSize;
@@ -112,10 +112,10 @@ -(BOOL)validateMenuItem:(NSMenuItem *)menuItem
 - (void)loadFilesAtURL:(NSURL *)url
 {
     NSError *error = nil;
-    NSArray *files = [[NSFileManager defaultManager] contentsOfDirectoryAtURL:url
-                                                   includingPropertiesForKeys:nil
-                                                                      options:NSDirectoryEnumerationSkipsHiddenFiles
-                                                                        error:&error];
+    NSArray<NSURL *> *files = [[NSFileManager defaultManager] contentsOfDirectoryAtURL:url
+                                                            includingPropertiesForKeys:nil
+                                                                               options:NSDirectoryEnumerationSkipsHiddenFiles
+                                                                                 error:&error];
     if (files == nil) {
         [NSApp presentError:error];
         return;
@@ -144,8 +144,8 @@ - (void)tableViewSelectionDidChange:(NSNotification *)aNotification
         return;
     }
 
-    NSString *fullFilePath = [self.cacheFiles objectAtIndex:(NSUInteger)idx];
-    NSData *rawData = [NSData dataWithContentsOfFile:fullFilePath];
+    NSURL *fileURL = [self.cacheFiles objectAtIndex:(NSUInteger)idx];
+    NSData *rawData = [NSData dataWithContentsOfURL:fileURL];
 
     SPTPersistentCacheRecordHeader *h = SPTPersistentCacheGetHeaderFromData(__DECONST(void*, [rawData bytes]), [rawData length]);
 
@@ -177,8 +177,9 @@ - (void)tableViewSelectionDidChange:(NSNotification *)aNotification
 
     self.object = [[NSImage alloc] initWithData:self.payload];
 
-    self.imageView.image = self.object;
-    self.imageSize = NSStringFromSize([self.object size]);
+    NSImage *image = self.object;
+    self.imageView.image = image;
+    self.imageSize = NSStringFromSize([image size]);
 }
 
 @end