Skip to content

fix: Prevented other dialogs in edit activity from being dismissed on orientation change. #2788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2019
Merged

fix: Prevented other dialogs in edit activity from being dismissed on orientation change. #2788

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 88 additions & 3 deletions app/src/main/java/org/fossasia/phimpme/editor/EditImageActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ public class EditImageActivity extends EditBaseActivity
public RotateFragment rotateFragment;
public FrameFragment frameFragment;
private static String stickerType;
private boolean exitDialog = false;
private boolean exitWithoutChanges = false;
private boolean modeChangesExit = false;
private int modeCheck = -1;
private int messageCheck = -1;

@Override
public void onCreate(Bundle savedInstanceState) {
Expand All @@ -182,6 +187,18 @@ public void onCreate(Bundle savedInstanceState) {
mode = savedInstanceState.getInt(getString(R.string.frag_prev));
initalMiddleFragment = savedInstanceState.getInt(getString(R.string.frag_prev_mid));
initalBottomFragment = savedInstanceState.getInt(getString(R.string.frag_prev_bottom));
exitDialog = savedInstanceState.getBoolean("Dialogshown", false);
exitWithoutChanges = savedInstanceState.getBoolean("exitWithoutChanges", false);
modeChangesExit = savedInstanceState.getBoolean("modeChanges", false);
modeCheck = savedInstanceState.getInt("checkMode", -1);
messageCheck = savedInstanceState.getInt("checkString", -1);
}
if (exitDialog) {
onSaveTaskDone();
} else if (exitWithoutChanges) {
noChangesExitDialog();
} else if (modeChangesExit) {
showDiscardChangesDialog(modeCheck, messageCheck);
}
getData();
}
Expand Down Expand Up @@ -525,6 +542,7 @@ protected void onSaveTaskDone() {
} else if (mOpTimes <= 0 && requestCode == 1) {
imageSavedDialog(filePath);
} else {
exitDialog = true;
final AlertDialog.Builder discardChangesDialogBuilder =
new AlertDialog.Builder(EditImageActivity.this, getDialogStyle());
AlertDialogsHelper.getTextDialog(
Expand All @@ -546,7 +564,10 @@ public void onClick(DialogInterface dialog, int which) {
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (dialog != null) dialog.dismiss();
if (dialog != null) {
exitDialog = false;
dialog.dismiss();
}
}
});

Expand Down Expand Up @@ -717,6 +738,11 @@ protected void onSaveInstanceState(Bundle outState) {
outState.putInt(getString(R.string.frag_prev_mid), initalMiddleFragment);
outState.putInt(getString(R.string.frag_prev_bottom), initalBottomFragment);
outState.putInt(getString(R.string.frag_prev), mode);
outState.putBoolean("Dialogshown", exitDialog);
outState.putBoolean("exitWithoutChanges", exitWithoutChanges);
outState.putBoolean("modeChanges", modeChangesExit);
outState.putInt("checkMode", modeCheck);
outState.putInt("checkString", messageCheck);
}

@Override
Expand Down Expand Up @@ -752,6 +778,7 @@ public void onBackPressed() {
if (canAutoExit()) {
finish();
} else {
exitWithoutChanges = true;
final AlertDialog.Builder discardChangesDialogBuilder =
new AlertDialog.Builder(EditImageActivity.this, getDialogStyle());
AlertDialogsHelper.getTextDialog(
Expand All @@ -773,7 +800,10 @@ public void onClick(DialogInterface dialog, int which) {
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (dialog != null) dialog.dismiss();
if (dialog != null) {
exitWithoutChanges = false;
dialog.dismiss();
}
}
});
discardChangesDialogBuilder.setNeutralButton(
Expand All @@ -798,7 +828,59 @@ public void onClick(DialogInterface dialog, int which) {
}
}

private void noChangesExitDialog() {
final AlertDialog.Builder discardChangesDialogBuilder =
new AlertDialog.Builder(EditImageActivity.this, getDialogStyle());
AlertDialogsHelper.getTextDialog(
EditImageActivity.this,
discardChangesDialogBuilder,
R.string.discard_changes_header,
R.string.exit_without_save,
null);
discardChangesDialogBuilder.setPositiveButton(
getString(R.string.confirm).toUpperCase(),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();
}
});
discardChangesDialogBuilder.setNegativeButton(
getString(R.string.cancel).toUpperCase(),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (dialog != null) {
exitWithoutChanges = false;
dialog.dismiss();
}
}
});
discardChangesDialogBuilder.setNeutralButton(
getString(R.string.save_action).toUpperCase(),
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
doSaveImage();
}
});

AlertDialog alertDialog = discardChangesDialogBuilder.create();
alertDialog.show();
AlertDialogsHelper.setButtonTextColor(
new int[] {
DialogInterface.BUTTON_POSITIVE,
DialogInterface.BUTTON_NEGATIVE,
DialogInterface.BUTTON_NEUTRAL
},
getAccentColor(),
alertDialog);
}

private void showDiscardChangesDialog(final int editMode, @StringRes int message) {
modeChangesExit = true;
modeCheck = editMode;
messageCheck = message;
AlertDialog.Builder discardChangesDialogBuilder =
new AlertDialog.Builder(EditImageActivity.this, getDialogStyle());
AlertDialogsHelper.getTextDialog(
Expand All @@ -812,7 +894,10 @@ private void showDiscardChangesDialog(final int editMode, @StringRes int message
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (dialog != null) dialog.dismiss();
if (dialog != null) {
modeChangesExit = false;
dialog.dismiss();
}
}
});
discardChangesDialogBuilder.setPositiveButton(
Expand Down