erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-07 09:25:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Update ConfirmDialog to optionally dismiss calling activity

Browse source
This commit is contained in:
Darcy Wong 2019-05-13 16:11:00 +07:00
parent 1f6c968a61
commit dca773ef10
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/KMEA/app/src/main/java/com/tavultesoft/kmea/ConfirmDialogFragment.java
View file

@ -15,6 +15,7 @@ public class ConfirmDialogFragment extends DialogFragment {
public static final String ARG_TITLE = "ConfirmDialogFragment.title";
public static final String ARG_MESSAGE = "ConfirmDialogFragment.message";
public static final String ARG_KEYBOARD_KEY = "confirmDialogFragment.keyboardKey";
private boolean dismissOnSelect = false;
public static ConfirmDialogFragment newInstance(String title, String message) {
ConfirmDialogFragment frag = new ConfirmDialogFragment();
@ -56,7 +57,7 @@ public class ConfirmDialogFragment extends DialogFragment {
KMKeyboardDownloaderActivity.download(getActivity(), true);
} else {
Toast.makeText(getActivity(), "No internet connection", Toast.LENGTH_SHORT).show();
}
}
} else {
// Confirmation to delete item
int keyboardIndex = KeyboardPickerActivity.getKeyboardIndex(getActivity(), keyboardKey);
@ -64,11 +65,15 @@ public class ConfirmDialogFragment extends DialogFragment {
if (result) {
Toast.makeText(getActivity(), "Keyboard deleted", Toast.LENGTH_SHORT).show();
}
dismissOnSelect = true;
}
if (dialog != null) {
dialog.dismiss();
}
getActivity().finish();
if (dismissOnSelect && !getActivity().isFinishing()) {
getActivity().finish();
}
}
})
.setNegativeButton(getString(R.string.label_cancel), new DialogInterface.OnClickListener() {

1
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboardDownloaderActivity.java
View file

@ -323,6 +323,7 @@ public class KMKeyboardDownloaderActivity extends AppCompatActivity {
try {
JSONObject modelInfo = lmData.getJSONObject(0);
if (modelInfo.has("packageFilename")) {
// TODO: Confirm if user wants to overwrite exisiting model version
urls.add(modelInfo.getString("packageFilename"));
}
} catch (JSONException e) {