From a4b3f87403e04fe7105e86ba40630f807fa8223f Mon Sep 17 00:00:00 2001 From: Gabriele M Date: Fri, 20 Apr 2018 21:21:43 +0200 Subject: [PATCH] Append random ID to temporary json file names Multiple update list downloads can happen simultaneously. Use unique file names for the temporary jsons to avoid conflicts. Change-Id: I751c9838394e1f5aebbe359f61532947b429f39b --- src/org/lineageos/updater/UpdatesActivity.java | 3 ++- src/org/lineageos/updater/UpdatesCheckReceiver.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index 6fcf975c..2aa35a12 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -64,6 +64,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.UUID; public class UpdatesActivity extends UpdatesListActivity { @@ -317,7 +318,7 @@ public class UpdatesActivity extends UpdatesListActivity { private void downloadUpdatesList(final boolean manualRefresh) { final File jsonFile = Utils.getCachedUpdateList(this); - final File jsonFileTmp = new File(jsonFile.getAbsolutePath() + ".tmp"); + final File jsonFileTmp = new File(jsonFile.getAbsolutePath() + UUID.randomUUID()); String url = Utils.getServerURL(this); Log.d(TAG, "Checking " + url); diff --git a/src/org/lineageos/updater/UpdatesCheckReceiver.java b/src/org/lineageos/updater/UpdatesCheckReceiver.java index b70d388f..83348b97 100644 --- a/src/org/lineageos/updater/UpdatesCheckReceiver.java +++ b/src/org/lineageos/updater/UpdatesCheckReceiver.java @@ -38,6 +38,7 @@ import java.io.IOException; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.UUID; public class UpdatesCheckReceiver extends BroadcastReceiver { @@ -70,7 +71,7 @@ public class UpdatesCheckReceiver extends BroadcastReceiver { } final File json = Utils.getCachedUpdateList(context); - final File jsonNew = new File(json.getAbsolutePath() + ".tmp"); + final File jsonNew = new File(json.getAbsolutePath() + UUID.randomUUID()); String url = Utils.getServerURL(context); DownloadClient.DownloadCallback callback = new DownloadClient.DownloadCallback() { @Override