Skip to content

Commit

Permalink
Merge branch 'Allow_List_Shared_Folders' into 'master'
Browse files Browse the repository at this point in the history
chore(project): Add support for shared folders

See merge request android/pcloud-sdk-java!15
  • Loading branch information
Georgi Neykov committed Dec 5, 2023
2 parents 1f6c986 + db5244b commit 7dcbbcb
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 13 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Changelog
=========

Version 1.9.1 (04.12.2023)
--------------------------

- Start returning shared folders from `ApiClient.listFolder(String)` and `ApiClient.loadFolder()` methods.
- Add the option to select from the download URL variants provided by a `FileLink` when using the `ApiClient.download()`
methods that accept a `FileLink`.
- All methods in `RemoteData` will now also throw `ApiError` which was previously wrapped in an `IOException`.
- Add additional methods in `FileLink` that allow starting a download by specifying the download URL variant to be used.


Version 1.9.0 (06.12.2022)
--------------------------

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The official pCloud SDK for Java & Android for integrating with [ pCloud's API][docs].

[![Maven Central](https://img.shields.io/maven-central/v/com.pcloud.sdk/java-core/1.9.0?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.pcloud.sdk%22)
[![Maven Central](https://img.shields.io/maven-central/v/com.pcloud.sdk/java-core/1.9.1?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.pcloud.sdk%22)

## Requirements

Expand Down Expand Up @@ -53,15 +53,15 @@ Grab via Maven:
<dependency>
<groupId>com.pcloud.sdk</groupId>
<artifactId>java-core</artifactId>
<version>1.9.0</version>
<version>1.9.1</version>
<type>pom</type>
</dependency>
```
or Gradle:
```groovy
implementation 'com.pcloud.sdk:java-core:1.9.0'
implementation 'com.pcloud.sdk:java-core:1.9.1'
```
[![Maven Central](https://img.shields.io/maven-central/v/com.pcloud.sdk/java-core/1.9.0?label=Maven%20Central)](https://search.maven.org/artifact/com.pcloud.sdk/java-core/1.7.0/jar)
[![Maven Central](https://img.shields.io/maven-central/v/com.pcloud.sdk/java-core/1.9.1?label=Maven%20Central)](https://search.maven.org/artifact/com.pcloud.sdk/java-core/1.7.0/jar)

#### Android

Expand All @@ -76,15 +76,15 @@ Grab via Maven:
<dependency>
<groupId>com.pcloud.sdk</groupId>
<artifactId>android</artifactId>
<version>1.9.0</version>
<version>1.9.1</version>
<type>pom</type>
</dependency>
```
or Gradle:
```groovy
implementation 'com.pcloud.sdk:android:1.9.0'
implementation 'com.pcloud.sdk:android:1.9.1'
```
[![Maven Central](https://img.shields.io/maven-central/v/com.pcloud.sdk/java-core/1.9.0?label=Maven%20Central)](https://search.maven.org/artifact/com.pcloud.sdk/android/1.7.0/jar)
[![Maven Central](https://img.shields.io/maven-central/v/com.pcloud.sdk/java-core/1.9.1?label=Maven%20Central)](https://search.maven.org/artifact/com.pcloud.sdk/android/1.7.0/jar)


## Basics
Expand Down
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ allprojects {
}
}
}

tasks.withType(Javadoc).configureEach {
options.addStringOption('Xdoclint:none', '-quiet')
}
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,7 @@ public Call<RemoteFolder> listFolder(String path, boolean recursively) {
requireValidPath(path);
HttpUrl.Builder urlBuilder = apiHost.newBuilder()
.addPathSegment("listfolder")
.addEncodedQueryParameter("path", path)
.addQueryParameter("noshares", String.valueOf(1));
.addEncodedQueryParameter("path", path);
if (recursively) {
urlBuilder.addEncodedQueryParameter("recursive", String.valueOf(1));
}
Expand Down Expand Up @@ -721,7 +720,6 @@ public Call<RemoteFolder> loadFolder(long folderId) {
HttpUrl.Builder urlBuilder = apiHost.newBuilder()
.addPathSegment("listfolder")
.addQueryParameter("folderid", String.valueOf(folderId))
.addQueryParameter("noshares", String.valueOf(1))
.addQueryParameter("nofiles", String.valueOf(1));


Expand All @@ -739,7 +737,6 @@ public Call<RemoteFolder> loadFolder(String path) {
HttpUrl.Builder urlBuilder = apiHost.newBuilder()
.addPathSegment("listfolder")
.addQueryParameter("path", path)
.addQueryParameter("noshares", String.valueOf(1))
.addQueryParameter("nofiles", String.valueOf(1));

Request request = newRequest()
Expand Down
4 changes: 2 additions & 2 deletions publishing.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ext {
isCi = "true" == System.getenv('CI')

versionName = "1.9.0"
versionCode = 12
versionName = "1.9.1"
versionCode = 13
groupId = "com.pcloud.sdk"
}

Expand Down

0 comments on commit 7dcbbcb

Please sign in to comment.