Merge branch 'zx/flutterSdk' into 'master'

flutter SDK升级

See merge request !67

GMFlutterSDK/Frameworks/App.framework/flutter_assets/FontManifest.json

-[{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.ttf"}]},{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.ttf"}]}]
\ No newline at end of file
+[{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.otf"}]}]
\ No newline at end of file

GMFlutterSDK/Frameworks/Flutter.framework/Headers/Flutter.h

@@ -5,52 +5,6 @@
 #ifndef FLUTTER_FLUTTER_H_
 #define FLUTTER_FLUTTER_H_
 
-/**
- BREAKING CHANGES:
-
- December 17, 2018:
-  - Changed designated initializer on FlutterEngine
-
- October 5, 2018:
-  - Removed FlutterNavigationController.h/.mm
-  - Changed return signature of `FlutterDartHeadlessCodeRunner.run*` from void
- to bool
-  - Removed HeadlessPlatformViewIOS
-  - Marked FlutterDartHeadlessCodeRunner deprecated
-
- August 31, 2018: Marked -[FlutterDartProject
- initFromDefaultSourceForConfiguration] and FlutterStandardBigInteger as
- unavailable.
-
- July 26, 2018: Marked -[FlutterDartProject
- initFromDefaultSourceForConfiguration] deprecated.
-
- February 28, 2018: Removed "initWithFLXArchive" and
- "initWithFLXArchiveWithScriptSnapshot".
-
- January 15, 2018: Marked "initWithFLXArchive" and
- "initWithFLXArchiveWithScriptSnapshot" as unavailable following the
- deprecation from December 11, 2017. Scheduled to be removed on February
- 19, 2018.
-
- January 09, 2018: Deprecated "FlutterStandardBigInteger" and its use in
- "FlutterStandardMessageCodec" and "FlutterStandardMethodCodec". Scheduled to
- be marked as unavailable once the deprecation has been available on the
- flutter/flutter alpha branch for four weeks. "FlutterStandardBigInteger" was
- needed because the Dart 1.0 int type had no size limit. With Dart 2.0, the
- int type is a fixed-size, 64-bit signed integer. If you need to communicate
- larger integers, use NSString encoding instead.
-
- December 11, 2017: Deprecated "initWithFLXArchive" and
- "initWithFLXArchiveWithScriptSnapshot" and scheculed the same to be marked as
- unavailable on January 15, 2018. Instead, "initWithFlutterAssets" and
- "initWithFlutterAssetsWithScriptSnapshot" should be used. The reason for this
- change is that the FLX archive will be deprecated and replaced with a flutter
- assets directory containing the same files as the FLX did.
-
- November 29, 2017: Added a BREAKING CHANGES section.
- */
-
 #include "FlutterAppDelegate.h"
 #include "FlutterBinaryMessenger.h"
 #include "FlutterCallbackCache.h"

GMFlutterSDK/Frameworks/Flutter.framework/Headers/FlutterBinaryMessenger.h

@@ -29,6 +29,8 @@ typedef void (^FlutterBinaryReply)(NSData* _Nullable reply);
  */
 typedef void (^FlutterBinaryMessageHandler)(NSData* _Nullable message, FlutterBinaryReply reply);
 
+typedef int64_t FlutterBinaryMessengerConnection;
+
 /**
  * A facility for communicating with the Flutter side using asynchronous message
  * passing with binary messages.
@@ -72,9 +74,20 @@ FLUTTER_EXPORT
  *
  * @param channel The channel name.
  * @param handler The message handler.
+ * @return An identifier that represents the connection that was just created to the channel.
+ */
+- (FlutterBinaryMessengerConnection)setMessageHandlerOnChannel:(NSString*)channel
+                                          binaryMessageHandler:
+                                              (FlutterBinaryMessageHandler _Nullable)handler;
+
+/**
+ * Clears out a channel's message handler if that handler is still the one that
+ * was created as a result of
+ * `setMessageHandlerOnChannel:binaryMessageHandler:`.
+ *
+ * @param connection The result from `setMessageHandlerOnChannel:binaryMessageHandler:`.
  */
-- (void)setMessageHandlerOnChannel:(NSString*)channel
-              binaryMessageHandler:(FlutterBinaryMessageHandler _Nullable)handler;
+- (void)cleanupConnection:(FlutterBinaryMessengerConnection)connection;
 @end
 NS_ASSUME_NONNULL_END
 #endif  // FLUTTER_FLUTTERBINARYMESSENGER_H_

GMFlutterSDK/Frameworks/Flutter.framework/Headers/FlutterEngine.h

@@ -24,6 +24,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 extern NSString* const FlutterDefaultDartEntrypoint;
 
+/**
+ * The default Flutter initial route ("/").
+ */
+extern NSString* const FlutterDefaultInitialRoute;
+
 /**
  * The FlutterEngine class coordinates a single instance of execution for a
  * `FlutterDartProject`.  It may have zero or one `FlutterViewController` at a
@@ -36,6 +41,11 @@ extern NSString* const FlutterDefaultDartEntrypoint;
  * `FlutterViewController` instances to maintain state and/or asynchronous tasks
  * (such as downloading a large file).
  *
+ * A FlutterEngine can also be used to prewarm the Dart execution environment and reduce the
+ * latency of showing the Flutter screen when a `FlutterViewController` is created and presented.
+ * See http://flutter.dev/docs/development/add-to-app/performance for more details on loading
+ * performance.
+ *
  * Alternatively, you can simply create a new `FlutterViewController` with only a
  * `FlutterDartProject`. That `FlutterViewController` will internally manage its
  * own instance of a FlutterEngine, but will not guarantee survival of the engine
@@ -48,6 +58,24 @@ extern NSString* const FlutterDefaultDartEntrypoint;
 FLUTTER_EXPORT
 @interface FlutterEngine : NSObject <FlutterTextureRegistry, FlutterPluginRegistry>
 
+/**
+ * Default initializer for a FlutterEngine.
+ *
+ * Threads created by this FlutterEngine will appear as "FlutterEngine #" in
+ * Instruments. The prefix can be customized using `initWithName`.
+ *
+ * The engine will execute the project located in the bundle with the identifier
+ * "io.flutter.flutter.app" (the default for Flutter projects).
+ *
+ * A newly initialized engine will not run until either `-runWithEntrypoint:` or
+ * `-runWithEntrypoint:libraryURI:` is called.
+ *
+ * FlutterEngine created with this method will have allowHeadlessExecution set to `YES`.
+ * This means that the engine will continue to run regardless of whether a `FlutterViewController`
+ * is attached to it or not, until `-destroyContext:` is called or the process finishes.
+ */
+- (instancetype)init;
+
 /**
  * Initialize this FlutterEngine.
  *
@@ -109,17 +137,12 @@ FLUTTER_EXPORT
                      project:(nullable FlutterDartProject*)project
       allowHeadlessExecution:(BOOL)allowHeadlessExecution NS_DESIGNATED_INITIALIZER;
 
-/**
- * The default initializer is not available for this object.
- * Callers must use `-[FlutterEngine initWithName:project:]`.
- */
-- (instancetype)init NS_UNAVAILABLE;
-
 + (instancetype)new NS_UNAVAILABLE;
 
 /**
  * Runs a Dart program on an Isolate from the main Dart library (i.e. the library that
- * contains `main()`), using `main()` as the entrypoint (the default for Flutter projects).
+ * contains `main()`), using `main()` as the entrypoint (the default for Flutter projects),
+ * and using "/" (the default route) as the initial route.
  *
  * The first call to this method will create a new Isolate. Subsequent calls will return
  * immediately and have no effect.
@@ -130,7 +153,7 @@ FLUTTER_EXPORT
 
 /**
  * Runs a Dart program on an Isolate from the main Dart library (i.e. the library that
- * contains `main()`).
+ * contains `main()`), using "/" (the default route) as the initial route.
  *
  * The first call to this method will create a new Isolate. Subsequent calls will return
  * immediately and have no effect.
@@ -144,6 +167,25 @@ FLUTTER_EXPORT
  */
 - (BOOL)runWithEntrypoint:(nullable NSString*)entrypoint;
 
+/**
+ * Runs a Dart program on an Isolate from the main Dart library (i.e. the library that
+ * contains `main()`).
+ *
+ * The first call to this method will create a new Isolate. Subsequent calls will return
+ * immediately and have no effect.
+ *
+ * @param entrypoint The name of a top-level function from the same Dart
+ *   library that contains the app's main() function.  If this is FlutterDefaultDartEntrypoint (or
+ *   nil), it will default to `main()`.  If it is not the app's main() function, that function must
+ *   be decorated with `@pragma(vm:entry-point)` to ensure the method is not tree-shaken by the Dart
+ *   compiler.
+ * @param initialRoute The name of the initial Flutter `Navigator` `Route` to load. If this is
+ *   FlutterDefaultInitialRoute (or nil), it will default to the "/" route.
+ * @return YES if the call succeeds in creating and running a Flutter Engine instance; NO otherwise.
+ */
+- (BOOL)runWithEntrypoint:(nullable NSString*)entrypoint
+             initialRoute:(nullable NSString*)initialRoute;
+
 /**
  * Runs a Dart program on an Isolate using the specified entrypoint and Dart library,
  * which may not be the same as the library containing the Dart program's `main()` function.

GMFlutterSDK/Frameworks/Flutter.framework/Headers/FlutterHeadlessDartRunner.h

@@ -22,7 +22,7 @@
 typedef void (^FlutterHeadlessDartRunnerCallback)(BOOL success);
 
 /**
- * The FlutterHeadlessDartRunner runs Flutter Dart code with a null rasterizer,
+ * The deprecated FlutterHeadlessDartRunner runs Flutter Dart code with a null rasterizer,
  * and no native drawing surface. It is appropriate for use in running Dart
  * code e.g. in the background from a plugin.
  *

GMFlutterSDK/Frameworks/Flutter.framework/Headers/FlutterPlugin.h

@@ -398,7 +398,7 @@ typedef enum {
  *
  * @param pluginKey The unique key identifying the plugin.
  */
-- (NSObject<FlutterPluginRegistrar>*)registrarForPlugin:(NSString*)pluginKey;
+- (nullable NSObject<FlutterPluginRegistrar>*)registrarForPlugin:(NSString*)pluginKey;
 /**
  * Returns whether the specified plugin has been registered.
  *
@@ -415,7 +415,7 @@ typedef enum {
  *   nothing has been published. Will be `nil` if the plugin has not been
  *   registered.
  */
-- (NSObject*)valuePublishedByPlugin:(NSString*)pluginKey;
+- (nullable NSObject*)valuePublishedByPlugin:(NSString*)pluginKey;
 @end
 
 #pragma mark -

GMFlutterSDK/Frameworks/Flutter.framework/Headers/FlutterViewController.h

@@ -35,14 +35,17 @@ extern NSNotificationName const FlutterSemanticsUpdateNotification;
  * handled by `FlutterEngine`. Calls on this class to those members all proxy through to the
  * `FlutterEngine` attached FlutterViewController.
  *
- * A FlutterViewController can be initialized either with an already-running `FlutterEngine` via
- * the `initWithEngine:` initializer, or it can be initialized with a `FlutterDartProject` that
- * will be used to implicitly spin up a new `FlutterEngine`. Creating a `FlutterEngine before
- * showing a `FlutterViewController` can be used to pre-initialize the Dart VM and to prepare the
- * isolate in order to reduce the latency to the first rendered frame. Holding a `FlutterEngine`
- * independently of FlutterViewControllers can also be used to not to lose Dart-related state and
- * asynchronous tasks when navigating back and forth between a FlutterViewController and other
- * `UIViewController`s.
+ * A FlutterViewController can be initialized either with an already-running `FlutterEngine` via the
+ * `initWithEngine:` initializer, or it can be initialized with a `FlutterDartProject` that will be
+ * used to implicitly spin up a new `FlutterEngine`. Creating a `FlutterEngine` before showing a
+ * FlutterViewController can be used to pre-initialize the Dart VM and to prepare the isolate in
+ * order to reduce the latency to the first rendered frame. See
+ * https://flutter.dev/docs/development/add-to-app/performance for more details on loading
+ * latency.
+ *
+ * Holding a `FlutterEngine` independently of FlutterViewControllers can also be used to not to lose
+ * Dart-related state and asynchronous tasks when navigating back and forth between a
+ * FlutterViewController and other `UIViewController`s.
  */
 FLUTTER_EXPORT
 @interface FlutterViewController : UIViewController <FlutterTextureRegistry, FlutterPluginRegistry>
@@ -52,7 +55,7 @@ FLUTTER_EXPORT
  *
  * The initialized viewcontroller will attach itself to the engine as part of this process.
  *
- * @param engine The `FlutterEngine` instance to attach to.
+ * @param engine The `FlutterEngine` instance to attach to. Cannot be nil.
  * @param nibName The NIB name to initialize this UIViewController with.
  * @param nibBundle The NIB bundle.
  */
@@ -64,14 +67,42 @@ FLUTTER_EXPORT
  * Initializes a new FlutterViewController and `FlutterEngine` with the specified
  * `FlutterDartProject`.
  *
+ * This will implicitly create a new `FlutterEngine` which is retrievable via the `engine` property
+ * after initialization.
+ *
+ * @param project The `FlutterDartProject` to initialize the `FlutterEngine` with.
+ * @param nibName The NIB name to initialize this UIViewController with.
+ * @param nibBundle The NIB bundle.
+ */
+- (instancetype)initWithProject:(nullable FlutterDartProject*)project
+                        nibName:(nullable NSString*)nibName
+                         bundle:(nullable NSBundle*)nibBundle NS_DESIGNATED_INITIALIZER;
+
+/**
+ * Initializes a new FlutterViewController and `FlutterEngine` with the specified
+ * `FlutterDartProject` and `initialRoute`.
+ *
+ * This will implicitly create a new `FlutterEngine` which is retrievable via the `engine` property
+ * after initialization.
+ *
  * @param project The `FlutterDartProject` to initialize the `FlutterEngine` with.
+ * @param initialRoute The initial `Navigator` route to load.
  * @param nibName The NIB name to initialize this UIViewController with.
  * @param nibBundle The NIB bundle.
  */
 - (instancetype)initWithProject:(nullable FlutterDartProject*)project
+                   initialRoute:(nullable NSString*)initialRoute
                         nibName:(nullable NSString*)nibName
                          bundle:(nullable NSBundle*)nibBundle NS_DESIGNATED_INITIALIZER;
 
+/**
+ * Initializer that is called from loading a FlutterViewController from a XIB.
+ *
+ * See also:
+ * https://developer.apple.com/documentation/foundation/nscoding/1416145-initwithcoder?language=objc
+ */
+- (instancetype)initWithCoder:(NSCoder*)aDecoder NS_DESIGNATED_INITIALIZER;
+
 /**
  * Registers a callback that will be invoked when the Flutter view has been rendered.
  * The callback will be fired only once.
@@ -103,6 +134,8 @@ FLUTTER_EXPORT
 - (NSString*)lookupKeyForAsset:(NSString*)asset fromPackage:(NSString*)package;
 
 /**
+ * Deprecated API to set initial route.
+ *
  * Attempts to set the first route that the Flutter app shows if the Flutter
  * runtime hasn't yet started. The default is "/".
  *
@@ -113,9 +146,15 @@ FLUTTER_EXPORT
  * Setting this after the Flutter started running has no effect. See `pushRoute`
  * and `popRoute` to change the route after Flutter started running.
  *
+ * This is deprecated because it needs to be called at the time of initialization
+ * and thus should just be in the `initWithProject` initializer. If using
+ * `initWithEngine`, the initial route should be set on the engine's
+ * initializer.
+ *
  * @param route The name of the first route to show.
  */
-- (void)setInitialRoute:(NSString*)route;
+- (void)setInitialRoute:(NSString*)route
+    FLUTTER_DEPRECATED("Use FlutterViewController initializer to specify initial route");
 
 /**
  * Instructs the Flutter Navigator (if any) to go back.
@@ -124,8 +163,7 @@ FLUTTER_EXPORT
 
 /**
  * Instructs the Flutter Navigator (if any) to push a route on to the navigation
- * stack.  The setInitialRoute method should be preferred if this is called before the
- * FlutterViewController has come into view.
+ * stack.
  *
  * @param route The name of the route to push to the navigation stack.
  */
@@ -174,7 +212,9 @@ FLUTTER_EXPORT
 @property(nonatomic, getter=isViewOpaque) BOOL viewOpaque;
 
 /**
- * The `FlutterEngine` instance for this view controller.
+ * The `FlutterEngine` instance for this view controller. This could be the engine this
+ * `FlutterViewController` is initialized with or a new `FlutterEngine` implicitly created if
+ * no engine was supplied during initialization.
  */
 @property(weak, nonatomic, readonly) FlutterEngine* engine;
 
@@ -186,6 +226,17 @@ FLUTTER_EXPORT
  */
 @property(nonatomic, readonly) NSObject<FlutterBinaryMessenger>* binaryMessenger;
 
+/**
+ * If the `FlutterViewController` creates a `FlutterEngine`, this property
+ * determines if that `FlutterEngine` has `allowHeadlessExecution` set.
+ *
+ * The intention is that this is used with the XIB.  Otherwise, a
+ * `FlutterEngine` can just be sent to the init methods.
+ *
+ * See also: `-[FlutterEngine initWithName:project:allowHeadlessExecution:]`
+ */
+@property(nonatomic, readonly) BOOL engineAllowHeadlessExecution;
+
 @end
 
 NS_ASSUME_NONNULL_END

GMFlutterSDK/Frameworks/Flutter.framework/Info.plist

@@ -23,8 +23,8 @@
   <key>MinimumOSVersion</key>
   <string>8.0</string>
   <key>FlutterEngine</key>
-  <string>ee76268252c22f5c11e82a7b87423ca3982e51a7</string>
+  <string>ae90085a8437c0ae94d6b5ad2741739ebc742cb4</string>
   <key>ClangVersion</key>
-  <string>Fuchsia clang version 8.0.0  (based on LLVM 8.0.0svn)</string>
+  <string>Apple clang version 11.0.0 (clang-1100.0.33.8)</string>
 </dict>
 </plist>

GMFlutterSDK/Frameworks/Flutter.framework/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/Flutter.h</key>
 		<data>
-		LQBk1GD+u1YEANQovLVv2R/uUag=
+		kLWQX/aWuXIsDK/JNuX3yt40MsU=
 		</data>
 		<key>Headers/FlutterAppDelegate.h</key>
 		<data>
@@ -14,7 +14,7 @@
 		</data>
 		<key>Headers/FlutterBinaryMessenger.h</key>
 		<data>
-		3TKVS3KoBmkupZxin9YbnrPtMCk=
+		jxJ6BSIQ812GchUi4HiFV/r0610=
 		</data>
 		<key>Headers/FlutterCallbackCache.h</key>
 		<data>
@@ -34,11 +34,11 @@
 		</data>
 		<key>Headers/FlutterEngine.h</key>
 		<data>
-		LJQOfMrJadCb3BZ18IdY6i8wWZQ=
+		KFpiYZBq6cK6xV5YlRvg9Y4Tygk=
 		</data>
 		<key>Headers/FlutterHeadlessDartRunner.h</key>
 		<data>
-		M8/dhQH3VcQVHupUxQ1dGsbG3Ek=
+		tgDvkYIRwTvMGj7yN6qnKdSKQCQ=
 		</data>
 		<key>Headers/FlutterMacros.h</key>
 		<data>
@@ -50,7 +50,7 @@
 		</data>
 		<key>Headers/FlutterPlugin.h</key>
 		<data>
-		iA41oFWXYC7nUQQX+BRMVxVOdnA=
+		8vdSTkxMwkobUCDXADmgCLXw4qo=
 		</data>
 		<key>Headers/FlutterPluginAppLifeCycleDelegate.h</key>
 		<data>
@@ -62,11 +62,11 @@
 		</data>
 		<key>Headers/FlutterViewController.h</key>
 		<data>
-		E4Ln9BDq+LPTdIlJi/kdpt5ZAdA=
+		rdyDexhD1LuO/07PzM16X0gxTQc=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		6Wx47HgGtA8tVVces84A4NuoAhM=
+		95UIpYfnsStKLPZ88EivHi59+HM=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -74,7 +74,7 @@
 		</data>
 		<key>icudtl.dat</key>
 		<data>
-		z32dyLOVE4+TKehZcBQlHkxsxKQ=
+		7LLymJyVsVOgMdYqN+/9Bwjbkwc=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -83,11 +83,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			LQBk1GD+u1YEANQovLVv2R/uUag=
+			kLWQX/aWuXIsDK/JNuX3yt40MsU=
 			</data>
 			<key>hash2</key>
 			<data>
-			8ZWbAXinM+GRkpUfLzcvsat4nccJ7ZNgGrAhy0iglXs=
+			ln/t1JyzxFFxsnnOV3B1BHEmzr8hVu62CRIPzeZZGM8=
 			</data>
 		</dict>
 		<key>Headers/FlutterAppDelegate.h</key>
@@ -105,11 +105,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			3TKVS3KoBmkupZxin9YbnrPtMCk=
+			jxJ6BSIQ812GchUi4HiFV/r0610=
 			</data>
 			<key>hash2</key>
 			<data>
-			USlivwosbaNJJAtX2mpOdBVwZE9osgj/I3NnC9DCS04=
+			gBUV6Yaw3irZ5irFwby83/Dckmx1zIEZB4UmOTgMFms=
 			</data>
 		</dict>
 		<key>Headers/FlutterCallbackCache.h</key>
@@ -160,22 +160,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			LJQOfMrJadCb3BZ18IdY6i8wWZQ=
+			KFpiYZBq6cK6xV5YlRvg9Y4Tygk=
 			</data>
 			<key>hash2</key>
 			<data>
-			M4bhndP7yk3GSrTS/lp5u6/pwR6LGFou02UwSZfy94o=
+			g3Kzolx8Gkd1LkLfBYh1JguS6nGhloRAc2Mef3n2CKk=
 			</data>
 		</dict>
 		<key>Headers/FlutterHeadlessDartRunner.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			M8/dhQH3VcQVHupUxQ1dGsbG3Ek=
+			tgDvkYIRwTvMGj7yN6qnKdSKQCQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			2LUPyCMVHwKeIFZP9I5vV64Kl7unE39yisrUZVrUiVo=
+			gL9QAiAeZmZrvjenoxchxsQuyFxjtrFtZczZw8ORIjk=
 			</data>
 		</dict>
 		<key>Headers/FlutterMacros.h</key>
@@ -204,11 +204,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			iA41oFWXYC7nUQQX+BRMVxVOdnA=
+			8vdSTkxMwkobUCDXADmgCLXw4qo=
 			</data>
 			<key>hash2</key>
 			<data>
-			w5EgHMebCtKpo+84J4QDOp6ZvIEKx8D1UuOh/cKh5ig=
+			aPxJJTUy97Mu3fGBLnTFOeJoiarp0/PZ/Slygj57Ve0=
 			</data>
 		</dict>
 		<key>Headers/FlutterPluginAppLifeCycleDelegate.h</key>
@@ -237,11 +237,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			E4Ln9BDq+LPTdIlJi/kdpt5ZAdA=
+			rdyDexhD1LuO/07PzM16X0gxTQc=
 			</data>
 			<key>hash2</key>
 			<data>
-			YA63QxtWlRZlOhmWqBpCeK9bAbF0hoOTOQNCvIquUdI=
+			m9Utsa8eCjFywFlDxPPGJ1iGWPuSW+XdSXi7QBhg17k=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>
@@ -259,11 +259,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			z32dyLOVE4+TKehZcBQlHkxsxKQ=
+			7LLymJyVsVOgMdYqN+/9Bwjbkwc=
 			</data>
 			<key>hash2</key>
 			<data>
-			zdr5Vzvecp4snhYdlNG4xyqroPTCh6TeJWIkNMcEyTE=
+			d6igCZs0Amnct0Ty8wttXm7vy5E4/cjjtaT/00mQRnA=
 			</data>
 		</dict>
 	</dict>