projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d89488e
)
Let server decide default permissions for new share
author
David A. Velasco
<dvelasco@solidgear.es>
Thu, 29 Oct 2015 15:34:12 +0000
(16:34 +0100)
committer
David A. Velasco
<dvelasco@solidgear.es>
Fri, 30 Oct 2015 15:56:40 +0000
(16:56 +0100)
src/com/owncloud/android/operations/CreateShareViaLinkOperation.java
patch
|
blob
|
blame
|
history
src/com/owncloud/android/operations/CreateShareWithShareeOperation.java
patch
|
blob
|
blame
|
history
diff --git
a/src/com/owncloud/android/operations/CreateShareViaLinkOperation.java
b/src/com/owncloud/android/operations/CreateShareViaLinkOperation.java
index
10af272
..
373c57d
100644
(file)
--- a/
src/com/owncloud/android/operations/CreateShareViaLinkOperation.java
+++ b/
src/com/owncloud/android/operations/CreateShareViaLinkOperation.java
@@
-44,8
+44,6
@@
import com.owncloud.android.operations.common.SyncOperation;
public class CreateShareViaLinkOperation extends SyncOperation {
public class CreateShareViaLinkOperation extends SyncOperation {
- private static final int READ_ONLY = 1;
-
protected FileDataStorageManager mStorageManager;
private String mPath;
protected FileDataStorageManager mStorageManager;
private String mPath;
@@
-87,7
+85,7
@@
public class CreateShareViaLinkOperation extends SyncOperation {
"",
false,
mPassword,
"",
false,
mPassword,
- READ_ONLY
+ OCShare.DEFAULT_PERMISSION
);
result = operation.execute(client);
}
);
result = operation.execute(client);
}
@@
-144,8
+142,7
@@
public class CreateShareViaLinkOperation extends SyncOperation {
} else {
share.setIsFolder(false);
}
} else {
share.setIsFolder(false);
}
- share.setPermissions(READ_ONLY);
-
+
getStorageManager().saveShare(share);
// Update OCFile with data from share: ShareByLink and publicLink
getStorageManager().saveShare(share);
// Update OCFile with data from share: ShareByLink and publicLink
diff --git
a/src/com/owncloud/android/operations/CreateShareWithShareeOperation.java
b/src/com/owncloud/android/operations/CreateShareWithShareeOperation.java
index
9b71695
..
b19d6c2
100644
(file)
--- a/
src/com/owncloud/android/operations/CreateShareWithShareeOperation.java
+++ b/
src/com/owncloud/android/operations/CreateShareWithShareeOperation.java
@@
-38,9
+38,6
@@
import com.owncloud.android.operations.common.SyncOperation;
public class CreateShareWithShareeOperation extends SyncOperation {
public class CreateShareWithShareeOperation extends SyncOperation {
- private static final int READ_ONLY = 1;
- private static final int ALL_PRIVILEGES = 31;
-
protected FileDataStorageManager mStorageManager;
private String mPath;
protected FileDataStorageManager mStorageManager;
private String mPath;
@@
-80,7
+77,7
@@
public class CreateShareWithShareeOperation extends SyncOperation {
mShareeName,
false,
"",
mShareeName,
false,
"",
- ALL_PRIVILEGES
+ OCShare.DEFAULT_PERMISSION
);
operation.setGetShareDetails(true);
RemoteOperationResult result = operation.execute(client);
);
operation.setGetShareDetails(true);
RemoteOperationResult result = operation.execute(client);
@@
-104,8
+101,7
@@
public class CreateShareWithShareeOperation extends SyncOperation {
// Update DB with the response
share.setPath(mPath);
share.setIsFolder(mPath.endsWith(FileUtils.PATH_SEPARATOR));
// Update DB with the response
share.setPath(mPath);
share.setIsFolder(mPath.endsWith(FileUtils.PATH_SEPARATOR));
- share.setPermissions(READ_ONLY);
-
+
getStorageManager().saveShare(share);
// Update OCFile with data from share: ShareByLink and publicLink
getStorageManager().saveShare(share);
// Update OCFile with data from share: ShareByLink and publicLink