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

Add cancel button to download dialog

Browse Source
This commit is contained in:
Henrik Tunedal 2011-03-08 00:33:17 +01:00
parent 87ca5ce189
commit 62ad5e2ed1
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -107,6 +107,7 @@
<string name="details_notinstalled">Not installed (%d available)</string> <string name="details_notinstalled">Not installed (%d available)</string>
<string name="inst">Installed</string> <string name="inst">Installed</string>
<string name="corrupt_download">Downloaded file is corrupt</string> <string name="corrupt_download">Downloaded file is corrupt</string>
<string name="download_cancelled">Download cancelled</string>

34
src/org/fdroid/fdroid/AppDetails.java
View File

@ -159,6 +159,7 @@ public class AppDetails extends ListActivity {
private PackageManager mPm; private PackageManager mPm;
private ProgressDialog pd; private ProgressDialog pd;
private DB.Apk.CompatibilityChecker compatChecker; private DB.Apk.CompatibilityChecker compatChecker;
private volatile boolean cancelDownload;
private Context mctx = this; private Context mctx = this;
@ -482,9 +483,24 @@ public class AppDetails extends ListActivity {
return; return;
} }
cancelDownload = false;
pd = new ProgressDialog(this); pd = new ProgressDialog(this);
pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
pd.setMessage(getString(R.string.download_server)); pd.setMessage(getString(R.string.download_server));
pd.setCancelable(true);
pd.setOnCancelListener(
new DialogInterface.OnCancelListener() {
public void onCancel(DialogInterface dialog) {
cancelDownload = true;
}
});
pd.setButton(getString(R.string.cancel),
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.cancel();
}
});
pd.show(); pd.show();
new Thread() { new Thread() {
@ -552,6 +568,10 @@ public class AppDetails extends ListActivity {
int totalRead = 0; int totalRead = 0;
int bytesRead = getit.read(data, 0, 1024); int bytesRead = getit.read(data, 0, 1024);
while (bytesRead != -1) { while (bytesRead != -1) {
if (cancelDownload) {
Log.d("FDroid", "Download cancelled!");
break;
}
bout.write(data, 0, bytesRead); bout.write(data, 0, bytesRead);
totalRead += bytesRead; totalRead += bytesRead;
msg = new Message(); msg = new Message();
@ -563,6 +583,12 @@ public class AppDetails extends ListActivity {
getit.close(); getit.close();
saveit.close(); saveit.close();
f = new File(localfile); f = new File(localfile);
if (cancelDownload) {
f.delete();
msg = download_cancelled_handler.obtainMessage();
msg.sendToTarget();
return;
}
Md5Handler hash = new Md5Handler(); Md5Handler hash = new Md5Handler();
String calcedhash = hash.md5Calc(f); String calcedhash = hash.md5Calc(f);
if (curapk.hash.equalsIgnoreCase(calcedhash)) { if (curapk.hash.equalsIgnoreCase(calcedhash)) {
@ -636,6 +662,14 @@ public class AppDetails extends ListActivity {
} }
}; };
private Handler download_cancelled_handler = new Handler() {
@Override
public void handleMessage(Message msg) {
Toast.makeText(mctx, getString(R.string.download_cancelled),
Toast.LENGTH_SHORT).show();
}
};
private void removeApk(String id) { private void removeApk(String id) {
PackageInfo pkginfo; PackageInfo pkginfo;
try { try {