From: masensio <masensio@solidgear.es>
Date: Fri, 14 Feb 2014 11:38:38 +0000 (+0100)
Subject: OC-2966: Change name of the action from 'Share' to 'Send'
X-Git-Tag: oc-android-1.5.5~22^2~28
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/42834b213ae0ddc35b57d5aa79ffd24afde5a5da?ds=inline

OC-2966: Change name of the action from 'Share' to 'Send'
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cc884335..601a703d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -251,4 +251,6 @@
 	<string name="share_link_file_no_exist">Unable to share this file or folder. Please, make sure it exists</string>
 	<string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
 	<string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder</string>
+	
+	<string name="send_file_title_intent">Send</string>
 </resources>
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index ad4d2bc5..d0f62aed 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -222,7 +222,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
             toHide.add(R.id.action_cancel_upload);
             toHide.add(R.id.action_sync_file);
             toHide.add(R.id.action_see_details);
-            toHide.add(R.id.action_share_file);
+            toHide.add(R.id.action_send_file);
             if (    mContainerActivity.getFileDownloaderBinder().isDownloading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile) ||
                     mContainerActivity.getFileUploaderBinder().isUploading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile)           ) {
                 toDisable.add(R.id.action_rename_file);
@@ -355,8 +355,8 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
                 Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
                 // set MimeType
                 sharingIntent.setType(mTargetFile.getMimetype());
-                sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+mTargetFile.getStoragePath()));
-                startActivity(Intent.createChooser(sharingIntent, "Share via")); 
+                sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + mTargetFile.getStoragePath()));
+                startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.send_file_title_intent))); 
                 return true;
             }
             default:
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index dcf5ea18..84cdcc6b 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -266,7 +266,7 @@ public class PreviewImageFragment extends FileFragment implements   OnRemoteOper
                 return true;
             }
             case R.id.action_send_file: {
-                shareFile();
+                sendFile();
                 return true;
             }
             
@@ -275,12 +275,12 @@ public class PreviewImageFragment extends FileFragment implements   OnRemoteOper
         }
     }
     
-    private void shareFile(){
+    private void sendFile(){
         Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
         // set MimeType
         sharingIntent.setType(getFile().getMimetype());
         sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+getFile().getStoragePath()));
-        startActivity(Intent.createChooser(sharingIntent, "Share via"));
+        startActivity(Intent.createChooser(sharingIntent, getResources().getString(R.string.send_file_title_intent)));
     }