Bugfix for adding functionOptions >1x

Author: Brian Melton

Templates/Android/generated/BaseMethodRequestBuilder.java.tt

@@ -16,7 +16,7 @@
      * @param client The service client
      * @param options The options for this request
      */
-    public <#=BaseTypeRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> options<#=MethodParametersSignature(c.AsOdcmMethod())#>) {
+    public <#=BaseTypeRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> options<#=MethodParametersSignature(method)#>) {
         super(requestUrl, client, options);
 <#     foreach (var p in method.Parameters) { #>
 <#         if (isPost) { #>
@@ -50,16 +50,16 @@
                 options
         );
 
-<# foreach (var p in c.AsOdcmMethod().Parameters) { #>
-<#     if (isPost) { #>
-        if (hasParameter("<#=ParamName(p)#>")) {
+<# if (isPost) { #>
+  <# foreach (var p in c.AsOdcmMethod().Parameters) { #>
+      if (hasParameter("<#=ParamName(p)#>")) {
             request.mBody.<#=ParamName(p)#> = getParameter("<#=ParamName(p)#>");
         }
-<#     } else { #>
+  <# } #>
+<# } else { #>
       for (FunctionOption option : mFunctionOptions) {
             request.addFunctionOption(option);
-        }
-<#     } #>
+      }
 <# } #>
 
         return request;