Fix the unnecessary unload function call when view will appear.

xingheng · Dec 7, 2018 · b12de8b · b12de8b
1 parent a377676
commit b12de8b
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/DSBaseViewController/DSBaseViewController.m b/DSBaseViewController/DSBaseViewController.m
@@ -58,8 +58,7 @@ - (void)viewWillAppear:(BOOL)animated
         self.fReceivedMemoryWarning = NO;
     } else {
         if ([self _hasInvalidStatusData]) {
-            [self.delegate tearDown:self];
-            [self.delegate loadDataForController:self];
+            [self _loadDataSafely];
         }
     }
 }
@@ -91,7 +90,7 @@ - (void)viewDidDisappear:(BOOL)animated
     }
 
     if ([self _hasInvalidStatusData]) {
-        [self.delegate tearDown:self];
+        [self _unloadDataSafely];
     }
 }
 
@@ -102,10 +101,8 @@ - (void)didReceiveMemoryWarning
     if (!self.visible) {
         DDLogVerbose(@"%@ - received memory warning.", [self class]);
 
-        if ([self.delegate respondsToSelector:@selector(tearDown:)]) {
-            [self.delegate tearDown:self];
-            self.fReceivedMemoryWarning = YES;
-        }
+        [self _unloadDataSafely];
+        self.fReceivedMemoryWarning = YES;
     }
 }
 
@@ -180,6 +177,13 @@ - (void)_loadDataSafely
     }
 }
 
+- (void)_unloadDataSafely
+{
+    if ([self.delegate respondsToSelector:@selector(loadDataForController:)]) {
+        [self.delegate tearDown:self];
+    }
+}
+
 - (BOOL)_hasInvalidStatusData
 {
     BOOL result = NO;