mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-26 23:27:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix parsing of API versions header

Browse source
This commit is contained in:
korelstar 2020-06-14 15:58:46 +02:00
parent 0e2c0c4d9b
commit ae68495fab
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClient.java
View file

@ -189,7 +189,7 @@ public abstract class NotesClient {
String supportedApiVersions = null;
final AidlNetworkRequest.PlainHeader supportedApiVersionsHeader = response.getPlainHeader(HEADER_KEY_X_NOTES_API_VERSIONS);
if (supportedApiVersionsHeader != null) {
supportedApiVersions = Objects.requireNonNull(supportedApiVersionsHeader.getValue()).replace("\"", "");
supportedApiVersions = "[" + Objects.requireNonNull(supportedApiVersionsHeader.getValue()) + "]";
}
// return these header fields since they should only be saved after successful processing the result!

4
app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
View file

@ -861,9 +861,9 @@ public class NotesDatabase extends AbstractNotesDatabase {
Log.i(TAG, "Given API version is a valid JSON array but does not contain any valid API versions. Do not update database.");
}
} catch (NumberFormatException e) {
throw new IllegalArgumentException("API version does contain a non-valid version.");
throw new IllegalArgumentException("API version does contain a non-valid version: " + apiVersion);
} catch (JSONException e) {
throw new IllegalArgumentException("API version must contain be a JSON array.");
throw new IllegalArgumentException("API version must contain be a JSON array: " + apiVersion);
}
} else {
Log.v(TAG, "Given API version is null. Do not update database");