Merge/upgrade json extn

odk/collect/collect_app/src/main/java/org/odk/collect/android/instancemanagement/InstanceSubmitter.kt

@@ -9,7 +9,11 @@ import org.odk.collect.android.gdrive.InstanceGoogleSheetsUploader
 import org.odk.collect.android.upload.FormUploadException
 import org.odk.collect.android.upload.InstanceServerUploader
 import org.odk.collect.android.upload.InstanceUploader
-import org.odk.collect.android.utilities.*
+import org.odk.collect.android.utilities.FormsRepositoryProvider
+import org.odk.collect.android.utilities.InstanceAutoDeleteChecker
+import org.odk.collect.android.utilities.InstanceUploaderUtils
+import org.odk.collect.android.utilities.InstancesRepositoryProvider
+import org.odk.collect.android.utilities.WebCredentialsUtils
 import org.odk.collect.forms.FormsRepository
 import org.odk.collect.forms.instances.Instance
 import org.odk.collect.metadata.PropertyManager

odk/collect/collect_app/src/main/java/org/odk/collect/android/openrosa/okhttp/OkHttpConnection.java

@@ -1,10 +1,14 @@
 package org.odk.collect.android.openrosa.okhttp;
 
+import android.webkit.URLUtil;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.apache.commons.io.IOUtils;
+import org.json.JSONException;
 import org.json.JSONObject;
+import org.odk.collect.android.events.FormEventBus;
 import org.odk.collect.android.openrosa.CaseInsensitiveEmptyHeaders;
 import org.odk.collect.android.openrosa.CaseInsensitiveHeaders;
 import org.odk.collect.android.openrosa.HttpCredentialsInterface;
@@ -206,36 +210,56 @@ private HttpPostResult executePostRequest(@NonNull URI uri, @Nullable HttpCreden
 
         Response response;
         HttpPostResult postResult;
+        HttpPostResult failedResult = new HttpPostResult(
+                "Form Upload Failed",
+                HttpURLConnection.HTTP_BAD_REQUEST,
+                "Problem with server configuration");
 
-        if(generalSettings.getString(ProjectKeys.KEY_CUSTOM_SERVER_IS_ENABLED).equals("true")){
-
-            JSONObject headersInfo = new JSONObject(generalSettings.getString(ProjectKeys.KEY_CUSTOM_SERVER_HEADERS));
-            OkHttpClient client = new OkHttpClient();
+        if(generalSettings.getBoolean(ProjectKeys.KEY_CUSTOM_SERVER_IS_ENABLED)){
+            String customHeaders = generalSettings.getString(ProjectKeys.KEY_CUSTOM_SERVER_HEADERS);
             Headers.Builder builder = new Headers.Builder();
-
-            Iterator<String> keys = headersInfo.keys();
-
-            // Iterate through the keys
-            while (keys.hasNext()) {
-                String key = keys.next();
-                String value = headersInfo.getString(key);
-                builder.add(key, value);
+            if (customHeaders != null && !customHeaders.trim().isEmpty()) {
+                try {
+                    JSONObject headersInfo = new JSONObject(customHeaders);
+                    Iterator<String> keys = headersInfo.keys();
+                    // Iterate through the keys
+                    while (keys.hasNext()) {
+                        String key = keys.next();
+                        String value = headersInfo.getString(key);
+                        builder.add(key, value);
+                    }
+                }
+                catch (JSONException e) {
+                    FormEventBus.INSTANCE.formUploadError(
+                            // TODO: return formId
+                            "",
+                            String.format("JSON parsing exception: %s.\nPlease check the value for `KEY_CUSTOM_SERVER_HEADERS` in settings.", e)
+                    );
+                    e.printStackTrace();
+                    return failedResult;
+                }
+            }
+            Headers headers = builder.build();
+            String customServerUrl = generalSettings.getString(ProjectKeys.KEY_CUSTOM_SERVER_URL);
+            if (customServerUrl == null || customServerUrl.isEmpty() || !URLUtil.isValidUrl(customServerUrl)) {
+                FormEventBus.INSTANCE.formUploadError(
+                        // TODO: return formId
+                        "",
+                       "Custom Server URL is invalid! Please check the value for `KEY_CUSTOM_SERVER_URL` in settings."
+                );
+                return failedResult;
             }
-
-            Headers h = builder.build();
-
             Request request = new Request.Builder()
-                    .url(generalSettings.getString(ProjectKeys.KEY_CUSTOM_SERVER_URL))
+                    .url(customServerUrl)
                     .post(multipartBody)
-                    .headers(h)
+                    .headers(headers)
                     .build();
 
-
+            OkHttpClient client = new OkHttpClient();
             Call call = client.newCall(request);
             response = call.execute();
-
-        }else{
-
+        }
+        else {
             OpenRosaServerClient httpClient = clientFactory.get(uri.getScheme(), userAgent, credentials);
 
             Request request = new Request.Builder()

odk/collect/settings/src/main/resources/client-settings.schema.json

@@ -41,7 +41,7 @@
           "type": "string"
         },
         "custom_server_enabled": {
-          "type": "string"
+          "type": "boolean"
         },
         "username": {
           "type": "string"

odk/extension/src/main/java/io/samagra/odk/collect/extension/handlers/ODKActivityHandler.kt

@@ -9,22 +9,20 @@ import org.odk.collect.android.utilities.ApplicationConstants
 
 class ODKActivityHandler : ODKActivityInteractor {
 
-    override fun openDraftFormList(formToFilter: List<String>?, ctx: Context) {
+    override fun openDraftFormsList(formsToFilter: List<String>?, ctx: Context) {
         val i = Intent(ctx, InstanceChooserList::class.java)
         i.putExtra(
             ApplicationConstants.BundleKeys.FORM_MODE,
             ApplicationConstants.FormModes.EDIT_SAVED
         )
-        if (formToFilter != null) {
-            i.putExtra(ApplicationConstants.BundleKeys.FORM_ID, formToFilter.toTypedArray())
+        if (formsToFilter != null) {
+            i.putExtra(ApplicationConstants.BundleKeys.FORM_ID, formsToFilter.toTypedArray())
         }
         ctx.startActivity(i)
     }
 
-    override fun openUnSubmittedFormList(ctx: Context) {
+    override fun openFinalizedFormsList(ctx: Context) {
         val i = Intent(ctx, InstanceUploaderListActivity::class.java)
         ctx.startActivity(i)
     }
-
-
 }

odk/extension/src/main/java/io/samagra/odk/collect/extension/interactors/ODKActivityInteractor.kt

@@ -11,14 +11,14 @@ interface ODKActivityInteractor {
 
     /**
      * Opens the draft form list screen in ODK Collect.
-     * @param formToFilter A list of form names to filter the draft forms. Can be null to show all draft forms.
+     * @param formsToFilter A list of form names to filter the draft forms. Can be null to show all draft forms.
      * @param ctx The context of the calling activity.
      **/
-    fun openDraftFormList(formToFilter: List<String>?, ctx: Context)
+    fun openDraftFormsList(formsToFilter: List<String>?, ctx: Context)
 
     /**
      * Opens the list of un-submitted forms screen in ODK Collect.
      * @param ctx The context of the calling activity.
      */
-    fun openUnSubmittedFormList(ctx: Context)
+    fun openFinalizedFormsList(ctx: Context)
 }

sample/src/main/AndroidManifest.xml

@@ -41,6 +41,7 @@
         <activity
             android:name=".FormsListActivity"
             android:exported="false" />
+        <activity android:name="io.samagra.oce_sample.InBuiltScreensActivity" />
     </application>
 
 </manifest>

sample/src/main/java/io/samagra/oce_sample/InBuiltScreensActivity.kt

@@ -16,10 +16,10 @@ class InBuiltScreensActivity : AppCompatActivity() {
         setContentView(R.layout.activity_in_built_screens)
         setSupportActionBar(findViewById(R.id.toolbar))
         findViewById<Button>(R.id.drafts_list_btn).setOnClickListener {
-            odkInteractor.openDraftFormList(null, this)
+            odkInteractor.openDraftFormsList(null, this)
         }
         findViewById<Button>(R.id.unsent_list_btn).setOnClickListener {
-            odkInteractor.openUnSubmittedFormList(this)
+            odkInteractor.openFinalizedFormsList(this)
         }
     }