fix

remove teams

fix tests

fix test

Author: Chris Yang

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

@@ -61,10 +61,23 @@
   NSString* flutterAssetsPath = FLTAssetPath(bundle);
   // 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:@""];
+  NSString* assetsPath = [bundle pathForResource:flutterAssetsPath ofType:nil];
+  if (assetsPath.length == 0) {
+    // In app extension, using full relative path(kDefaultAssetPath)
+    // returns nil when the app bundle is not loaded. We try to use
+    // the sub folder name, which can successfully return a valid path.
+    assetsPath = [bundle pathForResource:@"flutter_assets" ofType:nil];
+  }
+
+  if (assetsPath.length == 0) {
+    assetsPath = [[NSBundle mainBundle] pathForResource:flutterAssetsPath ofType:nil];
+  }
 
   if (assetsPath.length == 0) {
-    assetsPath = [[NSBundle mainBundle] pathForResource:flutterAssetsPath ofType:@""];
+    // In app extension, using full relative path(kDefaultAssetPath)
+    // returns nil when the app bundle is not loaded. We try to use
+    // the sub folder name, which can successfully return a valid path.
+    assetsPath = [[NSBundle mainBundle] pathForResource:@"flutter_assets" ofType:nil];
   }
   return assetsPath;
 }

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

@@ -93,7 +93,7 @@ - (void)testFLTAssetsURLFromBundle {
     id mockBundle = OCMClassMock([NSBundle class]);
     OCMStub([mockBundle objectForInfoDictionaryKey:@"FLTAssetsPath"]).andReturn(@"foo/assets");
     NSString* resultAssetsPath = @"path/to/foo/assets";
-    OCMStub([mockBundle pathForResource:@"foo/assets" ofType:@""]).andReturn(resultAssetsPath);
+    OCMStub([mockBundle pathForResource:@"foo/assets" ofType:nil]).andReturn(resultAssetsPath);
     NSString* path = FLTAssetsPathFromBundle(mockBundle);
     XCTAssertEqualObjects(path, @"path/to/foo/assets");
   }
@@ -102,9 +102,9 @@ - (void)testFLTAssetsURLFromBundle {
     id mockBundle = OCMClassMock([NSBundle class]);
     id mockMainBundle = OCMPartialMock([NSBundle mainBundle]);
     NSString* resultAssetsPath = @"path/to/foo/assets";
-    OCMStub([mockBundle pathForResource:@"Frameworks/App.framework/flutter_assets" ofType:@""])
+    OCMStub([mockBundle pathForResource:@"Frameworks/App.framework/flutter_assets" ofType:nil])
         .andReturn(nil);
-    OCMStub([mockMainBundle pathForResource:@"Frameworks/App.framework/flutter_assets" ofType:@""])
+    OCMStub([mockMainBundle pathForResource:@"Frameworks/App.framework/flutter_assets" ofType:nil])
         .andReturn(resultAssetsPath);
     NSString* path = FLTAssetsPathFromBundle(mockBundle);
     XCTAssertEqualObjects(path, @"path/to/foo/assets");