caspervk/AndroidAPS
1
Code Releases Activity

Don't show confirmation on empty message/input

Browse source
This commit is contained in:
Roumen Georgiev 2018-03-01 16:57:36 +02:00 • committed by GitHub
parent 38933ac323
commit bea486d816
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 62 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
View file

@ -278,6 +278,7 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, D
if (!initialEventTime.equals(eventTime)) { if (!initialEventTime.equals(eventTime)) {
confirmMessage += "<br/> Time: " + DateUtil.dateAndTimeString(eventTime); confirmMessage += "<br/> Time: " + DateUtil.dateAndTimeString(eventTime);
} }
if(confirmMessage.length() > 0) {
final int finalCarbsAfterConstraints = carbsAfterConstraints; final int finalCarbsAfterConstraints = carbsAfterConstraints;
@ -287,6 +288,7 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, D
builder.setTitle(this.getContext().getString(R.string.confirmation)); builder.setTitle(this.getContext().getString(R.string.confirmation));
if (confirmMessage.startsWith("<br/>")) if (confirmMessage.startsWith("<br/>"))
confirmMessage = confirmMessage.substring("<br/>".length()); confirmMessage = confirmMessage.substring("<br/>".length());
builder.setMessage(Html.fromHtml(confirmMessage)); builder.setMessage(Html.fromHtml(confirmMessage));
builder.setPositiveButton(getString(R.string.ok), (dialog, id) -> { builder.setPositiveButton(getString(R.string.ok), (dialog, id) -> {
synchronized (builder) { synchronized (builder) {
@ -344,9 +346,12 @@ public class NewCarbsDialog extends DialogFragment implements OnClickListener, D
builder.setNegativeButton(getString(R.string.cancel), null); builder.setNegativeButton(getString(R.string.cancel), null);
builder.show(); builder.show();
dismiss(); dismiss();
} else
dismiss();
} catch (Exception e) { } catch (Exception e) {
log.error("Unhandled exception", e); log.error("Unhandled exception", e);
} }
} }
@Override @Override