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

diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index ec6cdce..f15fad9 100644 (file)
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -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",

diff --git a/atom/browser/browser.h b/atom/browser/browser.h
index 14f94a0..5c3dcaf 100644 (file)
--- a/atom/browser/browser.h
+++ b/atom/browser/browser.h
@@ -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);

diff --git a/atom/browser/browser_mac.mm b/atom/browser/browser_mac.mm
index 58ee846..0695793 100644 (file)
--- a/atom/browser/browser_mac.mm
+++ b/atom/browser/browser_mac.mm
@@ -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 {

diff --git a/atom/browser/mac/atom_application_delegate.mm b/atom/browser/mac/atom_application_delegate.mm
index 33aa47c..2309a75 100644 (file)
--- a/atom/browser/mac/atom_application_delegate.mm
+++ b/atom/browser/mac/atom_application_delegate.mm
@@ -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));

diff --git a/docs/api/app.md b/docs/api/app.md
index 4bd121a..3ade1da 100644 (file)
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -510,6 +510,10 @@ Currently only string data is supported.
 Creates an `NSUserActivity` and sets it as the current activity. The activity
 is eligible for [handoff](https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/Handoff/HandoffFundamentals/HandoffFundamentals.html) to another device afterward.
 
+### `app.getCurrentActivityType()` _OS X_
+
+Returns the type of the currently running activity.
+
 ### `app.setAppUserModelId(id)` _Windows_
 
 * `id` String

diff --git a/spec/api-app-spec.js b/spec/api-app-spec.js
index 1c20ef8..809e552 100644 (file)
--- a/spec/api-app-spec.js
+++ b/spec/api-app-spec.js
@@ -89,6 +89,13 @@ describe('app module', function () {
     })
   })
 
+  describe('app.setUserActivity(type, userInfo)', function () {
+    it('sets the current activity', function () {
+      app.setUserActivity('com.electron.testActivity', {testData: '123'});
+      assert.equal(app.getCurrentActivityType(), 'com.electron.testActivity');
+    })
+  })
+
   describe('app.importCertificate', function () {
     if (process.platform !== 'linux')
       return