Quotes updated in subject message for shared link, better format string
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 3 Feb 2015 12:17:14 +0000 (13:17 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 3 Feb 2015 12:17:14 +0000 (13:17 +0100)
res/values/strings.xml
src/com/owncloud/android/operations/CreateShareOperation.java

index 914681b..296a8e0 100644 (file)
        <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
     <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
 
        <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
     <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
 
-       <string name="shared_subject_header">shared</string>
-       <string name="with_you_subject_header">with you</string>
-       <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
+       <string name="subject_token">%1$s shared \"%2$s\" with you</string>
 
 </resources>
 
 </resources>
index fc44f53..6d9a253 100644 (file)
@@ -134,8 +134,7 @@ public class CreateShareOperation extends SyncOperation {
         if (file!=null) {
             mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink());
             mSendIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(mContext.getString(R.string.subject_token),
         if (file!=null) {
             mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink());
             mSendIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(mContext.getString(R.string.subject_token),
-                    getClient().getCredentials().getUsername(), mContext.getString(R.string.shared_subject_header),
-                    file.getFileName(), mContext.getString(R.string.with_you_subject_header)));
+                    getClient().getCredentials().getUsername(), file.getFileName()));
             file.setPublicLink(share.getShareLink());
             file.setShareByLink(true);
             getStorageManager().saveFile(file);
             file.setPublicLink(share.getShareLink());
             file.setShareByLink(true);
             getStorageManager().saveFile(file);