Bump pcloud sdk to v1.8.1 (latest available in maven)

NOTE: pCloud auth does NOT currently work. The redirect_uri needs
      updating in the Kp2A pCloud app configuration.

See here for more info:
      https://github.com/pCloud/pcloud-sdk-java/issues/33
This commit is contained in:
Rick Brown
2023-07-24 21:01:00 -04:00
parent c16eeff130
commit c9be806b01
7 changed files with 11 additions and 5 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -56,7 +56,7 @@
<ItemGroup> <ItemGroup>
<None Include="Jars\AboutJars.txt" /> <None Include="Jars\AboutJars.txt" />
<None Include="Additions\AboutAdditions.txt" /> <None Include="Additions\AboutAdditions.txt" />
<LibraryProjectZip Include="Jars\pcloud-sdk-android-1.2.0.aar" /> <LibraryProjectZip Include="Jars\pcloud-sdk-android-1.8.1.aar" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<TransformFile Include="Transforms\Metadata.xml" /> <TransformFile Include="Transforms\Metadata.xml" />
@@ -72,6 +72,6 @@
</Target> </Target>
--> -->
<ItemGroup> <ItemGroup>
<EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.2.0.jar" /> <EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.8.1.jar" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -47,8 +47,8 @@ dependencies {
implementation('com.onedrive.sdk:onedrive-sdk-android:1.2.0') { implementation('com.onedrive.sdk:onedrive-sdk-android:1.2.0') {
transitive = false transitive = false
} }
implementation 'com.pcloud.sdk:java-core:1.2.0' implementation 'com.pcloud.sdk:java-core:1.8.1'
implementation 'com.pcloud.sdk:android:1.2.0' implementation 'com.pcloud.sdk:android:1.8.1'
implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.microsoft.services.msa:msa-auth:0.8.6' implementation 'com.microsoft.services.msa:msa-auth:0.8.6'
implementation 'com.microsoft.aad:adal:1.14.0' implementation 'com.microsoft.aad:adal:1.14.0'

View File

@@ -22,6 +22,7 @@ import com.pcloud.sdk.ApiError;
import com.pcloud.sdk.Authenticators; import com.pcloud.sdk.Authenticators;
import com.pcloud.sdk.AuthorizationActivity; import com.pcloud.sdk.AuthorizationActivity;
import com.pcloud.sdk.AuthorizationData; import com.pcloud.sdk.AuthorizationData;
import com.pcloud.sdk.AuthorizationRequest;
import com.pcloud.sdk.AuthorizationResult; import com.pcloud.sdk.AuthorizationResult;
import com.pcloud.sdk.Call; import com.pcloud.sdk.Call;
import com.pcloud.sdk.DataSource; import com.pcloud.sdk.DataSource;
@@ -228,7 +229,12 @@ public class PCloudFileStorage extends JavaFileStorageBase
finishActivityWithSuccess(activity); finishActivityWithSuccess(activity);
} else if (!activity.getState().getBoolean("hasStartedAuth", false)) { } else if (!activity.getState().getBoolean("hasStartedAuth", false)) {
Activity castedActivity = (Activity)activity; Activity castedActivity = (Activity)activity;
Intent authIntent = AuthorizationActivity.createIntent(castedActivity, this.clientId); AuthorizationRequest req = AuthorizationRequest.create()
.setClientId(this.clientId)
.setType(AuthorizationRequest.Type.TOKEN)
.setForceAccessApproval(true)
.build();
Intent authIntent = AuthorizationActivity.createIntent(castedActivity, req);
castedActivity.startActivityForResult(authIntent, PCLOUD_AUTHORIZATION_REQUEST_CODE); castedActivity.startActivityForResult(authIntent, PCLOUD_AUTHORIZATION_REQUEST_CODE);
activity.getState().putBoolean("hasStartedAuth", true); activity.getState().putBoolean("hasStartedAuth", true);
} }