mirror/AntennaPod
3
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-12-01 12:31:45 +00:00
Code Issues Projects Releases Wiki Activity

Include subfolder in GpodnetService URIs (#8110)

Browse Source
This commit is contained in:
jmatthew
2025-11-26 05:55:04 +10:00
committed by GitHub
parent 6726eb3d16
commit 5e6355d514
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/sync/gpoddernet/src/main/java/de/danoeh/antennapod/net/sync/gpoddernet/GpodnetService.java
View File

@ -52,6 +52,7 @@ public class GpodnetService implements ISyncService {
private String baseScheme; private String baseScheme;
private int basePort; private int basePort;
private final String baseHost; private final String baseHost;
private final String baseFolder;
private final String deviceId; private final String deviceId;
private String username; private String username;
private String password; private String password;
@ -69,6 +70,7 @@ public class GpodnetService implements ISyncService {
this.baseHost = hostname.host; this.baseHost = hostname.host;
this.basePort = hostname.port; this.basePort = hostname.port;
this.baseScheme = hostname.scheme; this.baseScheme = hostname.scheme;
this.baseFolder = hostname.subfolder;
} }
private void requireLoggedIn() { private void requireLoggedIn() {
@ -88,7 +90,7 @@ public class GpodnetService implements ISyncService {
requireLoggedIn(); requireLoggedIn();
try { try {
URL url = new URI(baseScheme, null, baseHost, basePort, URL url = new URI(baseScheme, null, baseHost, basePort,
String.format("/api/2/devices/%s.json", username), null, null).toURL(); String.format("%s/api/2/devices/%s.json", baseFolder, username), null, null).toURL();
Request.Builder request = new Request.Builder().url(url); Request.Builder request = new Request.Builder().url(url);
String response = executeRequest(request); String response = executeRequest(request);
JSONArray devicesArray = new JSONArray(response); JSONArray devicesArray = new JSONArray(response);
@ -112,7 +114,7 @@ public class GpodnetService implements ISyncService {
requireLoggedIn(); requireLoggedIn();
try { try {
URL url = new URI(baseScheme, null, baseHost, basePort, URL url = new URI(baseScheme, null, baseHost, basePort,
String.format("/api/2/devices/%s/%s.json", username, deviceId), null, null).toURL(); String.format("%s/api/2/devices/%s/%s.json", baseFolder, username, deviceId), null, null).toURL();
String content; String content;
if (caption != null || type != null) { if (caption != null || type != null) {
JSONObject jsonContent = new JSONObject(); JSONObject jsonContent = new JSONObject();
@ -153,7 +155,8 @@ public class GpodnetService implements ISyncService {
requireLoggedIn(); requireLoggedIn();
try { try {
URL url = new URI(baseScheme, null, baseHost, basePort, URL url = new URI(baseScheme, null, baseHost, basePort,
String.format("/api/2/subscriptions/%s/%s.json", username, deviceId), null, null).toURL(); String.format("%s/api/2/subscriptions/%s/%s.json", baseFolder, username, deviceId),
null, null).toURL();
final JSONObject requestObject = new JSONObject(); final JSONObject requestObject = new JSONObject();
requestObject.put("add", new JSONArray(added)); requestObject.put("add", new JSONArray(added));
@ -184,7 +187,7 @@ public class GpodnetService implements ISyncService {
public SubscriptionChanges getSubscriptionChanges(long timestamp) throws GpodnetServiceException { public SubscriptionChanges getSubscriptionChanges(long timestamp) throws GpodnetServiceException {
requireLoggedIn(); requireLoggedIn();
String params = String.format(Locale.US, "since=%d", timestamp); String params = String.format(Locale.US, "since=%d", timestamp);
String path = String.format("/api/2/subscriptions/%s/%s.json", username, deviceId); String path = String.format("%s/api/2/subscriptions/%s/%s.json", baseFolder, username, deviceId);
try { try {
URL url = new URI(baseScheme, null, baseHost, basePort, path, params, null).toURL(); URL url = new URI(baseScheme, null, baseHost, basePort, path, params, null).toURL();
Request.Builder request = new Request.Builder().url(url); Request.Builder request = new Request.Builder().url(url);
@ -229,7 +232,7 @@ public class GpodnetService implements ISyncService {
try { try {
Log.d(TAG, "Uploading partial actions " + from + " to " + to + " of " + episodeActions.size()); Log.d(TAG, "Uploading partial actions " + from + " to " + to + " of " + episodeActions.size());
URL url = new URI(baseScheme, null, baseHost, basePort, URL url = new URI(baseScheme, null, baseHost, basePort,
String.format("/api/2/episodes/%s.json", username), null, null).toURL(); String.format("%s/api/2/episodes/%s.json", baseFolder, username), null, null).toURL();
final JSONArray list = new JSONArray(); final JSONArray list = new JSONArray();
for (int i = from; i < to; i++) { for (int i = from; i < to; i++) {
@ -265,7 +268,7 @@ public class GpodnetService implements ISyncService {
public EpisodeActionChanges getEpisodeActionChanges(long timestamp) throws SyncServiceException { public EpisodeActionChanges getEpisodeActionChanges(long timestamp) throws SyncServiceException {
requireLoggedIn(); requireLoggedIn();
String params = String.format(Locale.US, "since=%d", timestamp); String params = String.format(Locale.US, "since=%d", timestamp);
String path = String.format("/api/2/episodes/%s.json", username); String path = String.format("%s/api/2/episodes/%s.json", baseFolder, username);
try { try {
URL url = new URI(baseScheme, null, baseHost, basePort, path, params, null).toURL(); URL url = new URI(baseScheme, null, baseHost, basePort, path, params, null).toURL();
Request.Builder request = new Request.Builder().url(url); Request.Builder request = new Request.Builder().url(url);
@ -294,7 +297,7 @@ public class GpodnetService implements ISyncService {
URL url; URL url;
try { try {
url = new URI(baseScheme, null, baseHost, basePort, url = new URI(baseScheme, null, baseHost, basePort,
String.format("/api/2/auth/%s/login.json", username), null, null).toURL(); String.format("%s/api/2/auth/%s/login.json", baseFolder, username), null, null).toURL();
} catch (MalformedURLException | URISyntaxException e) { } catch (MalformedURLException | URISyntaxException e) {
e.printStackTrace(); e.printStackTrace();
throw new GpodnetServiceException(e); throw new GpodnetServiceException(e);