TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle failed MMS connectivity state appropriately.

Browse Source
This commit is contained in:
Moxie Marlinspike 2013-05-07 15:09:24 -07:00
parent 43214a854c
commit e07c1a8e92
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -225,7 +225,7 @@
<string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS message encrypted for non-existing session...</string> <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS message encrypted for non-existing session...</string>
<!-- MmsSender --> <!-- MmsSender -->
<string name="MmsSender_currently_unable_to_send_your_mms_message">Currently unable to send your MMS message. It will be sent once service becomes available.</string> <string name="MmsSender_currently_unable_to_send_your_mms_message">Currently unable to send your MMS message.</string>
<!-- ApplicationMigrationService --> <!-- ApplicationMigrationService -->
<string name="ApplicationMigrationService_import_in_progress">Import in progress</string> <string name="ApplicationMigrationService_import_in_progress">Import in progress</string>

2
src/org/thoughtcrime/securesms/service/MmsDownloader.java
View File

@ -179,7 +179,7 @@ public class MmsDownloader extends MmscProcessor {
if (pendingMessages.isEmpty()) if (pendingMessages.isEmpty())
finishConnectivity(); finishConnectivity();
} else if (!isConnected() && !isConnectivityPossible()) { } else if (!isConnected() && (!isConnectivityPossible() || isConnectivityFailure())) {
pendingMessages.clear(); pendingMessages.clear();
handleDownloadError(downloadItems, MmsDatabase.Status.DOWNLOAD_NO_CONNECTIVITY, handleDownloadError(downloadItems, MmsDatabase.Status.DOWNLOAD_NO_CONNECTIVITY,
context.getString(R.string.MmsDownloader_no_connectivity_available_for_mms_download_try_again_later)); context.getString(R.string.MmsDownloader_no_connectivity_available_for_mms_download_try_again_later));

2
src/org/thoughtcrime/securesms/service/MmsSender.java
View File

@ -170,7 +170,7 @@ public class MmsSender extends MmscProcessor {
protected void handleConnectivityChange() { protected void handleConnectivityChange() {
if (!isConnected()) { if (!isConnected()) {
if (!isConnectivityPossible() && !pendingMessages.isEmpty()) { if ((!isConnectivityPossible() || isConnectivityFailure()) && !pendingMessages.isEmpty()) {
DatabaseFactory.getMmsDatabase(context).markAsSentFailed(pendingMessages.remove().request.getDatabaseMessageId()); DatabaseFactory.getMmsDatabase(context).markAsSentFailed(pendingMessages.remove().request.getDatabaseMessageId());
toastHandler.makeToast(context.getString(R.string.MmsSender_currently_unable_to_send_your_mms_message)); toastHandler.makeToast(context.getString(R.string.MmsSender_currently_unable_to_send_your_mms_message));
Log.w("MmsSender", "Unable to send MMS."); Log.w("MmsSender", "Unable to send MMS.");

10
src/org/thoughtcrime/securesms/service/MmscProcessor.java
View File

@ -66,6 +66,8 @@ public abstract class MmscProcessor {
protected void issueConnectivityRequest() { protected void issueConnectivityRequest() {
int status = connectivityManager.startUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE, FEATURE_ENABLE_MMS); int status = connectivityManager.startUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE, FEATURE_ENABLE_MMS);
Log.w("MmscProcessor", "startUsingNetworkFeature status: " + status);
if (status == APN_ALREADY_ACTIVE) { if (status == APN_ALREADY_ACTIVE) {
issueConnectivityChange(); issueConnectivityChange();
} else if (connectivityListener == null) { } else if (connectivityListener == null) {
@ -77,9 +79,17 @@ public abstract class MmscProcessor {
} }
} }
protected boolean isConnectivityFailure() {
NetworkInfo networkInfo = connectivityManager.getNetworkInfo(TYPE_MOBILE_MMS);
return networkInfo == null || networkInfo.getDetailedState() == NetworkInfo.DetailedState.FAILED;
}
protected boolean isConnectivityPossible() { protected boolean isConnectivityPossible() {
NetworkInfo networkInfo = connectivityManager.getNetworkInfo(TYPE_MOBILE_MMS); NetworkInfo networkInfo = connectivityManager.getNetworkInfo(TYPE_MOBILE_MMS);
Log.w("MmsService", "Got network info: " + networkInfo); Log.w("MmsService", "Got network info: " + networkInfo);
return networkInfo != null && networkInfo.isAvailable(); return networkInfo != null && networkInfo.isAvailable();
} }