Use nil function instead of empty function

tmatsuo · Oct 28, 2016 · 2a25f33 · 2a25f33
1 parent 61274ca
commit 2a25f33
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
@@ -407,8 +407,7 @@ - (void)startWithWriteable:(id<GRXWriteable>)writeable {
     }
   };
   [_connectivityMonitor handleLossWithHandler:handler
-                      wifiStatusChangeHandler:^{
-                      }];
+                      wifiStatusChangeHandler:nil];
 }
 
 - (void)setState:(GRXWriterState)newState {

diff --git a/src/objective-c/GRPCClient/private/GRPCConnectivityMonitor.h b/src/objective-c/GRPCClient/private/GRPCConnectivityMonitor.h
@@ -72,6 +72,6 @@
  * Only one handler is active at a time, so if this method is called again before the previous
  * handler has been called, it might never be called at all (or yes, if it has already been queued).
  */
-- (void)handleLossWithHandler:(nonnull void (^)())handler
-      wifiStatusChangeHandler:(nonnull void (^)())wifiStatusChangeHandler;
+- (void)handleLossWithHandler:(void (^)())lossHandler
+      wifiStatusChangeHandler:(void (^)())wifiStatusChangeHandler;
 @end
diff --git a/src/objective-c/GRPCClient/private/GRPCConnectivityMonitor.m b/src/objective-c/GRPCClient/private/GRPCConnectivityMonitor.m
@@ -151,14 +151,14 @@ + (nullable instancetype)monitorWithHost:(nonnull NSString *)host {
   return returnValue;
 }
 
-- (void)handleLossWithHandler:(void (^)())handler
-      wifiStatusChangeHandler:(nonnull void (^)())wifiStatusChangeHandler {
+- (void)handleLossWithHandler:(void (^)())lossHandler
+      wifiStatusChangeHandler:(void (^)())wifiStatusChangeHandler {
   __weak typeof(self) weakSelf = self;
   [self startListeningWithHandler:^(GRPCReachabilityFlags *flags) {
     typeof(self) strongSelf = weakSelf;
     if (strongSelf) {
       if (!flags.reachable) {
-        handler();
+        lossHandler();
       } else if (strongSelf->_previousReachabilityFlags &&
                  (flags.isWWAN ^
                   strongSelf->_previousReachabilityFlags.isWWAN)) {