Skip to content

fix: don't crash import when backup has no filters/tasks/triggers array #409

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

Open
7MS8 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: don't crash import when backup has no filters/tasks/triggers array #409

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: 12 additions & 3 deletions app/src/main/java/ca/pkay/rcloneexplorer/Database/json/Importer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ public static void importJson(String json, Context context) throws JSONException
public static ArrayList<Trigger> createTriggerlist(String content) throws JSONException {
ArrayList<Trigger> result = new ArrayList<>();
JSONObject reader = new JSONObject(content);
JSONArray array = reader.getJSONArray("trigger");
JSONArray array = reader.optJSONArray("trigger");
if (array == null) {
return result;
}
for (int i = 0; i < array.length(); i++) {
JSONObject triggerObject = array.getJSONObject(i);
result.add(Trigger.Companion.fromString(triggerObject.toString()));
Expand All @@ -44,7 +47,10 @@ public static ArrayList<Trigger> createTriggerlist(String content) throws JSONEx
public static ArrayList<Task> createTasklist(String content) throws JSONException {
ArrayList<Task> result = new ArrayList<>();
JSONObject reader = new JSONObject(content);
JSONArray array = reader.getJSONArray("tasks");
JSONArray array = reader.optJSONArray("tasks");
if (array == null) {
return result;
}
for (int i = 0; i < array.length(); i++) {
JSONObject taskObject = array.getJSONObject(i);
result.add(Task.Companion.fromString(taskObject.toString()));
Expand All @@ -54,7 +60,10 @@ public static ArrayList<Task> createTasklist(String content) throws JSONExceptio
public static ArrayList<Filter> createFilterList(String content) throws JSONException {
ArrayList<Filter> result = new ArrayList<>();
JSONObject reader = new JSONObject(content);
JSONArray array = reader.getJSONArray("filters");
JSONArray array = reader.optJSONArray("filters");
if (array == null) {
return result;
}
for (int i = 0; i < array.length(); i++) {
JSONObject filterObject = array.getJSONObject(i);
result.add(Filter.Companion.fromString(filterObject.toString()));
Expand Down