FIXED: there can be empty two options

opticod · opticod · commit 273d502f87da · 2016-12-13T19:23:06.000+05:30
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/ComprehensionTemplate.java
@@ -231,7 +231,7 @@ public void onClick(View v) {
 
                 for(int i=0;i<options.size();i++){
                     for(int j=0;j<i;j++){
-                        if(options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())){
+                        if (!options.get(i).getText().toString().trim().isEmpty() && options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())) {
                             Toast.makeText(activity.getApplication(), activity.getString(R.string.same_options), Toast.LENGTH_SHORT).show();
                             isValidated=false;
                         }
diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizTemplate.java
@@ -164,7 +164,7 @@ public void onClick(View v) {
 
                 for(int i=0;i<options.size();i++){
                     for(int j=0;j<i;j++){
-                        if(options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())){
+                        if (!options.get(i).getText().toString().trim().isEmpty() && options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())) {
                             Toast.makeText(activity.getApplication(), activity.getString(R.string.same_options), Toast.LENGTH_SHORT).show();
                             isValidated=false;
                         }

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ public void onClick(View v) {`
`231`	`231`
`232`	`232`	`for(int i=0;i<options.size();i++){`
`233`	`233`	`for(int j=0;j<i;j++){`
`234`		`- if(options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())){`
	`234`	`+ if (!options.get(i).getText().toString().trim().isEmpty() && options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())) {`
`235`	`235`	`Toast.makeText(activity.getApplication(), activity.getString(R.string.same_options), Toast.LENGTH_SHORT).show();`
`236`	`236`	`isValidated=false;`
`237`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public void onClick(View v) {`
`164`	`164`
`165`	`165`	`for(int i=0;i<options.size();i++){`
`166`	`166`	`for(int j=0;j<i;j++){`
`167`		`- if(options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())){`
	`167`	`+ if (!options.get(i).getText().toString().trim().isEmpty() && options.get(i).getText().toString().trim().equalsIgnoreCase(options.get(j).getText().toString().trim())) {`
`168`	`168`	`Toast.makeText(activity.getApplication(), activity.getString(R.string.same_options), Toast.LENGTH_SHORT).show();`
`169`	`169`	`isValidated=false;`
`170`	`170`	`}`