Reset on hot restart

Author: goderbauer

shell/platform/darwin/ios/framework/Source/FlutterRestorationPlugin.h

@@ -11,13 +11,13 @@
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h"
 
 @interface FlutterRestorationPlugin : NSObject
-
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 - (instancetype)initWithChannel:(FlutterMethodChannel*)channel restorationEnabled:(BOOL)waitForData  NS_DESIGNATED_INITIALIZER;
 
 - (NSData*)restorationData;
 - (void)restorationData:(NSData *)data;
 - (void)restorationComplete;
+- (void)reset;
 @end
 #endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERRESTORATIONPLUGIN_H_

shell/platform/darwin/ios/framework/Source/FlutterRestorationPlugin.mm

@@ -84,6 +84,17 @@ - (void)restorationComplete {
   }
 }
 
+- (void)reset {
+  if (_restorationData != nil) {
+    [_restorationData release];
+  }
+  _restorationData = nil;
+  if (_pendingRequest != nil) {
+    [_pendingRequest release];
+  }
+  _pendingRequest = nil;
+}
+
 - (NSDictionary*)dataForFramework {
   if (!_restorationEnabled) {
     return @{ @"enabled": @NO };

shell/platform/darwin/ios/framework/Source/FlutterViewController.mm

@@ -1449,4 +1449,8 @@ - (void)decodeRestorableStateWithCoder:(NSCoder *)coder {
   [[_engine.get() restorationPlugin] restorationData:restorationData];
 }
 
+- (FlutterRestorationPlugin*)restorationPlugin {
+  return [_engine.get() restorationPlugin];
+}
+
 @end

shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h

@@ -8,6 +8,7 @@
 #include "flutter/fml/memory/weak_ptr.h"
 
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterRestorationPlugin.h"
 
 namespace flutter {
 class FlutterPlatformViewsController;
@@ -27,6 +28,7 @@ extern NSNotificationName const FlutterViewControllerShowHomeIndicator;
 @property(nonatomic, readonly) BOOL isPresentingViewController;
 - (fml::WeakPtr<FlutterViewController>)getWeakPtr;
 - (std::shared_ptr<flutter::FlutterPlatformViewsController>&)platformViewsController;
+- (FlutterRestorationPlugin*)restorationPlugin;
 
 @end
 

shell/platform/darwin/ios/platform_view_ios.mm

@@ -197,6 +197,7 @@
     return;
   }
   [owner_controller_.get() platformViewsController]->Reset();
+  [[owner_controller_.get() restorationPlugin] reset];
 }
 
 std::unique_ptr<std::vector<std::string>> PlatformViewIOS::ComputePlatformResolvedLocales(