flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Switch to v2.php

Browse Source
This commit is contained in:
davigonz 2018-08-01 12:53:56 +02:00
parent 7bed924ff8
commit d4908e4172
6 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
View File

@ -74,8 +74,8 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation {
@Override
protected RemoteOperationResult run(OwnCloudClient client) {
RemoteOperationResult result = null;
int status = -1;
RemoteOperationResult result;
int status;
GetMethod get = null;
@ -132,5 +132,4 @@ public class GetRemoteSharesForFileOperation extends RemoteOperation {
private boolean isSuccess(int status) {
return (status == HttpStatus.SC_OK);
}
}
}

5
src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
View File

@ -1,6 +1,7 @@
/* ownCloud Android Library is available under MIT license
* @author David A. Velasco
* Copyright (C) 2016 ownCloud GmbH.
* @author David González Verdugo
* Copyright (C) 2018 ownCloud GmbH.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -70,7 +71,7 @@ public class ShareToRemoteOperationResultParser {
return new RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE);
}
RemoteOperationResult result = null;
RemoteOperationResult result;
ArrayList<Object> resultData = new ArrayList<Object>();
try {

8
src/com/owncloud/android/lib/resources/shares/ShareUtils.java
View File

@ -1,5 +1,5 @@
/* ownCloud Android Library is available under MIT license
* Copyright (C) 2016 ownCloud GmbH.
* Copyright (C) 2018 ownCloud GmbH.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -30,13 +30,14 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
* Contains Constants for Share Operation
*
* @author masensio
* @author David González Verdugo
*
*/
public class ShareUtils {
// OCS Route
public static final String SHARING_API_PATH ="ocs/v1.php/apps/files_sharing/api/v1/shares";
public static final String SHARING_API_PATH ="ocs/v2.php/apps/files_sharing/api/v1/shares";
// String to build the link with the token of a share:
public static final String SHARING_LINK_PATH_BEFORE_VERSION_8 = "/public.php?service=files&t=";
@ -49,5 +50,4 @@ public class ShareUtils {
return SHARING_LINK_PATH_BEFORE_VERSION_8;
}
}
}
}

13
src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
View File

@ -1,5 +1,5 @@
/* ownCloud Android Library is available under MIT license
* Copyright (C) 2016 ownCloud GmbH.
* Copyright (C) 2018 ownCloud GmbH.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -41,7 +41,7 @@ import com.owncloud.android.lib.resources.files.FileUtils;
/**
* Parser for Share API Response
* @author masensio
*
* @author David González Verdugo
*/
public class ShareXMLParser {
@ -82,7 +82,7 @@ public class ShareXMLParser {
private static final String TYPE_FOLDER = "folder";
private static final int SUCCESS = 100;
private static final int SUCCESS = 200;
private static final int ERROR_WRONG_PARAMETER = 400;
private static final int ERROR_FORBIDDEN = 403;
private static final int ERROR_NOT_FOUND = 404;
@ -172,7 +172,7 @@ public class ShareXMLParser {
*/
private ArrayList<OCShare> readOCS (XmlPullParser parser) throws XmlPullParserException,
IOException {
ArrayList<OCShare> shares = new ArrayList<OCShare>();
ArrayList<OCShare> shares = new ArrayList<>();
parser.require(XmlPullParser.START_TAG, ns , NODE_OCS);
while (parser.next() != XmlPullParser.END_TAG) {
if (parser.getEventType() != XmlPullParser.START_TAG) {
@ -190,8 +190,6 @@ public class ShareXMLParser {
}
return shares;
}
/**
@ -439,5 +437,4 @@ public class ShareXMLParser {
}
}
}
}
}

2
src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
View File

@ -50,7 +50,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
// OCS Routes
private static final String OCS_ROUTE = "ocs/v1.php/cloud/capabilities";
private static final String OCS_ROUTE = "ocs/v2.php/cloud/capabilities";
// Arguments - names
private static final String PARAM_FORMAT = "format";

5
src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java
View File

@ -48,7 +48,7 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
private static final String TAG = GetRemoteUserInfoOperation.class.getSimpleName();
// OCS Route
private static final String OCS_ROUTE = "/ocs/v1.php/cloud/user?format=json";
private static final String OCS_ROUTE = "/ocs/v2.php/cloud/user?format=json";
// JSON Node names
private static final String NODE_OCS = "ocs";
@ -125,5 +125,4 @@ public class GetRemoteUserInfoOperation extends RemoteOperation {
public String mDisplayName = "";
public String mEmail = "";
}
}
}