Small improvement

pull/178/head
M66B 6 years ago
parent 08ccb106bc
commit 4dc119cf3d

@ -1429,9 +1429,11 @@ public class FragmentCompose extends FragmentBase {
snackbar.show(); snackbar.show();
} else } else
try { try {
setBusy(true);
startActivityForResult(intent, REQUEST_RECORD_AUDIO); startActivityForResult(intent, REQUEST_RECORD_AUDIO);
} catch (SecurityException ex) { } catch (SecurityException ex) {
Log.w(ex); Log.w(ex);
setBusy(false);
Snackbar.make(view, getString(R.string.title_no_viewer, intent.getAction()), Snackbar.LENGTH_INDEFINITE).show(); Snackbar.make(view, getString(R.string.title_no_viewer, intent.getAction()), Snackbar.LENGTH_INDEFINITE).show();
} }
} }
@ -1458,9 +1460,11 @@ public class FragmentCompose extends FragmentBase {
PackageManager pm = getContext().getPackageManager(); PackageManager pm = getContext().getPackageManager();
if (intent.resolveActivity(pm) == null) if (intent.resolveActivity(pm) == null)
noStorageAccessFramework(); noStorageAccessFramework();
else else {
setBusy(true);
startActivityForResult(Helper.getChooser(getContext(), intent), REQUEST_ATTACHMENT); startActivityForResult(Helper.getChooser(getContext(), intent), REQUEST_ATTACHMENT);
} }
}
private void noStorageAccessFramework() { private void noStorageAccessFramework() {
Snackbar snackbar = Snackbar.make(view, R.string.title_no_saf, Snackbar.LENGTH_LONG); Snackbar snackbar = Snackbar.make(view, R.string.title_no_saf, Snackbar.LENGTH_LONG);
@ -1684,10 +1688,12 @@ public class FragmentCompose extends FragmentBase {
onAddImage(data.getBundleExtra("args").getBoolean("photo")); onAddImage(data.getBundleExtra("args").getBoolean("photo"));
break; break;
case REQUEST_IMAGE_FILE: case REQUEST_IMAGE_FILE:
setBusy(false);
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
onAddImageFile(getUris(data)); onAddImageFile(getUris(data));
break; break;
case REQUEST_TAKE_PHOTO: case REQUEST_TAKE_PHOTO:
setBusy(false);
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
if (photoURI != null) if (photoURI != null)
onAddImageFile(Arrays.asList(photoURI)); onAddImageFile(Arrays.asList(photoURI));
@ -1695,6 +1701,7 @@ public class FragmentCompose extends FragmentBase {
break; break;
case REQUEST_ATTACHMENT: case REQUEST_ATTACHMENT:
case REQUEST_RECORD_AUDIO: case REQUEST_RECORD_AUDIO:
setBusy(false);
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
onAddAttachment(getUris(data), false, 0); onAddAttachment(getUris(data), false, 0);
break; break;
@ -1850,8 +1857,10 @@ public class FragmentCompose extends FragmentBase {
try { try {
photoURI = FileProvider.getUriForFile(getContext(), BuildConfig.APPLICATION_ID, file); photoURI = FileProvider.getUriForFile(getContext(), BuildConfig.APPLICATION_ID, file);
intent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI); intent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
setBusy(true);
startActivityForResult(intent, REQUEST_TAKE_PHOTO); startActivityForResult(intent, REQUEST_TAKE_PHOTO);
} catch (SecurityException ex) { } catch (SecurityException ex) {
setBusy(false);
Log.w(ex); Log.w(ex);
Snackbar.make(view, getString(R.string.title_no_viewer, intent.getAction()), Snackbar.LENGTH_LONG).show(); Snackbar.make(view, getString(R.string.title_no_viewer, intent.getAction()), Snackbar.LENGTH_LONG).show();
} }
@ -1864,10 +1873,12 @@ public class FragmentCompose extends FragmentBase {
PackageManager pm = getContext().getPackageManager(); PackageManager pm = getContext().getPackageManager();
if (intent.resolveActivity(pm) == null) if (intent.resolveActivity(pm) == null)
noStorageAccessFramework(); noStorageAccessFramework();
else else {
setBusy(true);
startActivityForResult(Helper.getChooser(getContext(), intent), REQUEST_IMAGE_FILE); startActivityForResult(Helper.getChooser(getContext(), intent), REQUEST_IMAGE_FILE);
} }
} }
}
private void onAddImageFile(List<Uri> uri) { private void onAddImageFile(List<Uri> uri) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());

Loading…
Cancel
Save