fix

Author: Chris Yang

shell/platform/darwin/common/framework/Source/FlutterNSBundleUtils.mm

@@ -8,8 +8,8 @@
 
 FLUTTER_ASSERT_ARC
 
-const NSString* kDefaultAssetPath = @"Frameworks/App.framework/flutter_assets";
-static NSString* GetFlutterAssetPathFromBundle(NSBundle* bundle);
+NSString* kDefaultAssetPath = @"Frameworks/App.framework/flutter_assets";
+static NSString* GetFlutterAssetsPathFromBundle(NSBundle* bundle, NSString* relativeAssetsPath);
 
 NSBundle* FLTFrameworkBundleInternal(NSString* flutterFrameworkBundleID, NSURL* searchURL) {
   NSDirectoryEnumerator<NSURL*>* frameworkEnumerator = [NSFileManager.defaultManager
@@ -55,22 +55,30 @@
 }
 
 NSString* FLTAssetPath(NSBundle* bundle) {
-  return [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"] ?: kDefaultAssetPath;
+  NSString* relativeAssetsPath = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
+  if (relativeAssetsPath.length == 0) {
+    // Try main bundle
+    relativeAssetsPath = [NSBundle.mainBundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
+  }
+  if (relativeAssetsPath.length == 0) {
+    relativeAssetsPath = kDefaultAssetPath;
+  }
+  return relativeAssetsPath;
 }
 
 NSString* FLTAssetsPathFromBundle(NSBundle* bundle) {
-  NSString* flutterAssetsPath = GetFlutterAssetPathFromBundle(bundle);
+  NSString* relativeAssetsPath = FLTAssetPath(bundle);
+  NSString* flutterAssetsPath = GetFlutterAssetsPathFromBundle(bundle, relativeAssetsPath);
   if (flutterAssetsPath.length == 0) {
-    flutterAssetsPath = GetFlutterAssetPathFromBundle(NSBundle.mainBundle);
+    flutterAssetsPath = GetFlutterAssetsPathFromBundle(NSBundle.mainBundle, relativeAssetsPath);
   }
   return flutterAssetsPath;
 }
 
-static NSString* GetFlutterAssetPathFromBundle(NSBundle* bundle) {
-  NSString* flutterAssetsPath = FLTAssetPath(bundle);
+static NSString* GetFlutterAssetsPathFromBundle(NSBundle* bundle, NSString* relativeAssetsPath) {
   // Use the raw path solution so that asset path can be returned from unloaded bundles.
   // See https://github.com/flutter/engine/pull/46073
-  NSString* assetsPath = [bundle pathForResource:flutterAssetsPath ofType:nil];
+  NSString* assetsPath = [bundle pathForResource:relativeAssetsPath ofType:nil];
   if (assetsPath.length == 0) {
     // In app extension, using full relative path (kDefaultAssetPath)
     // returns nil when the app bundle is not loaded. Try to use

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

@@ -157,12 +157,26 @@ - (void)testLookUpForAssetsFromBundle {
     XCTAssertEqualObjects(assetsPath, @"foo/assets/bar");
   }
   {
-    // No assets path in info.plist, use default value
+    // Found assets path in info.plist in main bundle
     id mockBundle = OCMClassMock([NSBundle class]);
+    id mockMainBundle = OCMPartialMock(NSBundle.mainBundle);
     OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar" fromBundle:mockBundle];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath, @"foo/assets/bar");
+    [mockBundle stopMocking];
+  }
+  {
+    // No assets path in both info.plist, use default value
+    id mockBundle = OCMClassMock([NSBundle class]);
+    id mockMainBundle = OCMPartialMock(NSBundle.mainBundle);
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
     NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar" fromBundle:mockBundle];
     // This is testing public API, changing this assert is likely to break plugins.
     XCTAssertEqualObjects(assetsPath, @"Frameworks/App.framework/flutter_assets/bar");
+    [mockBundle stopMocking];
   }
 }
 
@@ -200,15 +214,31 @@ - (void)testLookUpForAssetsFromPackageFromBundle {
     XCTAssertEqualObjects(assetsPath, @"foo/assets/packages/bar_package/bar");
   }
   {
+    // Found assets path in info.plist in main bundle
     id mockBundle = OCMClassMock([NSBundle class]);
+    id mockMainBundle = OCMPartialMock(NSBundle.mainBundle);
+    OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
+    NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar"
+                                                     fromPackage:@"bar_package"
+                                                      fromBundle:mockBundle];
+    // This is testing public API, changing this assert is likely to break plugins.
+    XCTAssertEqualObjects(assetsPath, @"foo/assets/packages/bar_package/bar");
+    [mockBundle stopMocking];
+  }
+  {
+    id mockBundle = OCMClassMock([NSBundle class]);
+    id mockMainBundle = OCMPartialMock(NSBundle.mainBundle);
     // No assets path in info.plist, use default value
     OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
+    OCMStub([mockMainBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(nil);
     NSString* assetsPath = [FlutterDartProject lookupKeyForAsset:@"bar"
                                                      fromPackage:@"bar_package"
                                                       fromBundle:mockBundle];
     // This is testing public API, changing this assert is likely to break plugins.
     XCTAssertEqualObjects(assetsPath,
                           @"Frameworks/App.framework/flutter_assets/packages/bar_package/bar");
+    [mockBundle stopMocking];
   }
 }