From 7260d58fb2b4665ebe614f94d822b8407bd95f58 Mon Sep 17 00:00:00 2001
From: Jim Porter <jporter@mozilla.com>
Date: Tue, 17 Jun 2014 18:48:47 -0500
Subject: [PATCH] Merge pull request #20504 from
 jimporter/ringtones-hide-share-from-self

Bug 1015513 - [ringtones] An app shouldn't be able to pick itself when l...
---
 apps/ringtones/js/actions_menu.js               | 2 ++
 apps/ringtones/manifest.webapp                  | 1 +
 apps/ringtones/test/marionette/lib/ringtones.js | 1 +
 apps/ringtones/test/marionette/manage_test.js   | 6 ++++++
 4 files changed, 10 insertions(+)

diff --git a/apps/ringtones/js/actions_menu.js b/apps/ringtones/js/actions_menu.js
index e40eb3533055..43cbfd661b7c 100644
--- a/apps/ringtones/js/actions_menu.js
+++ b/apps/ringtones/js/actions_menu.js
@@ -80,6 +80,8 @@ ActionsMenu.prototype = {
         name: 'share',
         data: {
           type: 'audio/*',
+          // Make sure we can't share with ourselves!
+          __bug1015513_hide_from_self__: true,
           number: 1,
           blobs: [blob],
           filenames: [self._tone.name],
diff --git a/apps/ringtones/manifest.webapp b/apps/ringtones/manifest.webapp
index 7c5295c14fa4..990de44823f2 100644
--- a/apps/ringtones/manifest.webapp
+++ b/apps/ringtones/manifest.webapp
@@ -31,6 +31,7 @@
           "required": true,
           "pattern": "^audio/.*$"
         },
+        "__bug1015513_hide_from_self__": false,
         "number": 1
       },
       "disposition": "inline",
diff --git a/apps/ringtones/test/marionette/lib/ringtones.js b/apps/ringtones/test/marionette/lib/ringtones.js
index c61b7d2251e2..7a453a616e1d 100644
--- a/apps/ringtones/test/marionette/lib/ringtones.js
+++ b/apps/ringtones/test/marionette/lib/ringtones.js
@@ -76,6 +76,7 @@ ActionsMenu.prototype = {
         return list[i];
       }
     }
+    return null;
   }
 };
 createElementGetters(
diff --git a/apps/ringtones/test/marionette/manage_test.js b/apps/ringtones/test/marionette/manage_test.js
index 801350c55355..7c05e3d8d2c1 100644
--- a/apps/ringtones/test/marionette/manage_test.js
+++ b/apps/ringtones/test/marionette/manage_test.js
@@ -140,6 +140,12 @@ marionette('Ringtone management', function() {
         // the right data was sent...
         var actionsMenu = container.soundLists[0].sounds[0].openActions();
         actionsMenu.shareButton.tap();
+
+        // Make sure we can't share with ourselves, since that's weird.
+        assert.equal(actionsMenu.shareWith('Ringtones'), null,
+                     'Ringtones app shouldn\'t be in Share menu');
+
+        // Share with the messages app.
         actionsMenu.shareWith('Messages').tap();
       });
     });