wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attachment download dialog added memory units and changed size from int to long

Browse source
This commit is contained in:
Kamil Rajtar 2018-05-07 10:59:58 +02:00
parent a82cec7010
commit f6dc266897
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
k9mail/src/main/java/com/fsck/k9/fragment/AttachmentDownloadDialogFragment.java
View file

@ -23,27 +23,40 @@ public class AttachmentDownloadDialogFragment extends DialogFragment {
private MessagingController messagingController;
public static AttachmentDownloadDialogFragment newInstance(int size, String message) {
public static AttachmentDownloadDialogFragment newInstance(long size, String message) {
AttachmentDownloadDialogFragment fragment = new AttachmentDownloadDialogFragment();
Bundle args = new Bundle();
args.putInt(ARG_SIZE, size);
args.putLong(ARG_SIZE, size);
args.putString(ARG_MESSAGE, message);
fragment.setArguments(args);
return fragment;
}
private SizeUnit getAppropriateSizeUnit(long size) {
for (SizeUnit sizeUnit : SizeUnit.values()) {
if (size < 1024 * 10 * sizeUnit.size) {
return sizeUnit;
}
}
return SizeUnit.B;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
Bundle args = getArguments();
int size = args.getInt(ARG_SIZE);
long size = args.getLong(ARG_SIZE);
String message = args.getString(ARG_MESSAGE);
final SizeUnit sizeUnit = getAppropriateSizeUnit(size);
messagingListener = new SimpleMessagingListener() {
@Override
public void updateProgress(int progress) {
dialog.setProgress(progress);
dialog.setProgress((int) (progress / sizeUnit.size));
}
};
@ -52,14 +65,26 @@ public class AttachmentDownloadDialogFragment extends DialogFragment {
dialog = new ProgressDialog(getActivity());
dialog.setMessage(message);
dialog.setMax(size);
dialog.setMax((int) (size / sizeUnit.size));
dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
dialog.setProgress(0);
dialog.setProgressNumberFormat("%1d/%2d " + sizeUnit.name());
dialog.show();
return dialog;
}
private enum SizeUnit {
B(1), KB(1024L), MB(1024L * 1024L), GB(1024L * 1024L * 1024L), TB(1024L * 1024L * 1024L * 1024L), PB(
1024L * 1024L * 1024L * 1024L * 1024L);
public final long size;
SizeUnit(long size) {
this.size = size;
}
}
@Override
public void onDestroyView() {
messagingController.removeListener(messagingListener);

2
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
View file

@ -544,7 +544,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
}
case R.id.dialog_attachment_progress: {
String message = getString(R.string.dialog_attachment_progress_title);
int size = (int) currentAttachmentViewInfo.size;
long size = currentAttachmentViewInfo.size;
fragment = AttachmentDownloadDialogFragment.newInstance(size, message);
break;
}