Skip to content

Commit 5d46b32

Browse files
author
Hevin
committed
Merge branch 'v2-dev' into v2
2 parents 538c9cb + a8664c9 commit 5d46b32

File tree

6 files changed

+39
-39
lines changed

6 files changed

+39
-39
lines changed

‎Jiguang.JPush.dll‎

512 Bytes
Binary file not shown.

‎Jiguang.JPush/DeviceClient.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public async Task<HttpResponse> GetDeviceInfoAsync(string registrationId)
2323
throw new ArgumentNullException(registrationId);
2424

2525
var url = BASE_URL + "/v3/devices/" + registrationId;
26-
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url);
27-
var content = await msg.Content.ReadAsStringAsync();
26+
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url).ConfigureAwait(false);
27+
var content = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
2828
return new HttpResponse(msg.StatusCode, msg.Headers, content);
2929
}
3030

@@ -54,8 +54,8 @@ public async Task<HttpResponse> UpdateDeviceInfoAsync(string registrationId, str
5454

5555
var url = BASE_URL + "/v3/devices/" + registrationId;
5656
HttpContent requestContent = new StringContent(json, Encoding.UTF8);
57-
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent);
58-
string responseContent = await msg.Content.ReadAsStringAsync();
57+
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent).ConfigureAwait(false);
58+
string responseContent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
5959
return new HttpResponse(msg.StatusCode, msg.Headers, responseContent);
6060
}
6161

@@ -75,8 +75,8 @@ public async Task<HttpResponse> GetDevicesByAliasAsync(string alias, string plat
7575
if (!string.IsNullOrEmpty(platform))
7676
url += "?platform=" + platform;
7777

78-
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url);
79-
string responseConetent = await msg.Content.ReadAsStringAsync();
78+
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url).ConfigureAwait(false);
79+
string responseConetent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
8080
return new HttpResponse(msg.StatusCode, msg.Headers, responseConetent);
8181
}
8282

@@ -96,7 +96,7 @@ public async Task<HttpResponse> DeleteAliasAsync(string alias, string platform)
9696
if (!string.IsNullOrEmpty(platform))
9797
url += "?platform=" + platform;
9898

99-
HttpResponseMessage msg = await JPushClient.HttpClient.DeleteAsync(url);
99+
HttpResponseMessage msg = await JPushClient.HttpClient.DeleteAsync(url).ConfigureAwait(false);
100100
return new HttpResponse(msg.StatusCode, msg.Headers, "");
101101
}
102102

@@ -108,8 +108,8 @@ public async Task<HttpResponse> DeleteAliasAsync(string alias, string platform)
108108
public async Task<HttpResponse> GetTagsAsync()
109109
{
110110
var url = BASE_URL + "/v3/tags/";
111-
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url);
112-
string responseContent = await msg.Content.ReadAsStringAsync();
111+
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url).ConfigureAwait(false);
112+
string responseContent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
113113
return new HttpResponse(msg.StatusCode, msg.Headers, responseContent);
114114
}
115115

@@ -127,8 +127,8 @@ public async Task<HttpResponse> IsDeviceInTagAsync(string registrationId, string
127127
throw new ArgumentNullException(nameof(tag));
128128

129129
var url = BASE_URL + "/v3/tags/" + tag + "/registration_ids/" + registrationId;
130-
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url);
131-
string responseContent = await msg.Content.ReadAsStringAsync();
130+
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url).ConfigureAwait(false);
131+
string responseContent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
132132
return new HttpResponse(msg.StatusCode, msg.Headers, responseContent);
133133
}
134134

@@ -154,7 +154,7 @@ public async Task<HttpResponse> AddDevicesToTagAsync(string tag, List<string> re
154154
};
155155

156156
var requestContent = new StringContent(jObj.ToString(), Encoding.UTF8);
157-
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent);
157+
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent).ConfigureAwait(false);
158158
return new HttpResponse(msg.StatusCode, msg.Headers, "");
159159
}
160160

@@ -183,7 +183,7 @@ public async Task<HttpResponse> RemoveDevicesFromTagAsync(string tag, List<strin
183183
};
184184

185185
var requestContent = new StringContent(jObj.ToString(), Encoding.UTF8);
186-
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent);
186+
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent).ConfigureAwait(false);
187187
return new HttpResponse(msg.StatusCode, msg.Headers, "");
188188
}
189189

@@ -202,7 +202,7 @@ public async Task<HttpResponse> DeleteTagAsync(string tag, string platform)
202202
if (!string.IsNullOrEmpty(platform))
203203
url += "?platform=" + platform;
204204

205-
HttpResponseMessage msg = await JPushClient.HttpClient.DeleteAsync(url);
205+
HttpResponseMessage msg = await JPushClient.HttpClient.DeleteAsync(url).ConfigureAwait(false);
206206
return new HttpResponse(msg.StatusCode, msg.Headers, "");
207207
}
208208

@@ -220,8 +220,8 @@ public async Task<HttpResponse> GetUserOnlineStatusAsync(List<string> registrati
220220

221221
var requestJson = JsonConvert.SerializeObject(registrationIds);
222222
HttpContent requestContent = new StringContent(requestJson, Encoding.UTF8);
223-
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent);
224-
string responseContent = await msg.Content.ReadAsStringAsync();
223+
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent).ConfigureAwait(false);
224+
string responseContent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
225225
return new HttpResponse(msg.StatusCode, msg.Headers, responseContent);
226226
}
227227
}

‎Jiguang.JPush/JPushClient.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public async Task<HttpResponse> SendPushAsync(string jsonBody)
5353
throw new ArgumentNullException(nameof(jsonBody));
5454

5555
HttpContent httpContent = new StringContent(jsonBody, Encoding.UTF8);
56-
HttpResponseMessage msg = await HttpClient.PostAsync(BASE_URL, httpContent);
57-
var content = await msg.Content.ReadAsStringAsync();
56+
HttpResponseMessage msg = await HttpClient.PostAsync(BASE_URL, httpContent).ConfigureAwait(false);
57+
var content = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
5858
return new HttpResponse(msg.StatusCode, msg.Headers, content);
5959
}
6060

@@ -74,8 +74,8 @@ public async Task<HttpResponse> IsPushValidAsync(string jsonBody)
7474

7575
HttpContent httpContent = new StringContent(jsonBody, Encoding.UTF8);
7676
var url = BASE_URL + "/validate";
77-
HttpResponseMessage msg = await HttpClient.PostAsync(url, httpContent);
78-
var content = await msg.Content.ReadAsStringAsync();
77+
HttpResponseMessage msg = await HttpClient.PostAsync(url, httpContent).ConfigureAwait(false);
78+
var content = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
7979
return new HttpResponse(msg.StatusCode, msg.Headers, content);
8080
}
8181

@@ -103,8 +103,8 @@ public async Task<HttpResponse> GetCIdListAsync(int? count, string type)
103103
url += ("&type=" + type);
104104
}
105105

106-
HttpResponseMessage msg = await HttpClient.GetAsync(url);
107-
var content = await msg.Content.ReadAsStringAsync();
106+
HttpResponseMessage msg = await HttpClient.GetAsync(url).ConfigureAwait(false);
107+
var content = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
108108
return new HttpResponse(msg.StatusCode, msg.Headers, content);
109109
}
110110
}

‎Jiguang.JPush/Jiguang.JPush.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Product>JPush</Product>
1212
<Copyright>MIT</Copyright>
1313
<PackageLicenseUrl></PackageLicenseUrl>
14-
<Version>1.0.6</Version>
14+
<Version>1.0.7</Version>
1515
</PropertyGroup>
1616

1717
<ItemGroup>

‎Jiguang.JPush/ReportClient.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public async Task<HttpResponse> GetMessageReportAsync(List<string> msgIdList)
2222

2323
var msgIds = string.Join(",", msgIdList);
2424
var url = BASE_URL + "received?msg_ids=" + msgIds;
25-
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url);
26-
var content = await msg.Content.ReadAsStringAsync();
25+
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url).ConfigureAwait(false);
26+
var content = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
2727
return new HttpResponse(msg.StatusCode, msg.Headers, content);
2828
}
2929

@@ -40,8 +40,8 @@ public async Task<HttpResponse> GetMessageDetailReportAsync(List<string> msgIdLi
4040

4141
var msgIds = string.Join(",", msgIdList);
4242
var url = BASE_URL + "messages?msg_ids=" + msgIds;
43-
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url);
44-
var content = await msg.Content.ReadAsStringAsync();
43+
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url).ConfigureAwait(false);
44+
var content = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
4545
return new HttpResponse(msg.StatusCode, msg.Headers, content);
4646
}
4747

@@ -57,8 +57,8 @@ public async Task<HttpResponse> GetUserReportAsync(string timeUnit, string start
5757
throw new ArgumentOutOfRangeException(nameof(duration));
5858

5959
var url = BASE_URL + "users?time_unit=" + timeUnit + "&start=" + startTime + "&duration=" + duration;
60-
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url);
61-
var content = await msg.Content.ReadAsStringAsync();
60+
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url).ConfigureAwait(false);
61+
var content = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
6262
return new HttpResponse(msg.StatusCode, msg.Headers, content);
6363
}
6464
}

‎Jiguang.JPush/ScheduleClient.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ public async Task<HttpResponse> CreateScheduleTaskAsync(string json)
9191

9292
var url = BASE_URL + "/v3/schedules";
9393
HttpContent requestContent = new StringContent(json, Encoding.UTF8);
94-
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent);
95-
string responseContent = await msg.Content.ReadAsStringAsync();
94+
HttpResponseMessage msg = await JPushClient.HttpClient.PostAsync(url, requestContent).ConfigureAwait(false);
95+
string responseContent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
9696
return new HttpResponse(msg.StatusCode, msg.Headers, responseContent);
9797
}
9898

@@ -112,8 +112,8 @@ public async Task<HttpResponse> GetValidScheduleTasksAsync(int page = 1)
112112
throw new ArgumentNullException(nameof(page));
113113

114114
var url = BASE_URL + "/v3/schedules?page=" + page;
115-
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url);
116-
string responseContent = await msg.Content.ReadAsStringAsync();
115+
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url).ConfigureAwait(false);
116+
string responseContent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
117117
return new HttpResponse(msg.StatusCode, msg.Headers, responseContent);
118118
}
119119

@@ -128,8 +128,8 @@ public async Task<HttpResponse> GetScheduleTaskAsync(string scheduleId)
128128
throw new ArgumentNullException(nameof(scheduleId));
129129

130130
var url = BASE_URL + "/v3/schedules/" + scheduleId;
131-
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url);
132-
string responseContent = await msg.Content.ReadAsStringAsync();
131+
HttpResponseMessage msg = await JPushClient.HttpClient.GetAsync(url).ConfigureAwait(false);
132+
string responseContent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
133133
return new HttpResponse(msg.StatusCode, msg.Headers, responseContent);
134134
}
135135

@@ -218,8 +218,8 @@ public async Task<HttpResponse> UpdateScheduleTaskAsync(string scheduleId, strin
218218

219219
var url = BASE_URL + "/v3/schedules/" + scheduleId;
220220
HttpContent requestContent = new StringContent(json, Encoding.UTF8);
221-
HttpResponseMessage msg = await JPushClient.HttpClient.PutAsync(url, requestContent);
222-
string responseContent = await msg.Content.ReadAsStringAsync();
221+
HttpResponseMessage msg = await JPushClient.HttpClient.PutAsync(url, requestContent).ConfigureAwait(false);
222+
string responseContent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
223223
return new HttpResponse(msg.StatusCode, msg.Headers, responseContent);
224224
}
225225

@@ -229,8 +229,8 @@ public async Task<HttpResponse> DeleteScheduleTaskAsync(string scheduleId)
229229
throw new ArgumentNullException(nameof(scheduleId));
230230

231231
var url = BASE_URL + "/v3/schedules/" + scheduleId;
232-
HttpResponseMessage msg = await JPushClient.HttpClient.DeleteAsync(url);
233-
string responseContent = await msg.Content.ReadAsStringAsync();
232+
HttpResponseMessage msg = await JPushClient.HttpClient.DeleteAsync(url).ConfigureAwait(false);
233+
string responseContent = await msg.Content.ReadAsStringAsync().ConfigureAwait(false);
234234
return new HttpResponse(msg.StatusCode, msg.Headers, responseContent);
235235
}
236236
}

0 commit comments

Comments
 (0)