mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add an accessor for the current activity type and write the simplest possible test.

Browse source
This commit is contained in:
Charlie Hess 2016-05-03 15:51:31 -07:00
parent 42768bcc2b
commit 12764a66ed
6 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_app.cc
View file

@ -469,6 +469,8 @@ void App::BuildPrototype(
.SetMethod("show", base::Bind(&Browser::Show, browser))
.SetMethod("setUserActivity",
base::Bind(&Browser::SetUserActivity, browser))
.SetMethod("getCurrentActivityType",
base::Bind(&Browser::GetCurrentActivityType, browser))
#endif
#if defined(OS_WIN)
.SetMethod("setUserTasks",

3
atom/browser/browser.h
View file

@ -97,6 +97,9 @@ class Browser : public WindowListObserver {
void SetUserActivity(const std::string& type,
const std::map<std::string, std::string>& user_info);
// Returns the type name of the current user activity.
std::string GetCurrentActivityType();
// Resumes an activity via hand-off.
bool ContinueUserActivity(const std::string& type,
const std::map<std::string, std::string>& user_info);

15
atom/browser/browser_mac.mm
View file

@ -91,19 +91,24 @@ void Browser::SetUserActivity(const std::string& type, const std::map<std::strin
NSString* type_ns = [NSString stringWithUTF8String:type.c_str()];
NSUserActivity* user_activity = [[NSUserActivity alloc] initWithActivityType:type_ns];
NSMutableArray* user_info_args = [[NSMutableArray alloc] init];
NSMutableDictionary* user_info_args = [[NSMutableDictionary alloc] init];
for (auto const &pair : user_info) {
NSString* value_ns = [NSString stringWithUTF8String:pair.second.c_str()];
NSString* key_ns = [NSString stringWithUTF8String:pair.first.c_str()];
[user_info_args addObject:value_ns];
[user_info_args addObject:key_ns];
[user_info_args setObject:value_ns
forKey:key_ns];
}
user_activity.userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:user_info_args, nil];
user_activity.userInfo = user_info_args;
[user_activity becomeCurrent];
[[AtomApplication sharedApplication] setUserActivity:user_activity];
[[AtomApplication sharedApplication] setCurrentActivity:user_activity];
}
std::string Browser::GetCurrentActivityType() {
NSUserActivity* user_activity = [[AtomApplication sharedApplication] getCurrentActivity];
return base::SysNSStringToUTF8(user_activity.activityType);
}
std::string Browser::GetExecutableFileVersion() const {

7
atom/browser/mac/atom_application_delegate.mm
View file

@ -63,12 +63,11 @@
continueUserActivity:(NSUserActivity *)userActivity
restorationHandler:(void (^)(NSArray *restorableObjects))restorationHandler {
std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
std::map<std::string, std::string> user_info;
NSArray* keys = [userActivity.userInfo allKeys];
for (NSString* key in keys)
{
for (NSString* key in keys) {
NSString* value = [userActivity.userInfo objectForKey:key];
std::string key_str(base::SysNSStringToUTF8(key));
std::string value_str(base::SysNSStringToUTF8(value));