catch exceptions related to file uri resolution

This commit is contained in:
cyberta
2020-07-01 19:20:32 +02:00
parent 517a76336b
commit 30dc83ec3d
4 changed files with 18 additions and 9 deletions
@@ -46,6 +46,7 @@ import org.thoughtcrime.securesms.util.BitmapUtil;
import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.FileProviderUtil;
import org.thoughtcrime.securesms.util.FileUtils;
import org.thoughtcrime.securesms.util.IntentUtils;
import org.thoughtcrime.securesms.util.Prefs;
import org.thoughtcrime.securesms.util.Util;
@@ -56,6 +57,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.URI;
import java.security.SecureRandom;
import java.util.LinkedList;
import java.util.List;
@@ -347,8 +349,15 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Emoj
if (includeCamera) {
Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
if (captureFile != null && cameraIntent.resolveActivity(getPackageManager()) != null) {
cameraIntent.putExtra(EXTRA_OUTPUT, FileProviderUtil.getUriFor(this, captureFile));
Uri captureUri = null;
try {
captureUri = FileProviderUtil.getUriFor(this, captureFile);
} catch (Exception e) {
Log.w(TAG, e);
}
if (captureUri != null && cameraIntent.resolveActivity(getPackageManager()) != null) {
cameraIntent.putExtra(EXTRA_OUTPUT, captureUri);
extraIntents.add(cameraIntent);
}
}
@@ -460,8 +460,8 @@ public class AttachmentManager {
captureIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageCaptureUri);
activity.startActivityForResult(captureIntent, requestCode);
}
} catch (IOException ioe) {
Log.w(TAG, ioe);
} catch (Exception e) {
Log.w(TAG, e);
}
})
.execute();
@@ -485,8 +485,8 @@ public class AttachmentManager {
captureIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
activity.startActivityForResult(captureIntent, requestCode);
}
} catch (IOException ioe) {
Log.w(TAG, ioe);
} catch (Exception e) {
Log.w(TAG, e);
}
})
.execute();
@@ -114,8 +114,8 @@ public class PersistentBlobProvider {
});
}
public Uri createForExternal(@NonNull Context context, @NonNull String mimeType) throws IOException {
File target = new File(getExternalDir(context), String.valueOf(System.currentTimeMillis()) + "." + getExtensionFromMimeType(mimeType));
public Uri createForExternal(@NonNull Context context, @NonNull String mimeType) throws IOException, IllegalStateException, NullPointerException {
File target = new File(getExternalDir(context), System.currentTimeMillis() + "." + getExtensionFromMimeType(mimeType));
return FileProviderUtil.getUriFor(context, target);
}
@@ -15,7 +15,7 @@ public class FileProviderUtil {
private static final String AUTHORITY = BuildConfig.APPLICATION_ID+".fileprovider";
public static Uri getUriFor(@NonNull Context context, @NonNull File file) throws IllegalStateException {
public static Uri getUriFor(@NonNull Context context, @NonNull File file) throws IllegalStateException, NullPointerException {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) return FileProvider.getUriForFile(context, AUTHORITY, file);
else return Uri.fromFile(file);
}