TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 09:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix direct capture file writing race condition

Browse Source 
fixes #4612
Closes #4634
// FREEBIE
This commit is contained in:
Jake McGinty 2015-11-20 11:03:40 -08:00 committed by Moxie Marlinspike
parent 3bfb123b33
commit a04e737526
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -1351,7 +1351,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override @Override
public void onImageCapture(@NonNull final byte[] imageBytes) { public void onImageCapture(@NonNull final byte[] imageBytes) {
setMedia(PersistentBlobProvider.getInstance(this).create(masterSecret, recipients, imageBytes), MediaType.IMAGE); setMedia(PersistentBlobProvider.getInstance(this).create(masterSecret, imageBytes), MediaType.IMAGE);
quickAttachmentDrawer.hide(false); quickAttachmentDrawer.hide(false);
} }

12
src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
View File

@ -4,7 +4,6 @@ import android.content.ContentUris;
import android.content.Context; import android.content.Context;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.util.Log; import android.util.Log;
@ -61,10 +60,9 @@ public class PersistentBlobProvider {
} }
public Uri create(@NonNull MasterSecret masterSecret, public Uri create(@NonNull MasterSecret masterSecret,
@NonNull Recipients recipients,
@NonNull byte[] imageBytes) @NonNull byte[] imageBytes)
{ {
final long id = generateId(recipients); final long id = System.currentTimeMillis();
cache.put(id, imageBytes); cache.put(id, imageBytes);
return create(masterSecret, new ByteArrayInputStream(imageBytes), id); return create(masterSecret, new ByteArrayInputStream(imageBytes), id);
} }
@ -108,8 +106,12 @@ public class PersistentBlobProvider {
public boolean delete(@NonNull Uri uri) { public boolean delete(@NonNull Uri uri) {
switch (MATCHER.match(uri)) { switch (MATCHER.match(uri)) {
case MATCH: return getFile(ContentUris.parseId(uri)).delete(); case MATCH:
default: return new File(uri.getPath()).delete(); long id = ContentUris.parseId(uri);
cache.remove(id);
return getFile(ContentUris.parseId(uri)).delete();
default:
return new File(uri.getPath()).delete();
} }
} }