prevent overwriting external capture URIs

Closes #4719
fixes #4538
// FREEBIE
This commit is contained in:
Jake McGinty
2015-11-23 17:56:41 -08:00
committed by Moxie Marlinspike
parent bde838d35a
commit 7625ba919e
3 changed files with 7 additions and 12 deletions

View File

@@ -97,10 +97,9 @@ public class PersistentBlobProvider {
});
}
public Uri createForExternal(@NonNull Recipients recipients) throws IOException {
return Uri.fromFile(new File(getExternalDir(context), String.valueOf(generateId(recipients)) + ".jpg"))
public Uri createForExternal() throws IOException {
return Uri.fromFile(new File(getExternalDir(context), String.valueOf(System.currentTimeMillis()) + ".jpg"))
.buildUpon()
.appendQueryParameter("unique", String.valueOf(System.currentTimeMillis()))
.build();
}
@@ -121,10 +120,6 @@ public class PersistentBlobProvider {
: new DecryptingPartInputStream(getFile(id), masterSecret);
}
private int generateId(Recipients recipients) {
return Math.abs(Arrays.hashCode(recipients.getIds()));
}
private File getFile(long id) {
return new File(context.getDir("captures", Context.MODE_PRIVATE), id + ".jpg");
}