TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-22 16:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for concurrentmodificationexception on race condition.

Browse Source
This commit is contained in:
Moxie Marlinspike 2013-02-26 22:56:48 -08:00
parent eb9b2ef318
commit 5ca7b1080c
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,24 +138,28 @@ public class MmsDownloader extends MmscProcessor {
} }
protected void handleConnectivityChange() { protected void handleConnectivityChange() {
if (!isConnected()) { LinkedList<DownloadItem> downloadItems = (LinkedList<DownloadItem>)pendingMessages.clone();
if (!isConnectivityPossible() && !pendingMessages.isEmpty()) {
DatabaseFactory.getMmsDatabase(context).markDownloadState(pendingMessages.remove().getMessageId(), MmsDatabase.Types.DOWNLOAD_NO_CONNECTIVITY);
toastHandler.makeToast(context
.getString(R.string.MmsDownloader_no_connectivity_available_for_mms_download_try_again_later));
Log.w("MmsDownloadService", "Unable to download MMS, please try again later.");
finishConnectivity();
}
return; if (isConnected()) {
} pendingMessages.clear();
for (DownloadItem item : pendingMessages) { for (DownloadItem item : downloadItems) {
downloadMms(item); downloadMms(item);
} }
pendingMessages.clear();
finishConnectivity(); finishConnectivity();
} else if (!isConnected() && !isConnectivityPossible()) {
pendingMessages.clear();
for (DownloadItem item : downloadItems) {
DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Types.DOWNLOAD_NO_CONNECTIVITY);
}
toastHandler.makeToast(context
.getString(R.string.MmsDownloader_no_connectivity_available_for_mms_download_try_again_later));
finishConnectivity();
}
} }