dongge
/
AndroidCatVodSpider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update API.java

This commit is contained in:
FongMi 2023-03-11 02:50:01 +08:00
parent f701cd06c5
commit 2b19da2c07
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/github/catvod/ali/API.java
View File

@ -115,14 +115,18 @@ public class API {
} }
private String auth(String url, String json, boolean retry) { private String auth(String url, String json, boolean retry) {
return auth(url, json, getHeaderAuth(), retry); url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
String result = OkHttp.postJson(url, json, getHeaderAuth());
Log.e("auth", result);
if (retry && checkAuth(result)) return auth(url, json, false);
return result;
} }
private String auth(String url, String json, Map<String, String> header, boolean retry) { private String oauth(String url, String json, boolean retry) {
url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url; url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
String result = OkHttp.postJson(url, json, header); String result = OkHttp.postJson(url, json, getHeaderOpen());
Log.e("auth", result); Log.e("oauth", result);
if (retry && check401(result)) return auth(url, json, header, false); if (retry && checkOpen(result)) return oauth(url, json, false);
return result; return result;
} }
@ -130,14 +134,22 @@ public class API {
url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url; url = url.startsWith("https") ? url : "https://api.aliyundrive.com/" + url;
String result = OkHttp.postJson(url, json, getHeaderSign()); String result = OkHttp.postJson(url, json, getHeaderSign());
Log.e("sign", result); Log.e("sign", result);
if (retry && check401(result)) return sign(url, json, false); if (retry && checkSign(result)) return sign(url, json, false);
return result; return result;
} }
private boolean check401(String result) { private boolean checkAuth(String result) {
if (result.contains("3 parts")) return refreshOpenToken();
if (result.contains("AccessTokenInvalid")) return refreshAccessToken(); if (result.contains("AccessTokenInvalid")) return refreshAccessToken();
if (result.contains("ShareLinkTokenInvalid") || result.contains("InvalidParameterNotMatch")) return refreshShareToken(); if (result.contains("ShareLinkTokenInvalid") || result.contains("InvalidParameterNotMatch")) return refreshShareToken();
return false;
}
private boolean checkOpen(String result) {
if (result.contains("AccessTokenInvalid")) return refreshOpenToken();
return false;
}
private boolean checkSign(String result) {
if (result.contains("UserDeviceOffline") || result.contains("UserDeviceIllegality") || result.contains("DeviceSessionSignatureInvalid")) return refreshSignature(); if (result.contains("UserDeviceOffline") || result.contains("UserDeviceIllegality") || result.contains("DeviceSessionSignatureInvalid")) return refreshSignature();
return false; return false;
} }
@ -370,7 +382,7 @@ public class API {
JSONObject body = new JSONObject(); JSONObject body = new JSONObject();
body.put("file_id", fileId); body.put("file_id", fileId);
body.put("drive_id", auth.getDriveId()); body.put("drive_id", auth.getDriveId());
String url = new JSONObject(auth("https://open.aliyundrive.com/adrive/v1.0/openFile/getDownloadUrl", body.toString(), getHeaderOpen(), true)).getString("url"); String url = new JSONObject(oauth("https://open.aliyundrive.com/adrive/v1.0/openFile/getDownloadUrl", body.toString(), true)).getString("url");
Init.execute(() -> delete(fileId)); Init.execute(() -> delete(fileId));
return url; return url;
} }