From d3ad0950bab8178544701b32e319955b637d47d8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 8 Sep 2017 15:38:06 -0400 Subject: [PATCH] Clean up the data source class. // FREEBIE --- SignalServiceKit/src/Util/DataSource.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/SignalServiceKit/src/Util/DataSource.h b/SignalServiceKit/src/Util/DataSource.h index f79899edb..0d467231f 100755 --- a/SignalServiceKit/src/Util/DataSource.h +++ b/SignalServiceKit/src/Util/DataSource.h @@ -19,24 +19,16 @@ NS_ASSUME_NONNULL_BEGIN // Should not be called unless necessary as it can involve an expensive write. // // Will only return nil in the error case. -// -// TODO: Try to remove this parameter. - (nullable NSURL *)dataUrl; -// The file path for the data. -// -// Should not be called unless necessary as it can involve an expensive write. -// -// Will only return nil in the error case. -// -// TODO: Try to remove this parameter. -- (nullable NSString *)dataPath; - // The file path for the data, if it already exists on disk. // // This method is safe to call as it will not do any expensive reads or writes. // -// May return nil if the data does not reside on disk. +// May return nil if the data does not (yet) reside on disk. +// +// Use dataUrl instead if you need to access the data; it will +// ensure the data is on disk and return a URL, barring an error. - (nullable NSString *)dataPathIfOnDisk; // Will return zero in the error case.