projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into develop
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
operations
/
CreateShareOperation.java
diff --git
a/src/com/owncloud/android/operations/CreateShareOperation.java
b/src/com/owncloud/android/operations/CreateShareOperation.java
index
fc44f53
..
6d9a253
100644
(file)
--- a/
src/com/owncloud/android/operations/CreateShareOperation.java
+++ b/
src/com/owncloud/android/operations/CreateShareOperation.java
@@
-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);