projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes from comments in PR
[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
..
01059c9
100644
(file)
--- a/
src/com/owncloud/android/operations/CreateShareOperation.java
+++ b/
src/com/owncloud/android/operations/CreateShareOperation.java
@@
-1,5
+1,8
@@
-/* ownCloud Android client application
- * Copyright (C) 2014 ownCloud Inc.
+/**
+ * ownCloud Android client application
+ *
+ * @author masensio
+ * Copyright (C) 2015 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
@@
-19,9
+22,6
@@
package com.owncloud.android.operations;
/**
* Creates a new share from a given file
/**
* Creates a new share from a given file
- *
- * @author masensio
- *
*/
import android.content.Context;
*/
import android.content.Context;
@@
-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);