DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Load iOS dart bundle by URL fallback (#22997)

Browse Source
This commit is contained in:
Jenn Magder 2020-12-10 14:43:02 -08:00 committed by GitHub
parent bb81b954b9
commit 9df2157676
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
View File

@ -43,6 +43,11 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
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;
}
@ -239,11 +244,16 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) {
bundle = [NSBundle bundleWithIdentifier:[FlutterDartProject defaultBundleIdentifier]];
}
if (bundle == nil) {
bundle = [NSBundle mainBundle];
// 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"]];
}
NSString* flutterAssetsName = [bundle objectForInfoDictionaryKey:@"FLTAssetsPath"];
if (flutterAssetsName == nil) {
if (bundle == nil) {
bundle = [NSBundle mainBundle];
flutterAssetsName = @"Frameworks/App.framework/flutter_assets";
} else if (flutterAssetsName == nil) {
flutterAssetsName = @"flutter_assets";
}
return flutterAssetsName;
}