Fix static analyzer issues and a crash when the user has dismissed ev…

…erything
grgcombs · Jan 6, 2017 · dfaef13 · dfaef13
1 parent 76529f5
commit dfaef13
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 26 deletions.
diff --git a/SLToastKit/SLToastKit/SLToast.m b/SLToastKit/SLToastKit/SLToast.m
@@ -86,6 +86,9 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary
     struct SLToastKeys keys = SLToastKeys;
 
     NSString *toastId = SLTypeNonEmptyStringOrNil(dictionary[keys.identifier]);
+    if (!toastId)
+        return nil;
+
     NSString *title = SLTypeStringOrNil(dictionary[keys.title]);
     NSString *subtitle = SLTypeStringOrNil(dictionary[keys.subtitle]);
     UIImage *image = SLTypeImageOrNil(dictionary[keys.image]);
@@ -105,6 +108,8 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary
                            subtitle:subtitle
                               image:image
                            duration:duration];
+    if (self)
+        self.status = status;
 
     return self;
 }

diff --git a/SLToastKit/SLToastKit/SLToastManager.m b/SLToastKit/SLToastKit/SLToastManager.m
@@ -81,18 +81,6 @@ - (void)dealloc
         [_nagLimitTimer invalidate];
     _nagLimitTimer = nil;
 #endif
-
-    // Just in case consumers retained their toasts and need status updates...
-
-    for (SLToast *toast in _store)
-    {
-        if (toast.status != SLToastStatusQueued
-            && toast.status != SLToastStatusFinished
-            && toast.status != SLToastStatusSkipped)
-        {
-            toast.status = SLToastStatusUnknown;
-        }
-    }
 }
 
 - (NSUInteger)totalToastCount
@@ -207,22 +195,28 @@ - (nullable SLToast *)pullNext
 
     if (self.store.count)
     {
-        NSMutableIndexSet *toastsToRemove = [NSMutableIndexSet indexSet];
+        NSMutableArray<SLToast *> *toastsToRemove = [[NSMutableArray alloc] init];
+
+        //NSMutableIndexSet *toastsToRemove = [NSMutableIndexSet indexSet];
         [self.store enumerateObjectsUsingBlock:^(SLToast * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-            if (toast.status != SLToastStatusSkipped)
+            if (toast.status == SLToastStatusSkipped)
+            {
+                [toastsToRemove addObject:obj];
+                return;  // keep iterating until we find one that isn't skipped
+            }
+            else
             {
-                toast = obj;
-                [toastsToRemove addIndex:idx]; // popping this (unskipped) toast from the queue
+                toast = [obj copy];
+                [toastsToRemove addObject:obj];
                 *stop = YES;
                 return;
             }
-            [toastsToRemove addIndex:idx];
         }];
 
         if (!toastsToRemove.count)
             return toast;
 
-        [self.store removeObjectsAtIndexes:toastsToRemove];
+        [self.store removeObjectsInArray:toastsToRemove];
     }
 
     return toast;

diff --git a/SLToastKit/SLToastKit/SLToastView.h b/SLToastKit/SLToastKit/SLToastView.h
@@ -16,12 +16,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SLToastView : UIView
 
-+ (instancetype)showToastInView:(UIView *)parentView
-                          toast:(SLToast *)toast;
++ (nullable instancetype)showToastInView:(UIView *)parentView
+                                   toast:(SLToast *)toast;
 
-+ (instancetype)showToastInWindow:(UIWindow *)parentWindow
-                   statusBarFrame:(CGRect)statusBarFrame
-                            toast:(SLToast *)toast;
++ (nullable instancetype)showToastInWindow:(UIWindow *)parentWindow
+                            statusBarFrame:(CGRect)statusBarFrame
+                                     toast:(SLToast *)toast;
 
 - (BOOL)showToast:(SLToast *)toast;
 

diff --git a/SLToastKit/SLToastKit/SLToastView.m b/SLToastKit/SLToastKit/SLToastView.m
@@ -50,7 +50,7 @@ + (instancetype)showToastInView:(UIView *)parentView
     [parentView addSubview:toastView];
 
     NSTimeInterval duration = toast.duration;
-    if (duration > 0)
+    if (duration >= 0)
     {
         __weak SLToastView *wView = toastView;
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -82,7 +82,7 @@ + (instancetype)showToastInWindow:(UIWindow *)parentWindow
     [parentWindow addSubview:toastView];
 
     NSTimeInterval duration = toast.duration;
-    if (duration > 0)
+    if (duration >= 0)
     {
         __weak SLToastView *wView = toastView;
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -110,7 +110,7 @@ - (BOOL)showToast:(SLToast *)toast
     toast.status = SLToastStatusShowing;
 
     NSTimeInterval duration = toast.duration;
-    if (duration > 0)
+    if (duration >= 0)
     {
         __weak SLToastView *wView = self;
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{