Prevent crash

pull/158/head
M66B 5 years ago
parent 930663ff76
commit 269bd11d87

@ -361,11 +361,21 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK && data != null)
if (requestCode == REQUEST_EXPORT) try {
handleExport(data, this.password); switch (requestCode) {
else if (requestCode == REQUEST_IMPORT) case REQUEST_EXPORT:
handleImport(data, this.password); if (resultCode == RESULT_OK && data != null)
handleExport(data, this.password);
break;
case REQUEST_IMPORT:
if (resultCode == RESULT_OK && data != null)
handleImport(data, this.password);
break;
}
} catch (Throwable ex) {
Log.e(ex);
}
} }
private void onMenuExport() { private void onMenuExport() {

@ -1293,32 +1293,36 @@ public class FragmentAccount extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { try {
case REQUEST_COLOR: switch (requestCode) {
if (resultCode == RESULT_OK && data != null) { case REQUEST_COLOR:
if (Helper.isPro(getContext())) { if (resultCode == RESULT_OK && data != null) {
Bundle args = data.getBundleExtra("args"); if (Helper.isPro(getContext())) {
setColor(args.getInt("color")); Bundle args = data.getBundleExtra("args");
} else setColor(args.getInt("color"));
ToastEx.makeText(getContext(), R.string.title_pro_feature, Toast.LENGTH_LONG).show(); } else
} ToastEx.makeText(getContext(), R.string.title_pro_feature, Toast.LENGTH_LONG).show();
break; }
case REQUEST_SAVE: break;
if (resultCode == RESULT_OK) { case REQUEST_SAVE:
new Handler().post(new Runnable() { if (resultCode == RESULT_OK) {
@Override new Handler().post(new Runnable() {
public void run() { @Override
scroll.smoothScrollTo(0, btnSave.getBottom()); public void run() {
} scroll.smoothScrollTo(0, btnSave.getBottom());
}); }
onSave(false); });
} else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) onSave(false);
getFragmentManager().popBackStack(); } else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
break; getFragmentManager().popBackStack();
case REQUEST_DELETE: break;
if (resultCode == RESULT_OK) case REQUEST_DELETE:
onDelete(); if (resultCode == RESULT_OK)
break; onDelete();
break;
}
} catch (Throwable ex) {
Log.e(ex);
} }
} }

@ -214,11 +214,15 @@ public class FragmentAnswer extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { try {
case REQUEST_DELETE: switch (requestCode) {
if (resultCode == RESULT_OK) case REQUEST_DELETE:
onDelete(); if (resultCode == RESULT_OK)
break; onDelete();
break;
}
} catch (Throwable ex) {
Log.e(ex);
} }
} }

@ -1108,70 +1108,74 @@ public class FragmentCompose extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { try {
case REQUEST_CONTACT_TO: switch (requestCode) {
case REQUEST_CONTACT_CC: case REQUEST_CONTACT_TO:
case REQUEST_CONTACT_BCC: case REQUEST_CONTACT_CC:
if (resultCode == RESULT_OK && data != null) case REQUEST_CONTACT_BCC:
onPickContact(requestCode, data); if (resultCode == RESULT_OK && data != null)
break; onPickContact(requestCode, data);
case REQUEST_IMAGE: break;
if (resultCode == RESULT_OK && data != null) { case REQUEST_IMAGE:
Uri uri = data.getData(); if (resultCode == RESULT_OK && data != null) {
if (uri != null) Uri uri = data.getData();
onAddAttachment(uri, true); if (uri != null)
} onAddAttachment(uri, true);
break; }
case REQUEST_ATTACHMENT: break;
case REQUEST_RECORD_AUDIO: case REQUEST_ATTACHMENT:
case REQUEST_TAKE_PHOTO: case REQUEST_RECORD_AUDIO:
if (resultCode == RESULT_OK) case REQUEST_TAKE_PHOTO:
if (requestCode == REQUEST_TAKE_PHOTO) if (resultCode == RESULT_OK)
onAddMedia(new Intent().setData(photoURI)); if (requestCode == REQUEST_TAKE_PHOTO)
else if (data != null) onAddMedia(new Intent().setData(photoURI));
onAddMedia(data); else if (data != null)
break; onAddMedia(data);
case REQUEST_ENCRYPT: break;
if (resultCode == RESULT_OK && data != null) { case REQUEST_ENCRYPT:
if (BuildConfig.DEBUG || BuildConfig.BETA_RELEASE) if (resultCode == RESULT_OK && data != null) {
Log.logExtras(data); if (BuildConfig.DEBUG || BuildConfig.BETA_RELEASE)
onPgp(data); Log.logExtras(data);
} onPgp(data);
break; }
case REQUEST_COLOR: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_COLOR:
onColorSelected(data.getBundleExtra("args")); if (resultCode == RESULT_OK && data != null)
break; onColorSelected(data.getBundleExtra("args"));
case REQUEST_SEND_AFTER: break;
if (resultCode == RESULT_OK && data != null) { case REQUEST_SEND_AFTER:
Bundle args = data.getBundleExtra("args"); if (resultCode == RESULT_OK && data != null) {
onSendAfter(args.getLong("time")); Bundle args = data.getBundleExtra("args");
} onSendAfter(args.getLong("time"));
break; }
case REQUEST_REF_EDIT: break;
if (resultCode == RESULT_OK) case REQUEST_REF_EDIT:
onReferenceEditConfirmed(); if (resultCode == RESULT_OK)
break; onReferenceEditConfirmed();
case REQUEST_CONTACT_GROUP: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_CONTACT_GROUP:
onContactGroupSelected(data.getBundleExtra("args")); if (resultCode == RESULT_OK && data != null)
break; onContactGroupSelected(data.getBundleExtra("args"));
case REQUEST_ANSWER: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_ANSWER:
onAnswerSelected(data.getBundleExtra("args")); if (resultCode == RESULT_OK && data != null)
break; onAnswerSelected(data.getBundleExtra("args"));
case REQUEST_LINK: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_LINK:
onLinkSelected(data.getBundleExtra("args")); if (resultCode == RESULT_OK && data != null)
break; onLinkSelected(data.getBundleExtra("args"));
case REQUEST_DISCARD: break;
if (resultCode == RESULT_OK) case REQUEST_DISCARD:
onAction(R.id.action_delete); if (resultCode == RESULT_OK)
break; onAction(R.id.action_delete);
case REQUEST_SEND: break;
if (resultCode == RESULT_OK) case REQUEST_SEND:
onActionSendConfirmed(); if (resultCode == RESULT_OK)
break; onActionSendConfirmed();
break;
}
} catch (Throwable ex) {
Log.e(ex);
} }
} }

@ -244,24 +244,28 @@ public class FragmentFolder extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { try {
case REQUEST_SAVE_CHANGES: switch (requestCode) {
if (resultCode == RESULT_OK) { case REQUEST_SAVE_CHANGES:
new Handler().post(new Runnable() { if (resultCode == RESULT_OK) {
@Override new Handler().post(new Runnable() {
public void run() { @Override
scroll.smoothScrollTo(0, btnSave.getBottom()); public void run() {
} scroll.smoothScrollTo(0, btnSave.getBottom());
}); }
onSave(false); });
} else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) onSave(false);
getFragmentManager().popBackStack(); } else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
break; getFragmentManager().popBackStack();
break;
case REQUEST_DELETE_FOLDER:
if (resultCode == RESULT_OK) case REQUEST_DELETE_FOLDER:
onDelete(); if (resultCode == RESULT_OK)
break; onDelete();
break;
}
} catch (Throwable ex) {
Log.e(ex);
} }
} }

@ -429,25 +429,29 @@ public class FragmentFolders extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { try {
case REQUEST_SYNC: switch (requestCode) {
if (resultCode == RESULT_OK && data != null) { case REQUEST_SYNC:
Bundle args = data.getBundleExtra("args"); if (resultCode == RESULT_OK && data != null) {
onSync(args.getLong("folder"), args.getBoolean("all")); Bundle args = data.getBundleExtra("args");
} onSync(args.getLong("folder"), args.getBoolean("all"));
break; }
case REQUEST_DELETE_LOCAL: break;
if (resultCode == RESULT_OK && data != null) { case REQUEST_DELETE_LOCAL:
Bundle args = data.getBundleExtra("args"); if (resultCode == RESULT_OK && data != null) {
onDeleteLocal(args.getLong("folder"), args.getBoolean("browsed")); Bundle args = data.getBundleExtra("args");
} onDeleteLocal(args.getLong("folder"), args.getBoolean("browsed"));
break; }
case REQUEST_EMPTY_TRASH: break;
if (resultCode == RESULT_OK && data != null) { case REQUEST_EMPTY_TRASH:
Bundle args = data.getBundleExtra("args"); if (resultCode == RESULT_OK && data != null) {
onEmptyTrash(args.getLong("folder")); Bundle args = data.getBundleExtra("args");
} onEmptyTrash(args.getLong("folder"));
break; }
break;
}
} catch (Throwable ex) {
Log.e(ex);
} }
} }

@ -1030,36 +1030,40 @@ public class FragmentIdentity extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { try {
case REQUEST_COLOR: switch (requestCode) {
if (resultCode == RESULT_OK && data != null) { case REQUEST_COLOR:
if (Helper.isPro(getContext())) { if (resultCode == RESULT_OK && data != null) {
Bundle args = data.getBundleExtra("args"); if (Helper.isPro(getContext())) {
setColor(args.getInt("color")); Bundle args = data.getBundleExtra("args");
} else setColor(args.getInt("color"));
ToastEx.makeText(getContext(), R.string.title_pro_feature, Toast.LENGTH_LONG).show(); } else
} ToastEx.makeText(getContext(), R.string.title_pro_feature, Toast.LENGTH_LONG).show();
break; }
case REQUEST_SAVE: break;
if (resultCode == RESULT_OK) { case REQUEST_SAVE:
new Handler().post(new Runnable() { if (resultCode == RESULT_OK) {
@Override new Handler().post(new Runnable() {
public void run() { @Override
scroll.smoothScrollTo(0, btnSave.getBottom()); public void run() {
} scroll.smoothScrollTo(0, btnSave.getBottom());
}); }
onSave(false); });
} else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) onSave(false);
getFragmentManager().popBackStack(); } else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
break; getFragmentManager().popBackStack();
case REQUEST_DELETE: break;
if (resultCode == RESULT_OK) case REQUEST_DELETE:
onDelete(); if (resultCode == RESULT_OK)
break; onDelete();
case REQUEST_HTML: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_HTML:
onHtml(data.getBundleExtra("args")); if (resultCode == RESULT_OK && data != null)
break; onHtml(data.getBundleExtra("args"));
break;
}
} catch (Throwable ex) {
Log.e(ex);
} }
} }

@ -3338,105 +3338,109 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { try {
case REQUEST_RAW: switch (requestCode) {
if (resultCode == RESULT_OK && data != null) case REQUEST_RAW:
onSaveRaw(data); if (resultCode == RESULT_OK && data != null)
break; onSaveRaw(data);
case REQUEST_ATTACHMENT: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_ATTACHMENT:
onSaveAttachment(data); if (resultCode == RESULT_OK && data != null)
break; onSaveAttachment(data);
case REQUEST_ATTACHMENTS: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_ATTACHMENTS:
onSaveAttachments(data); if (resultCode == RESULT_OK && data != null)
break; onSaveAttachments(data);
case REQUEST_DECRYPT: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_DECRYPT:
onDecrypt(data, message); if (resultCode == RESULT_OK && data != null)
break; onDecrypt(data, message);
case REQUEST_MESSAGE_DELETE: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_MESSAGE_DELETE:
onDelete(data.getBundleExtra("args").getLong("id")); if (resultCode == RESULT_OK && data != null)
break; onDelete(data.getBundleExtra("args").getLong("id"));
case REQUEST_MESSAGES_DELETE: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_MESSAGES_DELETE:
onDelete(data.getBundleExtra("args").getLongArray("ids")); if (resultCode == RESULT_OK && data != null)
break; onDelete(data.getBundleExtra("args").getLongArray("ids"));
case REQUEST_MESSAGE_JUNK: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_MESSAGE_JUNK:
onJunk(data.getBundleExtra("args").getLong("id")); if (resultCode == RESULT_OK && data != null)
break; onJunk(data.getBundleExtra("args").getLong("id"));
case REQUEST_MESSAGES_JUNK: break;
if (resultCode == RESULT_OK) case REQUEST_MESSAGES_JUNK:
onActionMoveSelection(EntityFolder.JUNK); if (resultCode == RESULT_OK)
break; onActionMoveSelection(EntityFolder.JUNK);
case REQUEST_ASKED_MOVE: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_ASKED_MOVE:
onMoveAskAcross(data.getBundleExtra("args").<MessageTarget>getParcelableArrayList("result")); if (resultCode == RESULT_OK && data != null)
break; onMoveAskAcross(data.getBundleExtra("args").<MessageTarget>getParcelableArrayList("result"));
case REQUEST_ASKED_MOVE_ACROSS: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_ASKED_MOVE_ACROSS:
moveAskConfirmed(data.getBundleExtra("args").<MessageTarget>getParcelableArrayList("result")); if (resultCode == RESULT_OK && data != null)
break; moveAskConfirmed(data.getBundleExtra("args").<MessageTarget>getParcelableArrayList("result"));
case REQUEST_MESSAGE_COLOR: break;
if (resultCode == RESULT_OK && data != null) { case REQUEST_MESSAGE_COLOR:
Bundle args = data.getBundleExtra("args"); if (resultCode == RESULT_OK && data != null) {
onColor(args.getLong("id"), args.getInt("color")); Bundle args = data.getBundleExtra("args");
} onColor(args.getLong("id"), args.getInt("color"));
break;
case REQUEST_MESSAGES_COLOR:
if (resultCode == RESULT_OK && data != null) {
if (!Helper.isPro(getContext())) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
return;
} }
break;
case REQUEST_MESSAGES_COLOR:
if (resultCode == RESULT_OK && data != null) {
if (!Helper.isPro(getContext())) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
return;
}
Bundle args = data.getBundleExtra("args"); Bundle args = data.getBundleExtra("args");
onActionFlagSelection(true, args.getInt("color")); onActionFlagSelection(true, args.getInt("color"));
} }
break; break;
case REQUEST_MESSAGE_SNOOZE: case REQUEST_MESSAGE_SNOOZE:
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
onSnooze(data.getBundleExtra("args")); onSnooze(data.getBundleExtra("args"));
break; break;
case REQUEST_MESSAGES_SNOOZE: case REQUEST_MESSAGES_SNOOZE:
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
onSnoozeSelection(data.getBundleExtra("args")); onSnoozeSelection(data.getBundleExtra("args"));
break; break;
case REQUEST_MESSAGE_MOVE: case REQUEST_MESSAGE_MOVE:
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
onMove(data.getBundleExtra("args")); onMove(data.getBundleExtra("args"));
break; break;
case REQUEST_MESSAGES_MOVE: case REQUEST_MESSAGES_MOVE:
if (resultCode == RESULT_OK && data != null) { if (resultCode == RESULT_OK && data != null) {
Bundle args = data.getBundleExtra("args"); Bundle args = data.getBundleExtra("args");
onActionMoveSelection(args.getLong("folder")); onActionMoveSelection(args.getLong("folder"));
} }
break; break;
case REQUEST_PRINT: case REQUEST_PRINT:
if (resultCode == RESULT_OK && data != null) if (resultCode == RESULT_OK && data != null)
onPrint(data.getBundleExtra("args")); onPrint(data.getBundleExtra("args"));
break; break;
case REQUEST_SEARCH: case REQUEST_SEARCH:
if (resultCode == RESULT_OK && data != null) { if (resultCode == RESULT_OK && data != null) {
Bundle args = data.getBundleExtra("args"); Bundle args = data.getBundleExtra("args");
search( search(
getContext(), getViewLifecycleOwner(), getFragmentManager(), getContext(), getViewLifecycleOwner(), getFragmentManager(),
args.getLong("folder"), true, args.getString("query")); args.getLong("folder"), true, args.getString("query"));
} }
break; break;
case REQUEST_ACCOUNT: case REQUEST_ACCOUNT:
if (resultCode == RESULT_OK && data != null) { if (resultCode == RESULT_OK && data != null) {
Bundle args = data.getBundleExtra("args"); Bundle args = data.getBundleExtra("args");
onMenuFolders(args.getLong("account")); onMenuFolders(args.getLong("account"));
} }
break; break;
case REQUEST_MESSAGE_PROPERTY: case REQUEST_MESSAGE_PROPERTY:
if (resultCode == RESULT_OK) if (resultCode == RESULT_OK)
onPropertySet(data.getBundleExtra("args")); onPropertySet(data.getBundleExtra("args"));
break; break;
}
} catch (Throwable ex) {
Log.e(ex);
} }
} }

@ -258,19 +258,28 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == ActivitySetup.REQUEST_SOUND) try {
if (resultCode == RESULT_OK) { switch (requestCode) {
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI); case ActivitySetup.REQUEST_SOUND:
Log.i("Selected ringtone=" + uri); if (resultCode == RESULT_OK && data != null)
if (uri != null && "file".equals(uri.getScheme())) onSelectSound((Uri) data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI));
uri = null; break;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
if (uri == null)
prefs.edit().remove("sound").apply();
else
prefs.edit().putString("sound", uri.toString()).apply();
} }
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onSelectSound(Uri uri) {
Log.i("Selected ringtone=" + uri);
if (uri != null && "file".equals(uri.getScheme()))
uri = null;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
if (uri == null)
prefs.edit().remove("sound").apply();
else
prefs.edit().putString("sound", uri.toString()).apply();
} }
private static Intent getIntentNotifications(Context context) { private static Intent getIntentNotifications(Context context) {

@ -441,10 +441,14 @@ public class FragmentQuickSetup extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { try {
case REQUEST_DONE: switch (requestCode) {
finish(); case REQUEST_DONE:
break; finish();
break;
}
} catch (Throwable ex) {
Log.e(ex);
} }
} }

@ -417,31 +417,35 @@ public class FragmentRule extends FragmentBase {
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { try {
case REQUEST_SENDER: switch (requestCode) {
if (resultCode == RESULT_OK && data != null) case REQUEST_SENDER:
onPickContact(data, true); if (resultCode == RESULT_OK && data != null)
break; onPickContact(data, true);
case REQUEST_RECIPIENT: break;
if (resultCode == RESULT_OK && data != null) case REQUEST_RECIPIENT:
onPickContact(data, true); if (resultCode == RESULT_OK && data != null)
break; onPickContact(data, true);
case REQUEST_COLOR: break;
if (resultCode == RESULT_OK && data != null) { case REQUEST_COLOR:
if (!Helper.isPro(getContext())) { if (resultCode == RESULT_OK && data != null) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext()); if (!Helper.isPro(getContext())) {
lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO)); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
return; lbm.sendBroadcast(new Intent(ActivityView.ACTION_SHOW_PRO));
} return;
}
Bundle args = data.getBundleExtra("args"); Bundle args = data.getBundleExtra("args");
onSelectColor(args.getInt("color")); onSelectColor(args.getInt("color"));
} }
break; break;
case REQUEST_DELETE: case REQUEST_DELETE:
if (resultCode == RESULT_OK) if (resultCode == RESULT_OK)
onDelete(); onDelete();
break; break;
}
} catch (Throwable ex) {
Log.e(ex);
} }
} }

Loading…
Cancel
Save