corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 742790 - Part 4/5: Android implementation, r=mounir,blassey

Browse Source
This commit is contained in:
Vicamo Yang
2012-10-30 18:53:31 +08:00
parent c72df9dbae
commit cf03889f87
6 changed files with 178 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
embedding/android/GeckoSmsManager.java
View File

@@ -314,7 +314,7 @@ public class GeckoSmsManager
private final static int kSmsTypeSentbox = 2;
/*
* Keep the following error codes in syng with |DeliveryState| in:
* Keep the following state codes in syng with |DeliveryState| in:
* dom/sms/src/Types.h
*/
private final static int kDeliveryStateSent = 0;
@@ -322,7 +322,25 @@ public class GeckoSmsManager
private final static int kDeliveryStateUnknown = 2;
private final static int kDeliveryStateEndGuard = 3;
private final static String[] kRequiredMessageRows = new String[] { "_id", "address", "body", "date", "type" };
/*
* Keep the following status codes in sync with |DeliveryStatus| in:
* dom/sms/src/Types.h
*/
private final static int kDeliveryStatusNotApplicable = 0;
private final static int kDeliveryStatusSuccess = 1;
private final static int kDeliveryStatusPending = 2;
private final static int kDeliveryStatusError = 3;
/*
* android.provider.Telephony.Sms.STATUS_*. Duplicated because they're not
* part of Android public API.
*/
private final static int kInternalDeliveryStatusNone = -1;
private final static int kInternalDeliveryStatusComplete = 0;
private final static int kInternalDeliveryStatusPending = 32;
private final static int kInternalDeliveryStatusFailed = 64;
private final static String[] kRequiredMessageRows = new String[] { "_id", "address", "body", "date", "type", "status" };
public GeckoSmsManager() {
SmsIOThread.getInstance().start();
@@ -420,9 +438,12 @@ public class GeckoSmsManager
bundle.getLong("processId"));
Log.i("GeckoSmsManager", "SMS sending failed!");
} else {
// It seems unlikely to get a result code for a failure to deliver.
// Even if, we don't want to do anything with this.
Log.e("GeckoSmsManager", "SMS failed to be delivered... is that even possible?");
GeckoAppShell.notifySmsDelivery(envelope.getMessageId(),
kDeliveryStatusError,
bundle.getString("number"),
bundle.getString("message"),
envelope.getMessageTimestamp());
Log.i("GeckoSmsManager", "SMS delivery failed!");
}
} else {
if (part == Envelope.SubParts.SENT_PART) {
@@ -441,10 +462,11 @@ public class GeckoSmsManager
Log.i("GeckoSmsManager", "SMS sending was successfull!");
} else {
GeckoAppShell.notifySmsDelivered(envelope.getMessageId(),
bundle.getString("number"),
bundle.getString("message"),
envelope.getMessageTimestamp());
GeckoAppShell.notifySmsDelivery(envelope.getMessageId(),
kDeliveryStatusSuccess,
bundle.getString("number"),
bundle.getString("message"),
envelope.getMessageTimestamp());
Log.i("GeckoSmsManager", "SMS succesfully delivered!");
}
}
@@ -555,6 +577,8 @@ public class GeckoSmsManager
values.put("address", aRecipient);
values.put("body", aBody);
values.put("date", aDate);
// Always 'PENDING' because we always request status report.
values.put("status", kInternalDeliveryStatusPending);
ContentResolver cr = GeckoApp.mAppContext.getContentResolver();
Uri uri = cr.insert(kSmsSentContentUri, values);
@@ -613,18 +637,22 @@ public class GeckoSmsManager
}
int type = cursor.getInt(cursor.getColumnIndex("type"));
int deliveryStatus;
String sender = "";
String receiver = "";
if (type == kSmsTypeInbox) {
deliveryStatus = kDeliveryStatusSuccess;
sender = cursor.getString(cursor.getColumnIndex("address"));
} else if (type == kSmsTypeSentbox) {
deliveryStatus = getGeckoDeliveryStatus(cursor.getInt(cursor.getColumnIndex("status")));
receiver = cursor.getString(cursor.getColumnIndex("address"));
} else {
throw new InvalidTypeException();
}
GeckoAppShell.notifyGetSms(cursor.getInt(cursor.getColumnIndex("_id")),
deliveryStatus,
receiver, sender,
cursor.getString(cursor.getColumnIndex("body")),
cursor.getLong(cursor.getColumnIndex("date")),
@@ -778,12 +806,15 @@ public class GeckoSmsManager
cursor.moveToFirst();
int type = cursor.getInt(cursor.getColumnIndex("type"));
int deliveryStatus;
String sender = "";
String receiver = "";
if (type == kSmsTypeInbox) {
deliveryStatus = kDeliveryStatusSuccess;
sender = cursor.getString(cursor.getColumnIndex("address"));
} else if (type == kSmsTypeSentbox) {
deliveryStatus = getGeckoDeliveryStatus(cursor.getInt(cursor.getColumnIndex("status")));
receiver = cursor.getString(cursor.getColumnIndex("address"));
} else {
throw new UnexpectedDeliveryStateException();
@@ -793,6 +824,7 @@ public class GeckoSmsManager
closeCursor = false;
GeckoAppShell.notifyListCreated(listId,
cursor.getInt(cursor.getColumnIndex("_id")),
deliveryStatus,
receiver, sender,
cursor.getString(cursor.getColumnIndex("body")),
cursor.getLong(cursor.getColumnIndex("date")),
@@ -844,12 +876,15 @@ public class GeckoSmsManager
}
int type = cursor.getInt(cursor.getColumnIndex("type"));
int deliveryStatus;
String sender = "";
String receiver = "";
if (type == kSmsTypeInbox) {
deliveryStatus = kDeliveryStatusSuccess;
sender = cursor.getString(cursor.getColumnIndex("address"));
} else if (type == kSmsTypeSentbox) {
deliveryStatus = getGeckoDeliveryStatus(cursor.getInt(cursor.getColumnIndex("status")));
receiver = cursor.getString(cursor.getColumnIndex("address"));
} else {
throw new UnexpectedDeliveryStateException();
@@ -857,6 +892,7 @@ public class GeckoSmsManager
int listId = MessagesListManager.getInstance().add(cursor);
GeckoAppShell.notifyGotNextMessage(cursor.getInt(cursor.getColumnIndex("_id")),
deliveryStatus,
receiver, sender,
cursor.getString(cursor.getColumnIndex("body")),
cursor.getLong(cursor.getColumnIndex("date")),
@@ -890,6 +926,19 @@ public class GeckoSmsManager
MessagesListManager.getInstance().clear();
}
private int getGeckoDeliveryStatus(int aDeliveryStatus) {
if (aDeliveryStatus == kInternalDeliveryStatusNone) {
return kDeliveryStatusNotApplicable;
}
if (aDeliveryStatus >= kInternalDeliveryStatusFailed) {
return kDeliveryStatusError;
}
if (aDeliveryStatus >= kInternalDeliveryStatusPending) {
return kDeliveryStatusPending;
}
return kDeliveryStatusSuccess;
}
class IdTooHighException extends Exception {
private static final long serialVersionUID = 395697882128640L;
}