mirror of
https://github.com/apache/cordova-plugin-file-transfer.git
synced 2026-04-28 00:02:49 +08:00
fixed merge anomaly error
This commit is contained in:
@@ -325,11 +325,8 @@ namespace WPCordovaClassLib.Cordova.Commands
|
|||||||
string temp = jsonHeaders.StartsWith("{") ? jsonHeaders.Substring(1) : jsonHeaders;
|
string temp = jsonHeaders.StartsWith("{") ? jsonHeaders.Substring(1) : jsonHeaders;
|
||||||
temp = temp.EndsWith("}") ? temp.Substring(0, temp.Length - 1) : temp;
|
temp = temp.EndsWith("}") ? temp.Substring(0, temp.Length - 1) : temp;
|
||||||
|
|
||||||
string[] strHeaders = temp.Split(',');
|
string[] strHeaders = temp.Split(',');
|
||||||
for (int n = 0; n < strHeaders.Length; n++)
|
for (int n = 0; n < strHeaders.Length; n++)
|
||||||
{
|
|
||||||
string[] split = strHeaders[n].Split(":".ToCharArray(), 2);
|
|
||||||
if (split.Length == 2)
|
|
||||||
{
|
{
|
||||||
string[] split = strHeaders[n].Split(':');
|
string[] split = strHeaders[n].Split(':');
|
||||||
if (split.Length == 2)
|
if (split.Length == 2)
|
||||||
@@ -338,6 +335,8 @@ namespace WPCordovaClassLib.Cordova.Commands
|
|||||||
split[1] = JSON.JsonHelper.Deserialize<string>(split[1]);
|
split[1] = JSON.JsonHelper.Deserialize<string>(split[1]);
|
||||||
result[split[0]] = split[1];
|
result[split[0]] = split[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -349,6 +348,7 @@ namespace WPCordovaClassLib.Cordova.Commands
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void download(string options)
|
public void download(string options)
|
||||||
{
|
{
|
||||||
TransferOptions downloadOptions = null;
|
TransferOptions downloadOptions = null;
|
||||||
|
|||||||
Reference in New Issue
Block a user