Merge pull request #484 from fieldsight/483-hotfix/removes-mul-form-e…

…rror bumped to 3.2.14; removes mul form error (#483)
fieldsight · Nov 12, 2019 · 2b1f201 · 2b1f201
2 parents 27d33c6 + b602d08
commit 2b1f201
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -23,7 +23,7 @@ def mapboxToken = secrets.getProperty('MAPBOX_ACCESS_TOKEN', '')
 
 def versionMajor = 3
 def versionMinor = 2
-def versionPatch = 12
+def versionPatch = 14
 
 android {
     compileSdkVersion(28)

diff --git a/collect_app/internal/output.json b/collect_app/internal/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3211,"versionName":"3.2.11-beta","enabled":true,"outputFile":"collect-internal3.2.11-beta.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal3.2.11-beta.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3212,"versionName":"3.2.12-beta","enabled":true,"outputFile":"collect-internal3.2.12-beta.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal3.2.12-beta.apk","properties":{}}]
diff --git a/collect_app/release/output.json b/collect_app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3211,"versionName":"3.2.11","enabled":true,"outputFile":"collect-release3.2.11.apk","fullName":"release","baseName":"release"},"path":"collect-release3.2.11.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3213,"versionName":"3.2.13","enabled":true,"outputFile":"collect-release3.2.13.apk","fullName":"release","baseName":"release"},"path":"collect-release3.2.13.apk","properties":{}}]
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java b/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryActivity.java
@@ -539,7 +539,8 @@ private void loadFromIntent(Intent intent) {
             }
 
             int formCount = FormsDaoHelper.getFormsCount(selection, selectionArgs);
-            int fallBackFormCount = -1;
+            int fallBackFormCount;
+
             if (formCount < 1) {
                 selection = FormsColumns.JR_FORM_ID + "=?";
                 selectionArgs = new String[]{jrFormId};
@@ -566,10 +567,10 @@ private void loadFromIntent(Intent intent) {
                  * Still take the first entry, but warn that there are multiple rows. User will
                  * need to hand-edit the SQLite database to fix it.
                  */
-                if (formCount > 1) {
-                    createErrorDialog(getString(R.string.survey_multiple_forms_error), EXIT);
-                    return;
-                }
+//                if (formCount > 1) {
+//                    createErrorDialog(getString(R.string.survey_multiple_forms_error), EXIT);
+//                    return;
+//                }
             }
         } else if (uriMimeType != null
                 && uriMimeType.equals(FormsColumns.CONTENT_ITEM_TYPE)) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3211,"versionName":"3.2.11-beta","enabled":true,"outputFile":"collect-internal3.2.11-beta.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal3.2.11-beta.apk","properties":{}}]
		[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3212,"versionName":"3.2.12-beta","enabled":true,"outputFile":"collect-internal3.2.12-beta.apk","fullName":"internal","baseName":"internal"},"path":"collect-internal3.2.12-beta.apk","properties":{}}]