cwinfo/envayasms
5
0
Fork 0
mirror of https://github.com/cwinfo/envayasms.git synced 2024-11-09 10:20:25 +00:00
Code Releases Activity

set phone number and api version as regular post fields instead of custom http headers

Browse Source
This commit is contained in:
Jesse Young 2011-09-13 11:31:01 -07:00
parent e4cea3bae3
commit bead45360f
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/php/KalSMS.php
View File

@ -18,7 +18,7 @@ class KalSMS
static function new_from_request() static function new_from_request()
{ {
$version = @$_SERVER['HTTP_X_KALSMS_VERSION']; $version = @$_POST['version'];
return new KalSMS(); return new KalSMS();
} }
@ -56,7 +56,7 @@ class KalSMS
function get_request_phone_number() function get_request_phone_number()
{ {
return @$_SERVER['HTTP_X_KALSMS_PHONENUMBER']; return @$_POST['phone_number'];
} }
function is_validated_request($correct_password) function is_validated_request($correct_password)

29
src/org/envaya/kalsms/HttpTask.java
View File

@ -10,6 +10,7 @@ import java.io.InputStream;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
@ -48,10 +49,10 @@ public class HttpTask extends AsyncTask<BasicNameValuePair, Void, HttpResponse>
return new DefaultHttpClient(httpParameters); return new DefaultHttpClient(httpParameters);
} }
private String getSignature(String url, BasicNameValuePair... params) private String getSignature(String url, List<BasicNameValuePair> params)
{ {
try { try {
Arrays.sort(params, new Comparator() { Collections.sort(params, new Comparator() {
public int compare(Object o1, Object o2) public int compare(Object o1, Object o2)
{ {
return ((BasicNameValuePair)o1).getName().compareTo(((BasicNameValuePair)o2).getName()); return ((BasicNameValuePair)o1).getName().compareTo(((BasicNameValuePair)o2).getName());
@ -97,13 +98,17 @@ public class HttpTask extends AsyncTask<BasicNameValuePair, Void, HttpResponse>
} }
HttpPost post = new HttpPost(url); HttpPost post = new HttpPost(url);
post.setEntity(new UrlEncodedFormEntity(Arrays.asList(params)));
String signature = this.getSignature(url, params);
post.setHeader("X-Kalsms-Version", "2"); List<BasicNameValuePair> paramList
post.setHeader("X-Kalsms-PhoneNumber", app.getPhoneNumber()); = new ArrayList<BasicNameValuePair>(Arrays.asList(params));
paramList.add(new BasicNameValuePair("version", "2"));
paramList.add(new BasicNameValuePair("phone_number", app.getPhoneNumber()));
post.setEntity(new UrlEncodedFormEntity(paramList));
String signature = this.getSignature(url, paramList);
post.setHeader("X-Kalsms-Signature", signature); post.setHeader("X-Kalsms-Signature", signature);
HttpClient client = getHttpClient(); HttpClient client = getHttpClient();
@ -126,11 +131,17 @@ public class HttpTask extends AsyncTask<BasicNameValuePair, Void, HttpResponse>
return null; return null;
} }
} }
catch (Throwable ex) catch (IOException ex)
{ {
app.logError("Error while contacting server", ex); app.logError("Error while contacting server", ex);
return null; return null;
} }
catch (Throwable ex)
{
app.logError("Unexpected error while contacting server", ex, true);
return null;
}
} }
protected String getDefaultToAddress() protected String getDefaultToAddress()