mirror
/
SSTVEncoder2
kopia lustrzana https://github.com/olgamiller/SSTVEncoder2
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Moved resolving and starting another activity to tryToStartActivityForResult-method and added Toast messages

pull/15/head
Olga Miller 2023-02-25 13:02:15 +01:00
rodzic 117556f69b
commit fa71909df5
2 zmienionych plików z 21 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
app/src/main/java/om/sstvencoder/MainActivity.java
Wyświetl plik

@ -391,25 +391,34 @@ public class MainActivity extends AppCompatActivity {
public void startEditTextActivity(@NonNull Label label) {
Intent intent = new Intent(this, EditTextActivity.class);
intent.putExtra(EditTextActivity.EXTRA, label);
startActivityForResult(intent, EditTextActivity.REQUEST_CODE);
tryToStartActivityForResult(intent, EditTextActivity.REQUEST_CODE);
}
private void dispatchTakePictureIntent() {
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
if (intent.resolveActivity(getPackageManager()) != null) {
Uri uri = Utility.createImageUri(this);
if (uri != null) {
mSettings.setImageUri(uri);
intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
startActivityForResult(intent, REQUEST_IMAGE_CAPTURE);
}
Uri uri = Utility.createImageUri(this);
if (uri != null) {
mSettings.setImageUri(uri);
intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
tryToStartActivityForResult(intent, REQUEST_IMAGE_CAPTURE);
}
}
private void dispatchPickPictureIntent() {
Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
if (intent.resolveActivity(getPackageManager()) != null)
startActivityForResult(intent, REQUEST_PICK_IMAGE);
tryToStartActivityForResult(intent, REQUEST_PICK_IMAGE);
}
private void tryToStartActivityForResult(Intent intent, int requestCode) {
if (intent.resolveActivity(getPackageManager()) == null) {
Toast.makeText(this, R.string.another_activity_resolve_err, Toast.LENGTH_LONG).show();
return;
}
try {
startActivityForResult(intent, requestCode);
} catch (Exception ignore) {
Toast.makeText(this, R.string.another_activity_start_err, Toast.LENGTH_LONG).show();
}
}
@Override

2
app/src/main/res/values/strings.xml
Wyświetl plik

@ -45,6 +45,8 @@
<string name="load_img_err_txt_unsupported">Unsupported content.</string>
<string name="message_prev_img_not_loaded">Previous image could not be loaded.</string>
<string name="message_no_camera">Device has no camera.</string>
<string name="another_activity_resolve_err">Another activity could not be resolved.</string>
<string name="another_activity_start_err">Another activity could not be started.</string>
<string name="btn_send_email">Send Email</string>
<string name="btn_ok">OK</string>
<string name="email_subject">SSTV Encoder - Bug Report</string>