Apple-2-Tools
/
apple2ix
mirror of https://github.com/mauiaaron/apple2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correctly set the filename from chooser activity

This commit is contained in:
Aaron Culliney 2019-10-31 17:34:28 -07:00
parent 57d1e95cce
commit dfc09e87bb
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DiskChooserActivity.java
View File

@ -14,6 +14,7 @@ package org.deadc0de.apple2ix;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@ -21,6 +22,8 @@ import android.os.ParcelFileDescriptor;
import android.provider.DocumentsContract;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.provider.OpenableColumns;
import android.util.Log;
import java.util.concurrent.atomic.AtomicBoolean;
@ -58,6 +61,34 @@ public class Apple2DiskChooserActivity extends AppCompatActivity {
return pfd;
}
@Nullable
public static String getFileNameFromUri(Context ctx, Uri uri) {
String fileName = null;
try {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
throw new RuntimeException("SDK Version not allowed access");
}
if (!DocumentsContract.isDocumentUri(ctx, uri)) {
throw new RuntimeException("Not a Document URI for " + uri);
}
ContentResolver resolver = ctx.getContentResolver();
Cursor returnCursor = resolver.query(uri, null, null, null, null);
int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
returnCursor.moveToFirst();
fileName = returnCursor.getString(nameIndex);
} catch (Throwable t) {
Log.e(TAG, "OOPS, could not get filename from URI ( " + uri + " ) : " + t);
}
return fileName;
}
@Override
protected void onSaveInstanceState(Bundle outState) {
outState.putBoolean("ran", true);
@ -142,6 +173,7 @@ public class Apple2DiskChooserActivity extends AppCompatActivity {
if (chosenUri != null) {
chosenPfd = openFileDescriptorFromUri(this, chosenUri);
chosenFileName = getFileNameFromUri(this, chosenUri);
}
}
@ -157,7 +189,7 @@ public class Apple2DiskChooserActivity extends AppCompatActivity {
@Override
public void finish() {
sDiskChooserIsChoosing.set(false);
String name = chosenUri == null ? "" : chosenUri.toString();
String name = chosenFileName == null ? (chosenUri == null ? "" : chosenUri.toString()) : chosenFileName;
if (sDisksCallback != null) {
sDisksCallback.onDisksChosen(new DiskArgs(name, chosenUri, chosenPfd));
}
@ -168,6 +200,8 @@ public class Apple2DiskChooserActivity extends AppCompatActivity {
private ParcelFileDescriptor chosenPfd;
private String chosenFileName;
private static final String TAG = "A2DiskChooserActivity";
private static final int EDIT_REQUEST_CODE = 44;