forked from upstream-mirrors/OpenTracks
Minor leftover cleanup
This commit is contained in:
@@ -96,7 +96,6 @@ public class BackupActivityHelper {
|
|||||||
showToast(R.string.io_write_finished);
|
showToast(R.string.io_write_finished);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
showToast(R.string.io_write_failed);
|
showToast(R.string.io_write_failed);
|
||||||
return;
|
|
||||||
} finally {
|
} finally {
|
||||||
dismissDialog(progressDialog);
|
dismissDialog(progressDialog);
|
||||||
}
|
}
|
||||||
@@ -131,7 +130,7 @@ public class BackupActivityHelper {
|
|||||||
// Show a confirmation dialog
|
// Show a confirmation dialog
|
||||||
Builder confirmationDialogBuilder = new AlertDialog.Builder(activity);
|
Builder confirmationDialogBuilder = new AlertDialog.Builder(activity);
|
||||||
confirmationDialogBuilder.setMessage(R.string.restore_overwrites_warning);
|
confirmationDialogBuilder.setMessage(R.string.restore_overwrites_warning);
|
||||||
confirmationDialogBuilder.setCancelable(false);
|
confirmationDialogBuilder.setCancelable(true);
|
||||||
confirmationDialogBuilder.setPositiveButton(android.R.string.yes,
|
confirmationDialogBuilder.setPositiveButton(android.R.string.yes,
|
||||||
new OnClickListener() {
|
new OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
@@ -139,6 +138,7 @@ public class BackupActivityHelper {
|
|||||||
pickBackupForRestore(backupDates);
|
pickBackupForRestore(backupDates);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
confirmationDialogBuilder.setNegativeButton(android.R.string.no, null);
|
||||||
confirmationDialogBuilder.create().show();
|
confirmationDialogBuilder.create().show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ import java.util.TimeZone;
|
|||||||
class ExternalFileBackup {
|
class ExternalFileBackup {
|
||||||
// Filename format - in UTC
|
// Filename format - in UTC
|
||||||
private static final SimpleDateFormat BACKUP_FILENAME_FORMAT =
|
private static final SimpleDateFormat BACKUP_FILENAME_FORMAT =
|
||||||
new SimpleDateFormat("'backup-'yyyy-MM-dd_HH-mm-ss");
|
new SimpleDateFormat("'backup-'yyyy-MM-dd_HH-mm-ss'.mytracks'");
|
||||||
static {
|
static {
|
||||||
BACKUP_FILENAME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
|
BACKUP_FILENAME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user