Correctly show chosen file name in disks menu

This commit is contained in:
Aaron Culliney 2019-11-10 08:30:00 -08:00
parent bf4f76a142
commit cff22f6b34

View File

@ -564,6 +564,10 @@ public class Apple2DisksMenu implements Apple2MenuView {
break; break;
} }
if (diskPath.startsWith(Apple2DisksMenu.EXTERNAL_CHOOSER_SENTINEL)) {
diskPath = diskPath.substring(Apple2DisksMenu.EXTERNAL_CHOOSER_SENTINEL.length());
}
Uri uri = Uri.parse(diskPath); Uri uri = Uri.parse(diskPath);
if (uri == null) { if (uri == null) {
break; break;
@ -575,7 +579,7 @@ public class Apple2DisksMenu implements Apple2MenuView {
break; break;
} }
imageName = diskPath.substring(idx + 1); imageName = Apple2DiskChooserActivity.getFileNameFromUri(mActivity, uri);
} while (false); } while (false);
LinearLayout layout = (LinearLayout) mDisksView.findViewById((i == 0) ? R.id.a2_newschool_driveA_layout : R.id.a2_newschool_driveB_layout); LinearLayout layout = (LinearLayout) mDisksView.findViewById((i == 0) ? R.id.a2_newschool_driveA_layout : R.id.a2_newschool_driveB_layout);