Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follow download progress in AppDetails

Browse Source 
Added a new thread to update the AppDetails screen with the progress of the
download once per second.
This commit is contained in:
Toby Kurien 2015-09-11 15:13:43 -07:00 committed by Daniel Martí
parent 860bc8ae97
commit 6d6d9bc7cd
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java
View File

@ -10,6 +10,7 @@ import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@ -30,11 +31,14 @@ import java.io.OutputStream;
public class AsyncDownloaderFromAndroid implements AsyncDownloader { public class AsyncDownloaderFromAndroid implements AsyncDownloader {
private final Context context; private final Context context;
private final DownloadManager dm; private final DownloadManager dm;
private final LocalBroadcastManager localBroadcastManager;
private File localFile; private File localFile;
private String remoteAddress; private String remoteAddress;
private String downloadTitle; private String downloadTitle;
private String uniqueDownloadId; private String uniqueDownloadId;
private Listener listener; private Listener listener;
private Thread progressThread;
private boolean isCancelled;
private long downloadManagerId = -1; private long downloadManagerId = -1;
@ -58,10 +62,13 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader {
} }
dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE); dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
localBroadcastManager = LocalBroadcastManager.getInstance(context);
} }
@Override @Override
public void download() { public void download() {
isCancelled = false;
// Check if the download is complete // Check if the download is complete
if ((downloadManagerId = isDownloadComplete(context, uniqueDownloadId)) > 0) { if ((downloadManagerId = isDownloadComplete(context, uniqueDownloadId)) > 0) {
// clear the notification // clear the notification
@ -94,6 +101,17 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader {
context.registerReceiver(receiver, context.registerReceiver(receiver,
new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)); new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
progressThread = new Thread() {
@Override
public void run() {
while (!isCancelled && isDownloading(context, uniqueDownloadId) >= 0) {
try { Thread.sleep(1000); } catch (Exception e) {}
sendProgress(getBytesRead(), getTotalBytes());
}
}
};
progressThread.start();
} }
/** /**
@ -155,8 +173,17 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader {
return 0; return 0;
} }
protected void sendProgress(int bytesRead, int totalBytes) {
Intent intent = new Intent(Downloader.LOCAL_ACTION_PROGRESS);
intent.putExtra(Downloader.EXTRA_ADDRESS, remoteAddress);
intent.putExtra(Downloader.EXTRA_BYTES_READ, bytesRead);
intent.putExtra(Downloader.EXTRA_TOTAL_BYTES, totalBytes);
localBroadcastManager.sendBroadcast(intent);
}
@Override @Override
public void attemptCancel(boolean userRequested) { public void attemptCancel(boolean userRequested) {
isCancelled = true;
try { try {
context.unregisterReceiver(receiver); context.unregisterReceiver(receiver);
} catch (Exception e) { } catch (Exception e) {