Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "Load iOS dart bundle by URL fallback" #23054

Merged
merged 1 commit into from
Dec 14, 2020
Merged

Revert "Load iOS dart bundle by URL fallback" #23054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
if (bundle == nil) {
bundle = [NSBundle bundleWithIdentifier:[FlutterDartProject defaultBundleIdentifier]];
}
if (bundle == nil) {
// The bundle isn't loaded and can't be found by bundle ID. Find it by path.
bundle = [NSBundle bundleWithURL:[NSBundle.mainBundle.privateFrameworksURL
URLByAppendingPathComponent:@"App.framework"]];
}
if (bundle == nil) {
bundle = mainBundle;
}
Expand Down Expand Up @@ -244,16 +239,11 @@ + (NSString*)flutterAssetsName:(NSBundle*)bundle {
bundle = [NSBundle bundleWithIdentifier:[FlutterDartProject defaultBundleIdentifier]];
}
if (bundle == nil) {
// The bundle isn't loaded and can't be found by bundle ID. Find it by path.
bundle = [NSBundle bundleWithURL:[NSBundle.mainBundle.privateFrameworksURL
URLByAppendingPathComponent:@"App.framework"]];
bundle = [NSBundle mainBundle];
}
NSString* flutterAssetsName = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
if (bundle == nil) {
bundle = [NSBundle mainBundle];
if (flutterAssetsName == nil) {
flutterAssetsName = @"Frameworks/App.framework/flutter_assets";
} else if (flutterAssetsName == nil) {
flutterAssetsName = @"flutter_assets";
}
return flutterAssetsName;
}
Expand Down