From 21b7dccf1c0c2768528d42dbc498c5dd5baaf8fb Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Mon, 7 Sep 2015 11:32:11 -1000 Subject: [PATCH] fix persistent stale attachment jobs Closes #4041 // FREEBIE --- .../thoughtcrime/securesms/jobs/AttachmentDownloadJob.java | 5 +++++ .../securesms/jobs/requirements/MediaNetworkRequirement.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java index f8a9020503..733432acda 100644 --- a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java @@ -67,6 +67,11 @@ public class AttachmentDownloadJob extends MasterSecretJob implements Injectable final PartId partId = new PartId(partRowId, partUniqueId); final PduPart part = DatabaseFactory.getPartDatabase(context).getPart(partId); + if (part == null) { + Log.w(TAG, "part no longer exists."); + return; + } + Log.w(TAG, "Downloading push part " + partId); retrievePart(masterSecret, part, messageId); diff --git a/src/org/thoughtcrime/securesms/jobs/requirements/MediaNetworkRequirement.java b/src/org/thoughtcrime/securesms/jobs/requirements/MediaNetworkRequirement.java index 146ac2bfb1..61469f22b4 100644 --- a/src/org/thoughtcrime/securesms/jobs/requirements/MediaNetworkRequirement.java +++ b/src/org/thoughtcrime/securesms/jobs/requirements/MediaNetworkRequirement.java @@ -78,8 +78,8 @@ public class MediaNetworkRequirement implements Requirement, ContextDependent { final PartDatabase db = DatabaseFactory.getPartDatabase(context); final PduPart part = db.getPart(partId); if (part == null) { - Log.w(TAG, "part was null"); - return false; + Log.w(TAG, "part was null, returning vacuous true"); + return true; } Log.w(TAG, "part transfer progress is " + part.getTransferProgress());