Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue in the downloadObserver class that could cause a crash

Browse Source
This commit is contained in:
daniel oeh 2012-07-10 16:45:48 +02:00
parent fc98cc8c79
commit 7088df944c
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/de/podfetcher/activity/DownloadActivity.java
View File

@ -179,7 +179,8 @@ public class DownloadActivity extends SherlockListActivity implements
@Override
public void onFinish() {
Log.d(TAG, "Observer has finished, clearing adapter");
dla.clear();
dla.notifyDataSetChanged();
dla.notifyDataSetInvalidated();
}
}

72
src/de/podfetcher/asynctask/DownloadObserver.java
View File

@ -50,8 +50,6 @@ public class DownloadObserver extends AsyncTask<Void, Void, Void> {
callback.onFinish();
}
}
@Override
protected void onPostExecute(Void result) {
@ -94,40 +92,43 @@ public class DownloadObserver extends AsyncTask<Void, Void, Void> {
long downloadId = getDownloadStatus(cursor,
DownloadManager.COLUMN_ID);
FeedFile feedFile = requester.getFeedFile(downloadId);
DownloadStatus status = findDownloadStatus(feedFile);
if (status == null) {
status = new DownloadStatus(feedFile);
statusList.add(status);
} else {
unhandledItems.remove(status);
}
if (feedFile != null) {
DownloadStatus status = findDownloadStatus(feedFile);
// refresh status
int statusId = getDownloadStatus(cursor,
DownloadManager.COLUMN_STATUS);
getDownloadProgress(cursor, status);
switch (statusId) {
case DownloadManager.STATUS_SUCCESSFUL:
status.statusMsg = R.string.download_successful;
status.successful = true;
status.done = true;
case DownloadManager.STATUS_RUNNING:
status.statusMsg = R.string.download_running;
break;
case DownloadManager.STATUS_FAILED:
status.statusMsg = R.string.download_failed;
requester.notifyDownloadService(context);
status.successful = false;
status.done = true;
status.reason = getDownloadStatus(cursor,
DownloadManager.COLUMN_REASON);
case DownloadManager.STATUS_PENDING:
status.statusMsg = R.string.download_pending;
break;
default:
status.done = true;
status.successful = false;
status.statusMsg = R.string.download_cancelled_msg;
if (status == null) {
status = new DownloadStatus(feedFile);
statusList.add(status);
} else {
unhandledItems.remove(status);
}
// refresh status
int statusId = getDownloadStatus(cursor,
DownloadManager.COLUMN_STATUS);
getDownloadProgress(cursor, status);
switch (statusId) {
case DownloadManager.STATUS_SUCCESSFUL:
status.statusMsg = R.string.download_successful;
status.successful = true;
status.done = true;
case DownloadManager.STATUS_RUNNING:
status.statusMsg = R.string.download_running;
break;
case DownloadManager.STATUS_FAILED:
status.statusMsg = R.string.download_failed;
requester.notifyDownloadService(context);
status.successful = false;
status.done = true;
status.reason = getDownloadStatus(cursor,
DownloadManager.COLUMN_REASON);
case DownloadManager.STATUS_PENDING:
status.statusMsg = R.string.download_pending;
break;
default:
status.done = true;
status.successful = false;
status.statusMsg = R.string.download_cancelled_msg;
}
}
} while (cursor.moveToNext());
}
@ -203,6 +204,7 @@ public class DownloadObserver extends AsyncTask<Void, Void, Void> {
public interface Callback {
public void onProgressUpdate();
public void onFinish();
}