Skip to content

chore(deps): nextcloud sdk to 1.5.0 #2880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2019
Merged

chore(deps): nextcloud sdk to 1.5.0 #2880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions app/src/main/java/org/fossasia/phimpme/share/SharingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.resources.files.FileUtils;
import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation;
import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation;
import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;
import com.pinterest.android.pdk.PDKCallback;
import com.pinterest.android.pdk.PDKClient;
import com.pinterest.android.pdk.PDKException;
Expand Down Expand Up @@ -1362,8 +1362,8 @@ void shareToNextCloudAndOwnCloud(String str) {
Long timeStampLong = fileToUpload.lastModified() / 1000;
String timeStamp = timeStampLong.toString();

UploadRemoteFileOperation uploadOperation =
new UploadRemoteFileOperation(
UploadFileRemoteOperation uploadOperation =
new UploadFileRemoteOperation(
fileToUpload.getAbsolutePath(), remotePath, mimeType, timeStamp);
uploadOperation.execute(mClient, this, mHandler);
phimpmeProgressBarHandler.show();
Expand All @@ -1380,6 +1380,7 @@ void shareToNextCloudAndOwnCloud(String str) {

@Override
protected void onActivityResult(int requestCode, int responseCode, Intent data) {
super.onActivityResult(requestCode, responseCode, data);
if (requestCode == REQ_SELECT_PHOTO) {
if (responseCode == RESULT_OK) {
NotificationHandler.actionPassed(R.string.upload_complete);
Expand Down Expand Up @@ -1423,8 +1424,8 @@ public void onResume() {
}

private void startRefresh() {
ReadRemoteFolderOperation refreshOperation =
new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
ReadFileRemoteOperation refreshOperation =
new ReadFileRemoteOperation(FileUtils.PATH_SEPARATOR);
refreshOperation.execute(mClient, this, mHandler);
}

Expand Down Expand Up @@ -1452,7 +1453,7 @@ public void onClick(View v) {
SnackBarHandler.create(
parent, getString(R.string.todo_operation_finished_in_success), Snackbar.LENGTH_LONG)
.show();
} else if (operation instanceof UploadRemoteFileOperation) {
} else if (operation instanceof UploadFileRemoteOperation) {
onSuccessfulUpload();
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ ext {
twitterVersion = "3.0.0"
stethoVersion = "1.5.0"
showcaseVersion = "5.4.3"
nextCloudVersion = "1.0.21"
nextCloudVersion = "1.5.0"
}