Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ios custom flow #12920

Merged
merged 20 commits into from
Dec 23, 2021
Merged

Ios custom flow #12920

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
62b0081
Custom Commissioning Flow Outbound
Xiole-KKE Dec 10, 2021
0f496bf
Custom Commissioning Flow Inbound
Xiole-KKE Dec 10, 2021
e2ec393
Fix comments
Xiole-KKE Dec 11, 2021
9d9f0c1
remove autoresize.
Xiole-KKE Dec 11, 2021
29e0603
Remove duplicate vars and fixed re-scan logic
Xiole-KKE Dec 15, 2021
f5898c5
Extra clean up and adds some logs
Xiole-KKE Dec 15, 2021
5618ecc
Remove dev params
Xiole-KKE Dec 15, 2021
eb7636f
Delete project.pbxproj
Xiole-KKE Dec 15, 2021
e438152
Revert "Delete project.pbxproj"
Xiole-KKE Dec 15, 2021
0cf9d9a
Update project.pbxproj
Xiole-KKE Dec 15, 2021
de82d93
Update project.pbxproj
Xiole-KKE Dec 15, 2021
6c371ca
adds a feature flag CommissioningCustomFlowUseMockFlag
Xiole-KKE Dec 16, 2021
448dad9
Optimized UI while reading from Ledger API.
Xiole-KKE Dec 16, 2021
e3b645c
Remove some log
Xiole-KKE Dec 17, 2021
ec9c1cd
Merge branch 'project-chip:master' into ios-custom-flow
Xiole-KKE Dec 17, 2021
e578777
Restyled by whitespace
restyled-commits Dec 17, 2021
b6c5840
Restyled by clang-format
restyled-commits Dec 17, 2021
e726150
Update Info.plist
Xiole-KKE Dec 17, 2021
b05e4c9
Adds a pop up window while redirecting back
Xiole-KKE Dec 17, 2021
5473a1d
Restyled by clang-format
restyled-commits Dec 17, 2021
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
8 changes: 4 additions & 4 deletions src/darwin/CHIPTool/CHIPTool.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,15 +561,15 @@
CODE_SIGN_ENTITLEMENTS = CHIPTool/CHIPTool.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 52NSKPS8M9;
Xiole-KKE marked this conversation as resolved.
Show resolved Hide resolved
ENABLE_BITCODE = NO;
INFOPLIST_FILE = CHIPTool/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.chip.CHIPTool;
PRODUCT_BUNDLE_IDENTIFIER = "com.chip.CHIPTool-xiaolei";
Xiole-KKE marked this conversation as resolved.
Show resolved Hide resolved
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = iphoneos;
Expand All @@ -584,15 +584,15 @@
CODE_SIGN_ENTITLEMENTS = CHIPTool/CHIPTool.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 52NSKPS8M9;
Xiole-KKE marked this conversation as resolved.
Show resolved Hide resolved
ENABLE_BITCODE = NO;
INFOPLIST_FILE = CHIPTool/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.chip.CHIPTool;
PRODUCT_BUNDLE_IDENTIFIER = "com.chip.CHIPTool-xiaolei";
Xiole-KKE marked this conversation as resolved.
Show resolved Hide resolved
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = iphoneos;
Expand Down
18 changes: 18 additions & 0 deletions src/darwin/CHIPTool/CHIPTool/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>LSEnvironment</key>
<dict>
<key>CommissioningCustomFlowReturnUrl</key>
<string>customflow://payload</string>
<key>CommissioningCustomFlowLedgerUrl</key>
<string>https://dcl.dev.dsr-corporation.com/api/modelinfo/models</string>
</dict>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleURLSchemes</key>
<array>
<string>customflow</string>
</array>
</dict>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
Expand Down
9 changes: 9 additions & 0 deletions src/darwin/CHIPTool/CHIPTool/View Controllers/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
[self.window makeKeyAndVisible];
return YES;
}

- (BOOL)application:(UIApplication *)application
openURL:(NSURL *)url
options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options
{
// custom commissioning flow
NSLog(@"%@", url);
return YES;
}
@end
Loading