TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for functions existence check

Browse Source
This commit is contained in:
serso 2016-01-24 12:46:45 +01:00
parent 23e96122a3
commit 26ac11ce89
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/solovyev/android/calculator/function/EditFunctionFragment.java
View File

@ -198,7 +198,7 @@ public class EditFunctionFragment extends BaseDialogFragment implements View.OnC
new AlertDialog.Builder(getActivity(), App.getTheme().alertDialogTheme)
.setCancelable(true)
.setTitle(R.string.removal_confirmation)
.setMessage(R.string.function_removal_confirmation_question)
.setMessage(getString(R.string.function_removal_confirmation_question, function.getName()))
.setNegativeButton(R.string.c_no, null)
.setPositiveButton(R.string.c_yes, new DialogInterface.OnClickListener() {
@Override
@ -317,7 +317,14 @@ public class EditFunctionFragment extends BaseDialogFragment implements View.OnC
setError(nameLabel, getString(R.string.function_already_exists));
return false;
}
if (!isNewFunction() && !existingFunction.getId().equals(function.getId())) {
if (isNewFunction()) {
// trying to create a new function with existing name
setError(nameLabel, getString(R.string.function_already_exists));
return false;
}
Check.isNotNull(function);
if (!existingFunction.getId().equals(function.getId())) {
// trying ti change the name of existing function to some other function's name
setError(nameLabel, getString(R.string.function_already_exists));
return false;
}