diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-23 21:56:23 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-23 21:56:27 +0200 |
| commit | 8d141176bd3bf8f67b04580dd7e988d8a846c0f5 (patch) | |
| tree | f3fac210ff1436607e976d22298748ed89e102aa /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider | |
| parent | 45a8510bf0d0f3501d7226234a791908cf06d72a (diff) | |
| download | open-keychain-8d141176bd3bf8f67b04580dd7e988d8a846c0f5.tar.gz open-keychain-8d141176bd3bf8f67b04580dd7e988d8a846c0f5.tar.bz2 open-keychain-8d141176bd3bf8f67b04580dd7e988d8a846c0f5.zip | |
fix original file deletion (and instrumentation)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java index fc3d43eaf..b1f1a7d9e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java @@ -210,10 +210,13 @@ public class TemporaryStorageProvider extends ContentProvider { @Override public int delete(Uri uri, String selection, String[] selectionArgs) { - if (uri.getLastPathSegment() != null) { - selection = DatabaseUtil.concatenateWhere(selection, COLUMN_ID + "=?"); - selectionArgs = DatabaseUtil.appendSelectionArgs(selectionArgs, new String[]{uri.getLastPathSegment()}); + if (uri == null || uri.getLastPathSegment() == null) { + return 0; } + + selection = DatabaseUtil.concatenateWhere(selection, COLUMN_ID + "=?"); + selectionArgs = DatabaseUtil.appendSelectionArgs(selectionArgs, new String[]{uri.getLastPathSegment()}); + Cursor files = db.getReadableDatabase().query(TABLE_FILES, new String[]{COLUMN_ID}, selection, selectionArgs, null, null, null); if (files != null) { |