empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2339 from mcginty/content-security-exception

Browse source 
catch content security exception
This commit is contained in:
Moxie Marlinspike 2015-01-13 12:02:24 -08:00
commit 18961e6369
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/mms/PartAuthority.java
View file

@ -39,11 +39,15 @@ public class PartAuthority {
PartDatabase partDatabase = DatabaseFactory.getPartDatabase(context); PartDatabase partDatabase = DatabaseFactory.getPartDatabase(context);
int match = uriMatcher.match(uri); int match = uriMatcher.match(uri);
try {
switch (match) { switch (match) {
case PART_ROW: return partDatabase.getPartStream(masterSecret, ContentUris.parseId(uri)); case PART_ROW: return partDatabase.getPartStream(masterSecret, ContentUris.parseId(uri));
case THUMB_ROW: return partDatabase.getThumbnailStream(masterSecret, ContentUris.parseId(uri)); case THUMB_ROW: return partDatabase.getThumbnailStream(masterSecret, ContentUris.parseId(uri));
default: return context.getContentResolver().openInputStream(uri); default: return context.getContentResolver().openInputStream(uri);
} }
} catch (SecurityException se) {
throw new IOException(se);
}
} }
public static Uri getPublicPartUri(Uri uri) { public static Uri getPublicPartUri(Uri uri) {