Skip to content

Commit 029447e

Browse files
committed
add default permissions
Signed-off-by: alperozturk <[email protected]>
1 parent 35de859 commit 029447e

File tree

3 files changed

+29
-2
lines changed

3 files changed

+29
-2
lines changed

app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ public Capabilities deserialize(JsonElement json, Type typeOfT, JsonDeserializat
7575
final var enforced = password.getAsJsonPrimitive("enforced");
7676
final var askForOptionalPassword = password.getAsJsonPrimitive("askForOptionalPassword");
7777
final var isReSharingAllowed = filesSharing.getAsJsonPrimitive("resharing");
78+
final var defaultPermission = filesSharing.getAsJsonPrimitive("default_permissions");
7879

80+
response.setDefaultPermission(defaultPermission.getAsInt());
7981
response.setPublicPasswordEnforced(enforced.getAsBoolean());
8082
response.setAskForOptionalPassword(askForOptionalPassword.getAsBoolean());
8183
response.setReSharingAllowed(isReSharingAllowed.getAsBoolean());

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,16 @@ public void shareFileViaPublicShare(@Nullable Note note, @Nullable String passwo
701701
}
702702

703703
executorService.submit(() -> {
704-
final var result = repository.addShare(note, ShareType.PUBLIC_LINK, "", "false", password, 0, "");
704+
final var result = repository.addShare(
705+
note,
706+
ShareType.PUBLIC_LINK,
707+
"",
708+
"false",
709+
password,
710+
repository.capabilities().getDefaultPermission(),
711+
""
712+
);
713+
705714
runOnUiThread(() -> {
706715
if (result != null) {
707716
NoteShareActivity.this.recreate();
@@ -721,7 +730,14 @@ public void setPasswordToShare(@NotNull OCShare share, @Nullable String password
721730
}
722731

723732
executorService.submit(() -> {{
724-
final var requestBody = repository.getUpdateShareRequest(false, share,"", password,false,-1,0);
733+
final var requestBody = repository.getUpdateShareRequest(false,
734+
share,
735+
"",
736+
password,
737+
false,
738+
-1,
739+
repository.capabilities().getDefaultPermission()
740+
);
725741
final var success = repository.updateShare(share.getId(), requestBody);
726742

727743
runOnUiThread(() -> {

app/src/main/java/it/niedermann/owncloud/notes/shared/model/Capabilities.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class Capabilities implements Serializable {
4242
private boolean publicPasswordEnforced;
4343
private boolean askForOptionalPassword;
4444
private boolean isReSharingAllowed;
45+
private int defaultPermission;
4546

4647
public boolean isReSharingAllowed() {
4748
return isReSharingAllowed;
@@ -59,6 +60,14 @@ public void setPublicPasswordEnforced(boolean value) {
5960
this.publicPasswordEnforced = value;
6061
}
6162

63+
public int getDefaultPermission() {
64+
return defaultPermission;
65+
}
66+
67+
public void setDefaultPermission(int value) {
68+
this.defaultPermission = value;
69+
}
70+
6271
public boolean getAskForOptionalPassword() {
6372
return askForOptionalPassword;
6473
}

0 commit comments

Comments
 (0)