Build-Included forms: Form related media not copied to sdcard

[geoodk]

Build-Included forms: Form related media not copied to sdcard

[karner]

The project I'm working on is at the moment not publicly available, but this is the code which processes media folders by checking the filename. If it ends with "-media" which is the naming for the media folders it will create the folder on the sd card and copy all containing files over to the sdcard directory. This currently only works for files, not for nested directories. I can't commit this to this repo at the moment, but this is the new method copyFormMedia() and the updated method copyForms() from GeoODK.java

private void copyFormMedia(String foldername){
    AssetManager assetManager = getAssets();
    String[] assetList = null;
    try {
        assetList = assetManager.list("forms" + File.separator + foldername);
    } catch (IOException e) {
        // TODO Auto-generated catch block
        e.printStackTrace();
    }

    for (String assetName : assetList) {
        InputStream in = null;
        OutputStream out = null;
        File outFile = new File(FORMS_PATH + File.separator + foldername + File.separator + assetName);
        if (!outFile.exists()) {
            try {
                in = assetManager.open("forms" + File.separator + foldername + File.separator + assetName);
                out = new FileOutputStream(FORMS_PATH + File.separator + foldername + File.separator + assetName);
                copyFile(in, out);
                in.close();
                out.flush();
                out.close();
                in = null;
                out = null;

            } catch (IOException e) {
                Log.e("tag", "Failed to copy asset file: " + FORMS_PATH + File.separator, e);
            }
        }
    }
}

private void copyForms(String[] forms) {
    AssetManager assetManager = getAssets();
    InputStream in = null;
    OutputStream out = null;
    for (int i = 0; forms.length > i; i++) {
        String filename = forms[i];
        File form_file = new File(FORMS_PATH, filename);
        if (filename.endsWith("-media")) {
            boolean success = true;
            if (!form_file.exists()) {
                success = form_file.mkdir();
            }
            if (!success){
                Log.e("tag", "Failed to create media folder: " + FORMS_PATH + File.separator + filename);
                continue;
            }
            copyFormMedia(filename);
        } else {
            if (!form_file.exists()) {
                try {
                    in = assetManager.open("forms/" + filename);
                    out = new FileOutputStream(FORMS_PATH + File.separator + filename);
                    copyFile(in, out);
                    in.close();
                    out.flush();
                    out.close();
                    in = null;
                    out = null;

                } catch (IOException e) {
                    Log.e("tag", "Failed to copy asset file: " + FORMS_PATH + File.separator + forms[i], e);
                }
            }
        }
        System.out.println(forms[i]);
    }

}