From bd4a275558ed95e4590dde43a9783c9847f77d6c Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Thu, 24 Jun 2021 15:33:19 -0400
Subject: [PATCH] Revert "Redefine cipher "share" to "move to organization"
 (#1433)" (#1440)

This reverts commit 2003ac9d2c82e87060b8bb2f9207386890ac1552.
---
 .../CipherViewCell/CipherViewCell.xaml        |  2 +-
 .../SettingsPage/SettingsPage.xaml.cs         |  2 +-
 .../SettingsPage/SettingsPageViewModel.cs     |  6 +--
 src/App/Pages/Vault/AddEditPage.xaml          |  2 +-
 src/App/Pages/Vault/AddEditPage.xaml.cs       |  4 +-
 src/App/Pages/Vault/SharePage.xaml            |  4 +-
 src/App/Pages/Vault/SharePageViewModel.cs     |  6 +--
 src/App/Pages/Vault/ViewPage.xaml             |  2 +-
 src/App/Pages/Vault/ViewPage.xaml.cs          |  4 +-
 src/App/Resources/AppResources.Designer.cs    | 54 +++++++------------
 src/App/Resources/AppResources.resx           | 22 +++-----
 11 files changed, 39 insertions(+), 69 deletions(-)

diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
index e7ac7ab5d..e49b8aea2 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -80,7 +80,7 @@
             VerticalOptions="Center"
             StyleClass="list-title-icon"
             Margin="5, 0, 0, 0"
-            Text="&#xf1b2;"
+            Text="&#xf1e0;"
             IsVisible="{Binding Cipher.Shared, Mode=OneTime}"
             AutomationProperties.IsInAccessibleTree="True"
             AutomationProperties.Name="{u:I18n Shared}" />
diff --git a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs
index d49ab0971..44c1b6774 100644
--- a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml.cs
@@ -103,7 +103,7 @@ namespace Bit.App.Pages
             {
                 await Navigation.PushModalAsync(new NavigationPage(new ExportVaultPage()));
             }
-            else if (item.Name == AppResources.LearnOrg)
+            else if (item.Name == AppResources.ShareVault)
             {
                 await _vm.ShareAsync();
             }
diff --git a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
index 02de4daae..958e2bd91 100644
--- a/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPageViewModel.cs
@@ -150,8 +150,8 @@ namespace Bit.App.Pages
 
         public async Task ShareAsync()
         {
-            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.LearnOrgConfirmation,
-               AppResources.LearnOrg, AppResources.Yes, AppResources.Cancel);
+            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.ShareVaultConfirmation,
+                AppResources.ShareVault, AppResources.Yes, AppResources.Cancel);
             if (confirmed)
             {
                 _platformUtilsService.LaunchUri("https://help.bitwarden.com/article/what-is-an-organization/");
@@ -387,13 +387,13 @@ namespace Bit.App.Pages
             {
                 new SettingsPageListItem { Name = AppResources.ImportItems },
                 new SettingsPageListItem { Name = AppResources.ExportVault },
+                new SettingsPageListItem { Name = AppResources.ShareVault },
                 new SettingsPageListItem { Name = AppResources.WebVault }
             };
             var otherItems = new List<SettingsPageListItem>
             {
                 new SettingsPageListItem { Name = AppResources.Options },
                 new SettingsPageListItem { Name = AppResources.About },
-                new SettingsPageListItem { Name = AppResources.LearnOrg },
                 new SettingsPageListItem { Name = AppResources.HelpAndFeedback },
                 new SettingsPageListItem { Name = AppResources.RateTheApp }
             };
diff --git a/src/App/Pages/Vault/AddEditPage.xaml b/src/App/Pages/Vault/AddEditPage.xaml
index e0d5782f1..cfc246f08 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -30,7 +30,7 @@
                          x:Name="_collectionsItem"
                          Clicked="Collections_Clicked"
                          Order="Secondary" />
-            <ToolbarItem Text="{u:I18n MoveToOrganization}"
+            <ToolbarItem Text="{u:I18n Share}"
                          x:Key="shareItem"
                          x:Name="_shareItem"
                          Clicked="Share_Clicked"
diff --git a/src/App/Pages/Vault/AddEditPage.xaml.cs b/src/App/Pages/Vault/AddEditPage.xaml.cs
index bf05ccc56..f8c7b53ac 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml.cs
+++ b/src/App/Pages/Vault/AddEditPage.xaml.cs
@@ -272,7 +272,7 @@ namespace Bit.App.Pages
             var options = new List<string> { AppResources.Attachments };
             if (_vm.EditMode)
             {
-                options.Add(_vm.Cipher.OrganizationId == null ? AppResources.MoveToOrganization : AppResources.Collections);
+                options.Add(_vm.Cipher.OrganizationId == null ? AppResources.Share : AppResources.Collections);
             }
             var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel,
                 (_vm.EditMode && !_vm.CloneMode) ? AppResources.Delete : null, options.ToArray());
@@ -293,7 +293,7 @@ namespace Bit.App.Pages
                 var page = new CollectionsPage(_vm.CipherId);
                 await Navigation.PushModalAsync(new Xamarin.Forms.NavigationPage(page));
             }
-            else if (selection == AppResources.MoveToOrganization)
+            else if (selection == AppResources.Share)
             {
                 var page = new SharePage(_vm.CipherId);
                 await Navigation.PushModalAsync(new Xamarin.Forms.NavigationPage(page));
diff --git a/src/App/Pages/Vault/SharePage.xaml b/src/App/Pages/Vault/SharePage.xaml
index 3c9486db3..ad84a2a7b 100644
--- a/src/App/Pages/Vault/SharePage.xaml
+++ b/src/App/Pages/Vault/SharePage.xaml
@@ -15,7 +15,7 @@
 
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-        <ToolbarItem Text="{u:I18n Move}" Clicked="Save_Clicked" />
+        <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>
@@ -46,7 +46,7 @@
                         StyleClass="box-value" />
                 </StackLayout>
                 <Label
-                    Text="{u:I18n MoveToOrgDesc}"
+                    Text="{u:I18n ShareDesc}"
                     StyleClass="box-footer-label" />
             </StackLayout>
             <StackLayout StyleClass="box"
diff --git a/src/App/Pages/Vault/SharePageViewModel.cs b/src/App/Pages/Vault/SharePageViewModel.cs
index 1f37f088a..33c1852ae 100644
--- a/src/App/Pages/Vault/SharePageViewModel.cs
+++ b/src/App/Pages/Vault/SharePageViewModel.cs
@@ -33,7 +33,7 @@ namespace Bit.App.Pages
             _collectionService = ServiceContainer.Resolve<ICollectionService>("collectionService");
             Collections = new ExtendedObservableCollection<CollectionViewModel>();
             OrganizationOptions = new List<KeyValuePair<string, string>>();
-            PageTitle = AppResources.MoveToOrganization;
+            PageTitle = AppResources.Share;
         }
 
         public string CipherId { get; set; }
@@ -109,9 +109,7 @@ namespace Bit.App.Pages
                 await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
                 await _cipherService.ShareWithServerAsync(cipherView, OrganizationId, checkedCollectionIds);
                 await _deviceActionService.HideLoadingAsync();
-                var movedItemToOrgText = string.Format(AppResources.MovedItemToOrg, cipherView.Name,
-                   (await _userService.GetOrganizationAsync(OrganizationId)).Name);
-                _platformUtilsService.ShowToast("success", null, movedItemToOrgText);
+                _platformUtilsService.ShowToast("success", null, AppResources.ItemShared);
                 await Page.Navigation.PopModalAsync();
                 return true;
             }
diff --git a/src/App/Pages/Vault/ViewPage.xaml b/src/App/Pages/Vault/ViewPage.xaml
index b04dd2108..8a4e0c16d 100644
--- a/src/App/Pages/Vault/ViewPage.xaml
+++ b/src/App/Pages/Vault/ViewPage.xaml
@@ -25,7 +25,7 @@
                      x:Name="_collectionsItem"
                      Clicked="Collections_Clicked"
                      Order="Secondary" />
-            <ToolbarItem Text="{u:I18n MoveToOrganization}"
+            <ToolbarItem Text="{u:I18n Share}"
                      x:Key="shareItem"
                      x:Name="_shareItem"
                      Clicked="Share_Clicked"
diff --git a/src/App/Pages/Vault/ViewPage.xaml.cs b/src/App/Pages/Vault/ViewPage.xaml.cs
index 22e574e36..36fe4715b 100644
--- a/src/App/Pages/Vault/ViewPage.xaml.cs
+++ b/src/App/Pages/Vault/ViewPage.xaml.cs
@@ -220,7 +220,7 @@ namespace Bit.App.Pages
             if (_vm.Cipher.OrganizationId == null)
             {
                 options.Add(AppResources.Clone);
-                options.Add(AppResources.MoveToOrganization);
+                options.Add(AppResources.Share);
             }
             else
             {
@@ -252,7 +252,7 @@ namespace Bit.App.Pages
                 var page = new CollectionsPage(_vm.CipherId);
                 await Navigation.PushModalAsync(new NavigationPage(page));
             }
-            else if (selection == AppResources.MoveToOrganization)
+            else if (selection == AppResources.Share)
             {
                 var page = new SharePage(_vm.CipherId);
                 await Navigation.PushModalAsync(new NavigationPage(page));
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 3b174ae04..f1b1ebeb0 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -10,7 +9,6 @@
 
 namespace Bit.App.Resources {
     using System;
-    using System.Reflection;
     
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
@@ -365,12 +363,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string Move {
-            get {
-                return ResourceManager.GetString("Move", resourceCulture);
-            }
-        }
-        
         public static string Saving {
             get {
                 return ResourceManager.GetString("Saving", resourceCulture);
@@ -1265,9 +1257,9 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string LearnOrg {
+        public static string ShareVault {
             get {
-                return ResourceManager.GetString("LearnOrg", resourceCulture);
+                return ResourceManager.GetString("ShareVault", resourceCulture);
             }
         }
         
@@ -2405,12 +2397,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string MovedItemToOrg {
-            get {
-                return ResourceManager.GetString("MovedItemToOrg", resourceCulture);
-            }
-        }
-        
         public static string ItemShared {
             get {
                 return ResourceManager.GetString("ItemShared", resourceCulture);
@@ -2435,21 +2421,15 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string MoveToOrganization {
-            get {
-                return ResourceManager.GetString("MoveToOrganization", resourceCulture);
-            }
-        }
-        
         public static string NoOrgsToList {
             get {
                 return ResourceManager.GetString("NoOrgsToList", resourceCulture);
             }
         }
         
-        public static string MoveToOrgDesc {
+        public static string ShareDesc {
             get {
-                return ResourceManager.GetString("MoveToOrgDesc", resourceCulture);
+                return ResourceManager.GetString("ShareDesc", resourceCulture);
             }
         }
         
@@ -2501,9 +2481,9 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string LearnOrgConfirmation {
+        public static string ShareVaultConfirmation {
             get {
-                return ResourceManager.GetString("LearnOrgConfirmation", resourceCulture);
+                return ResourceManager.GetString("ShareVaultConfirmation", resourceCulture);
             }
         }
         
@@ -3532,21 +3512,23 @@ namespace Bit.App.Resources {
                 return ResourceManager.GetString("SendFileEmailVerificationRequired", resourceCulture);
             }
         }
-        
-        public static string PasswordPrompt {
-            get {
+        public static string PasswordPrompt
+        {
+            get
+            {
                 return ResourceManager.GetString("PasswordPrompt", resourceCulture);
             }
         }
-        
-        public static string PasswordConfirmation {
-            get {
+        public static string PasswordConfirmation
+        {
+            get
+            {
                 return ResourceManager.GetString("PasswordConfirmation", resourceCulture);
             }
-        }
-        
-        public static string PasswordConfirmationDesc {
-            get {
+        }public static string PasswordConfirmationDesc
+        {
+            get
+            {
                 return ResourceManager.GetString("PasswordConfirmationDesc", resourceCulture);
             }
         }
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 0966ab8a3..066f314d0 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -310,9 +310,6 @@
     <value>Save</value>
     <comment>Button text for a save operation (verb).</comment>
   </data>
-  <data name="Move" xml:space="preserve">
-    <value>Move</value>
-  </data>
   <data name="Saving" xml:space="preserve">
     <value>Saving...</value>
     <comment>Message shown when interacting with the server</comment>
@@ -785,8 +782,8 @@
   <data name="BitwardenAutofillServiceSearch" xml:space="preserve">
     <value>You are searching for an auto-fill item for "{0}".</value>
   </data>
-  <data name="LearnOrg" xml:space="preserve">
-    <value>Learn About Organizations</value>
+  <data name="ShareVault" xml:space="preserve">
+    <value>Share Your Vault</value>
   </data>
   <data name="CannotOpenApp" xml:space="preserve">
     <value>Cannot open the app "{0}".</value>
@@ -1381,10 +1378,6 @@
   <data name="NoCollectionsToList" xml:space="preserve">
     <value>There are no collections to list.</value>
   </data>
-  <data name="MovedItemToOrg" xml:space="preserve">
-    <value>{0} moved to {1}.</value>
-    <comment>ex: Item moved to Organization.</comment>
-  </data>
   <data name="ItemShared" xml:space="preserve">
     <value>Item has been shared.</value>
   </data>
@@ -1397,14 +1390,11 @@
   <data name="ShareItem" xml:space="preserve">
     <value>Share Item</value>
   </data>
-  <data name="MoveToOrganization" xml:space="preserve">
-    <value>Move to Organization</value>
-  </data>
   <data name="NoOrgsToList" xml:space="preserve">
     <value>No organizations to list.</value>
   </data>
-  <data name="MoveToOrgDesc" xml:space="preserve">
-    <value>Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved.</value>
+  <data name="ShareDesc" xml:space="preserve">
+    <value>Choose an organization that you wish to share this item with. Sharing transfers ownership of the item to the organization. You will no longer be the direct owner of this item once it has been shared.</value>
   </data>
   <data name="NumberOfWords" xml:space="preserve">
     <value>Number of Words</value>
@@ -1434,8 +1424,8 @@
     <value>Your account's fingerprint phrase</value>
     <comment>A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing.</comment>
   </data>
-  <data name="LearnOrgConfirmation" xml:space="preserve">
-    <value>Bitwarden allows you to share your vault items with others by using an organization account. Would you like to visit the bitwarden.com website to learn more?</value>
+  <data name="ShareVaultConfirmation" xml:space="preserve">
+    <value>Bitwarden allows you to share your vault with others by using an organization account. Would you like to visit the bitwarden.com website to learn more?</value>
   </data>
   <data name="ExportVault" xml:space="preserve">
     <value>Export Vault</value>